geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject geode-native git commit: GEODE-2532: Use proper location for xml files. [Forced Update!]
Date Fri, 24 Feb 2017 17:41:01 GMT
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 <mmartell@pivotal.io>
Authored: Thu Feb 23 11:16:35 2017 -0800
Committer: Jacob Barrett <jbarrett@pivotal.io>
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<string, string> config = Properties<string, string>.Create<string,
string>();


Mime
View raw message