Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7DE15200C25 for ; Fri, 24 Feb 2017 18:41:03 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 77D96160B69; Fri, 24 Feb 2017 17:41:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C0252160B62 for ; Fri, 24 Feb 2017 18:41:02 +0100 (CET) Received: (qmail 64125 invoked by uid 500); 24 Feb 2017 17:41:02 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 64116 invoked by uid 99); 24 Feb 2017 17:41:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2017 17:41:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DB465DFD9E; Fri, 24 Feb 2017 17:41:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbarrett@apache.org To: commits@geode.apache.org Message-Id: <3b81d69b3548422b838add074c60f6a5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: geode-native git commit: GEODE-2532: Use proper location for xml files. [Forced Update!] Date: Fri, 24 Feb 2017 17:41:01 +0000 (UTC) archived-at: Fri, 24 Feb 2017 17:41:03 -0000 Repository: geode-native Updated Branches: refs/heads/develop 074f4e11a -> 2e3e2a021 (forced update) GEODE-2532: Use proper location for xml files. - A few of the clicache integration tests were configuring their xml files into the clicache src directory. This change configures those xml files to be consistent with the other tests. This closes #30. Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/2e3e2a02 Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/2e3e2a02 Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/2e3e2a02 Branch: refs/heads/develop Commit: 2e3e2a021180eb359b981c4c69180ae3339db8cd Parents: 391d79b Author: Mike Martell Authored: Thu Feb 23 11:16:35 2017 -0800 Committer: Jacob Barrett Committed: Fri Feb 24 09:40:44 2017 -0800 ---------------------------------------------------------------------- .../integration-test/ThinClientPoolTestsN.cs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-native/blob/2e3e2a02/src/clicache/integration-test/ThinClientPoolTestsN.cs ---------------------------------------------------------------------- diff --git a/src/clicache/integration-test/ThinClientPoolTestsN.cs b/src/clicache/integration-test/ThinClientPoolTestsN.cs index e035086..42b0bcd 100644 --- a/src/clicache/integration-test/ThinClientPoolTestsN.cs +++ b/src/clicache/integration-test/ThinClientPoolTestsN.cs @@ -234,7 +234,7 @@ namespace Apache.Geode.Client.UnitTests { string xmlLocation = CacheHelper.TestDir + Path.DirectorySeparatorChar + "valid_cache_pool.xml"; - string duplicateXMLFile = CacheHelper.TestDir + Path.DirectorySeparatorChar + Util.Rand(3432898).ToString() + "valid_cache_pool.xml"; + string duplicateXMLFile = Util.Rand(3432898).ToString() + "valid_cache_pool.xml"; CacheHelper.createDuplicateXMLFile(xmlLocation, duplicateXMLFile); xmlLocation = duplicateXMLFile; @@ -290,7 +290,7 @@ namespace Apache.Geode.Client.UnitTests { Util.Log("Testing invalid_cache_pool.xml"); xmlLocation = CacheHelper.TestDir + Path.DirectorySeparatorChar + "invalid_cache_pool.xml"; - duplicateXMLFile = CacheHelper.TestDir + Path.DirectorySeparatorChar + Util.Rand(3432898).ToString() + "invalid_cache_pool.xml"; + duplicateXMLFile = Util.Rand(3432898).ToString() + "invalid_cache_pool.xml"; CacheHelper.createDuplicateXMLFile(xmlLocation, duplicateXMLFile); xmlLocation = duplicateXMLFile; cache = CacheFactory.CreateCacheFactory() @@ -307,7 +307,7 @@ namespace Apache.Geode.Client.UnitTests { Util.Log("Testing invalid_cache_pool2.xml"); xmlLocation = CacheHelper.TestDir + Path.DirectorySeparatorChar + "invalid_cache_pool2.xml"; - duplicateXMLFile = CacheHelper.TestDir + Path.DirectorySeparatorChar + Util.Rand(3432898).ToString() + "invalid_cache_pool2.xml"; + duplicateXMLFile = Util.Rand(3432898).ToString() + "invalid_cache_pool2.xml"; CacheHelper.createDuplicateXMLFile(xmlLocation, duplicateXMLFile); xmlLocation = duplicateXMLFile; cache = CacheFactory.CreateCacheFactory() @@ -324,7 +324,7 @@ namespace Apache.Geode.Client.UnitTests { Util.Log("Testing invalid_cache_pool3.xml"); xmlLocation = CacheHelper.TestDir + Path.DirectorySeparatorChar + "invalid_cache_pool3.xml"; - duplicateXMLFile = CacheHelper.TestDir + Path.DirectorySeparatorChar + Util.Rand(3432898).ToString() + "invalid_cache_pool3.xml"; + duplicateXMLFile = "invalid_cache_pool3.xml"; CacheHelper.createDuplicateXMLFile(xmlLocation, duplicateXMLFile); xmlLocation = duplicateXMLFile; cache = CacheFactory.CreateCacheFactory() @@ -341,7 +341,7 @@ namespace Apache.Geode.Client.UnitTests { Util.Log("Testing invalid_cache_pool4.xml"); xmlLocation = CacheHelper.TestDir + Path.DirectorySeparatorChar + "invalid_cache_pool4.xml"; - duplicateXMLFile = CacheHelper.TestDir + Path.DirectorySeparatorChar + Util.Rand(3432898).ToString() + "invalid_cache_pool4.xml"; + duplicateXMLFile = Util.Rand(3432898).ToString() + "invalid_cache_pool4.xml"; CacheHelper.createDuplicateXMLFile(xmlLocation, duplicateXMLFile); xmlLocation = duplicateXMLFile; cache = CacheFactory.CreateCacheFactory() @@ -403,9 +403,8 @@ namespace Apache.Geode.Client.UnitTests public void testPoolAttrs(string poolName) { - string xmlFile = CacheHelper.TestDir; - xmlFile += "/cacheserver_pool_client.xml"; - string duplicateXMLFile = CacheHelper.TestDir + "/" + Util.Rand(3432898).ToString() + "cacheserver_pool_client.xml"; + string xmlFile = CacheHelper.TestDir + Path.DirectorySeparatorChar + "cacheserver_pool_client.xml"; + string duplicateXMLFile = Util.Rand(3432898).ToString() + "cacheserver_pool_client.xml"; CacheHelper.createDuplicateXMLFile(xmlFile, duplicateXMLFile); xmlFile = duplicateXMLFile; Properties config = Properties.Create();