geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [17/18] geode git commit: GEODE-2365: Replace gemfire with geode in clicache.
Date Thu, 02 Feb 2017 22:28:07 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
index 22952fb..1f0d5e1 100644
--- a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
+++ b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
@@ -19,262 +19,262 @@
 
 namespace Apache.Geode.Client.UnitTests
 {
-    using Apache.Geode.Client;
-    using Apache.Geode.Client.Tests;
-    using Apache.Geode.DUnitFramework;
-    using NUnit.Framework;
-    using QueryCategory = Apache.Geode.Client.Tests.QueryCategory;
-    using QueryStatics = Apache.Geode.Client.Tests.QueryStatics;
-    using QueryStrings = Apache.Geode.Client.Tests.QueryStrings;
-
-    [TestFixture]
-    [Category("group1")]
-    [Category("unicast_only")]
-    [Category("generics")]
-    internal class ThinClientAppDomainQueryTests : ThinClientRegionSteps
+  using Apache.Geode.Client;
+  using Apache.Geode.Client.Tests;
+  using Apache.Geode.DUnitFramework;
+  using NUnit.Framework;
+  using QueryCategory = Apache.Geode.Client.Tests.QueryCategory;
+  using QueryStatics = Apache.Geode.Client.Tests.QueryStatics;
+  using QueryStrings = Apache.Geode.Client.Tests.QueryStrings;
+
+  [TestFixture]
+  [Category("group1")]
+  [Category("unicast_only")]
+  [Category("generics")]
+  internal class ThinClientAppDomainQueryTests : ThinClientRegionSteps
+  {
+    #region Private members
+
+    private UnitProcess m_client1;
+    private UnitProcess m_client2;
+
+    private static string[] QueryRegionNames = { "Portfolios", "Positions", "Portfolios2",
+      "Portfolios3" };
+
+    private static string QERegionName = "Portfolios";
+    private static string endpoint1;
+    private static string endpoint2;
+
+    #endregion Private members
+
+    protected override ClientBase[] GetClients()
+    {
+      return new ClientBase[] { };
+    }
+
+    [TestFixtureSetUp]
+    public override void InitTests()
     {
-        #region Private members
+      Properties<string, string> config = new Properties<string, string>();
+      config.Insert("appdomain-enabled", "true");
+      CacheHelper.InitConfig(config);
+    }
 
-        private UnitProcess m_client1;
-        private UnitProcess m_client2;
 
-        private static string[] QueryRegionNames = { "Portfolios", "Positions", "Portfolios2",
-      "Portfolios3" };
+    [TearDown]
+    public override void EndTest()
+    {
+      CacheHelper.StopJavaServers();
+      base.EndTest();
+    }
 
-        private static string QERegionName = "Portfolios";
-        private static string endpoint1;
-        private static string endpoint2;
+    #region Functions invoked by the tests
 
-        #endregion Private members
+    public void InitClient()
+    {
+      Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
+      Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
+      Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PortfolioPdx.CreateDeserializable);
+      Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PositionPdx.CreateDeserializable);
+    }
 
-        protected override ClientBase[] GetClients()
+    public void CreateCache(string locators)
+    {
+      CacheHelper.CreateTCRegion_Pool<object, object>(QueryRegionNames[0], true, true,
+      null, locators, "__TESTPOOL1_", true);
+      CacheHelper.CreateTCRegion_Pool<object, object>(QueryRegionNames[1], true, true,
+        null, locators, "__TESTPOOL1_", true);
+      CacheHelper.CreateTCRegion_Pool<object, object>(QueryRegionNames[2], true, true,
+        null, locators, "__TESTPOOL1_", true);
+      CacheHelper.CreateTCRegion_Pool<object, object>(QueryRegionNames[3], true, true,
+        null, locators, "__TESTPOOL1_", true);
+
+      IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
+      Apache.Geode.Client.RegionAttributes<object, object> regattrs = region.Attributes;
+      region.CreateSubRegion(QueryRegionNames[1], regattrs);
+    }
+
+    public void PopulateRegions()
+    {
+      IRegion<object, object> region0 = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
+      IRegion<object, object> subRegion0 = (IRegion<object, object>)region0.GetSubRegion(QueryRegionNames[1]);
+      IRegion<object, object> region1 = CacheHelper.GetRegion<object, object>(QueryRegionNames[1]);
+      IRegion<object, object> region2 = CacheHelper.GetRegion<object, object>(QueryRegionNames[2]);
+      IRegion<object, object> region3 = CacheHelper.GetRegion<object, object>(QueryRegionNames[3]);
+
+      QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+      Util.Log("SetSize {0}, NumSets {1}.", qh.PortfolioSetSize,
+        qh.PortfolioNumSets);
+
+      qh.PopulatePortfolioPdxData(region0, qh.PortfolioSetSize,
+        qh.PortfolioNumSets);
+      qh.PopulatePositionPdxData(subRegion0, qh.PortfolioSetSize,
+        qh.PortfolioNumSets);
+      qh.PopulatePositionPdxData(region1, qh.PortfolioSetSize,
+        qh.PortfolioNumSets);
+      qh.PopulatePortfolioPdxData(region2, qh.PortfolioSetSize,
+        qh.PortfolioNumSets);
+      qh.PopulatePortfolioPdxData(region3, qh.PortfolioSetSize,
+        qh.PortfolioNumSets);
+    }
+
+    public void VerifyQueries()
+    {
+      bool ErrorOccurred = false;
+
+      QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+
+      QueryService<object, object> qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+
+      int qryIdx = 0;
+
+      foreach (QueryStrings qrystr in QueryStatics.ResultSetQueries)
+      {
+        if (qrystr.Category == QueryCategory.Unsupported)
         {
-            return new ClientBase[] { };
+          Util.Log("Skipping query index {0} because it is unsupported.", qryIdx);
+          qryIdx++;
+          continue;
         }
 
-        [TestFixtureSetUp]
-        public override void InitTests()
+        if (qryIdx == 2 || qryIdx == 3 || qryIdx == 4)
         {
-            Properties<string, string> config = new Properties<string, string>();
-            config.Insert("appdomain-enabled", "true");
-            CacheHelper.InitConfig(config);
+          Util.Log("Skipping query index {0} for Pdx because it is function type.", qryIdx);
+          qryIdx++;
+          continue;
         }
 
+        Util.Log("Evaluating query index {0}. Query string {1}", qryIdx, qrystr.Query);
 
-        [TearDown]
-        public override void EndTest()
-        {
-            CacheHelper.StopJavaServers();
-            base.EndTest();
-        }
+        Query<object> query = qs.NewQuery(qrystr.Query);
 
-        #region Functions invoked by the tests
+        ISelectResults<object> results = query.Execute();
 
-        public void InitClient()
-        {
-            Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
-            Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
-            Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PortfolioPdx.CreateDeserializable);
-            Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PositionPdx.CreateDeserializable);
-        }
+        int expectedRowCount = qh.IsExpectedRowsConstantRS(qryIdx) ?
+          QueryStatics.ResultSetRowCounts[qryIdx] : QueryStatics.ResultSetRowCounts[qryIdx] * qh.PortfolioNumSets;
 
-        public void CreateCache(string locators)
+        if (!qh.VerifyRS(results, expectedRowCount))
         {
-            CacheHelper.CreateTCRegion_Pool<object, object>(QueryRegionNames[0], true, true,
-            null, locators, "__TESTPOOL1_", true);
-            CacheHelper.CreateTCRegion_Pool<object, object>(QueryRegionNames[1], true, true,
-              null, locators, "__TESTPOOL1_", true);
-            CacheHelper.CreateTCRegion_Pool<object, object>(QueryRegionNames[2], true, true,
-              null, locators, "__TESTPOOL1_", true);
-            CacheHelper.CreateTCRegion_Pool<object, object>(QueryRegionNames[3], true, true,
-              null, locators, "__TESTPOOL1_", true);
-
-            IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-            Apache.Geode.Client.RegionAttributes<object, object> regattrs = region.Attributes;
-            region.CreateSubRegion(QueryRegionNames[1], regattrs);
+          ErrorOccurred = true;
+          Util.Log("Query verify failed for query index {0}.", qryIdx);
+          qryIdx++;
+          continue;
         }
 
-        public void PopulateRegions()
+        ResultSet<object> rs = results as ResultSet<object>;
+
+        foreach (object item in rs)
         {
-            IRegion<object, object> region0 = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-            IRegion<object, object> subRegion0 = (IRegion<object, object>)region0.GetSubRegion(QueryRegionNames[1]);
-            IRegion<object, object> region1 = CacheHelper.GetRegion<object, object>(QueryRegionNames[1]);
-            IRegion<object, object> region2 = CacheHelper.GetRegion<object, object>(QueryRegionNames[2]);
-            IRegion<object, object> region3 = CacheHelper.GetRegion<object, object>(QueryRegionNames[3]);
-
-            QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
-            Util.Log("SetSize {0}, NumSets {1}.", qh.PortfolioSetSize,
-              qh.PortfolioNumSets);
-
-            qh.PopulatePortfolioPdxData(region0, qh.PortfolioSetSize,
-              qh.PortfolioNumSets);
-            qh.PopulatePositionPdxData(subRegion0, qh.PortfolioSetSize,
-              qh.PortfolioNumSets);
-            qh.PopulatePositionPdxData(region1, qh.PortfolioSetSize,
-              qh.PortfolioNumSets);
-            qh.PopulatePortfolioPdxData(region2, qh.PortfolioSetSize,
-              qh.PortfolioNumSets);
-            qh.PopulatePortfolioPdxData(region3, qh.PortfolioSetSize,
-              qh.PortfolioNumSets);
+          PortfolioPdx port = item as PortfolioPdx;
+          if (port == null)
+          {
+            PositionPdx pos = item as PositionPdx;
+            if (pos == null)
+            {
+              string cs = item.ToString();
+              if (cs == null)
+              {
+                Util.Log("Query got other/unknown object.");
+              }
+              else
+              {
+                Util.Log("Query got string : {0}.", cs);
+              }
+            }
+            else
+            {
+              Util.Log("Query got Position object with secId {0}, shares {1}.", pos.secId, pos.getSharesOutstanding);
+            }
+          }
+          else
+          {
+            Util.Log("Query got Portfolio object with ID {0}, pkid {1}.", port.ID, port.Pkid);
+          }
         }
 
-        public void VerifyQueries()
-        {
-            bool ErrorOccurred = false;
+        qryIdx++;
+      }
 
-            QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+      Assert.IsFalse(ErrorOccurred, "One or more query validation errors occurred.");
+    }
 
-            QueryService<object, object> qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+    public void VerifyUnsupporteQueries()
+    {
+      bool ErrorOccurred = false;
 
-            int qryIdx = 0;
+      QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
 
-            foreach (QueryStrings qrystr in QueryStatics.ResultSetQueries)
-            {
-                if (qrystr.Category == QueryCategory.Unsupported)
-                {
-                    Util.Log("Skipping query index {0} because it is unsupported.", qryIdx);
-                    qryIdx++;
-                    continue;
-                }
-
-                if (qryIdx == 2 || qryIdx == 3 || qryIdx == 4)
-                {
-                    Util.Log("Skipping query index {0} for Pdx because it is function type.", qryIdx);
-                    qryIdx++;
-                    continue;
-                }
-
-                Util.Log("Evaluating query index {0}. Query string {1}", qryIdx, qrystr.Query);
-
-                Query<object> query = qs.NewQuery(qrystr.Query);
-
-                ISelectResults<object> results = query.Execute();
-
-                int expectedRowCount = qh.IsExpectedRowsConstantRS(qryIdx) ?
-                  QueryStatics.ResultSetRowCounts[qryIdx] : QueryStatics.ResultSetRowCounts[qryIdx] * qh.PortfolioNumSets;
-
-                if (!qh.VerifyRS(results, expectedRowCount))
-                {
-                    ErrorOccurred = true;
-                    Util.Log("Query verify failed for query index {0}.", qryIdx);
-                    qryIdx++;
-                    continue;
-                }
-
-                ResultSet<object> rs = results as ResultSet<object>;
-
-                foreach (object item in rs)
-                {
-                    PortfolioPdx port = item as PortfolioPdx;
-                    if (port == null)
-                    {
-                        PositionPdx pos = item as PositionPdx;
-                        if (pos == null)
-                        {
-                            string cs = item.ToString();
-                            if (cs == null)
-                            {
-                                Util.Log("Query got other/unknown object.");
-                            }
-                            else
-                            {
-                                Util.Log("Query got string : {0}.", cs);
-                            }
-                        }
-                        else
-                        {
-                            Util.Log("Query got Position object with secId {0}, shares {1}.", pos.secId, pos.getSharesOutstanding);
-                        }
-                    }
-                    else
-                    {
-                        Util.Log("Query got Portfolio object with ID {0}, pkid {1}.", port.ID, port.Pkid);
-                    }
-                }
-
-                qryIdx++;
-            }
+      QueryService<object, object> qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
 
-            Assert.IsFalse(ErrorOccurred, "One or more query validation errors occurred.");
-        }
+      int qryIdx = 0;
 
-        public void VerifyUnsupporteQueries()
+      foreach (QueryStrings qrystr in QueryStatics.ResultSetQueries)
+      {
+        if (qrystr.Category != QueryCategory.Unsupported)
         {
-            bool ErrorOccurred = false;
-
-            QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+          qryIdx++;
+          continue;
+        }
 
-            QueryService<object, object> qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+        Util.Log("Evaluating unsupported query index {0}.", qryIdx);
 
-            int qryIdx = 0;
+        Query<object> query = qs.NewQuery(qrystr.Query);
 
-            foreach (QueryStrings qrystr in QueryStatics.ResultSetQueries)
-            {
-                if (qrystr.Category != QueryCategory.Unsupported)
-                {
-                    qryIdx++;
-                    continue;
-                }
-
-                Util.Log("Evaluating unsupported query index {0}.", qryIdx);
-
-                Query<object> query = qs.NewQuery(qrystr.Query);
-
-                try
-                {
-                    ISelectResults<object> results = query.Execute();
-
-                    Util.Log("Query exception did not occur for index {0}.", qryIdx);
-                    ErrorOccurred = true;
-                    qryIdx++;
-                }
-                catch (GemFireException)
-                {
-                    // ok, exception expected, do nothing.
-                    qryIdx++;
-                }
-                catch (Exception)
-                {
-                    Util.Log("Query unexpected exception occurred for index {0}.", qryIdx);
-                    ErrorOccurred = true;
-                    qryIdx++;
-                }
-            }
+        try
+        {
+          ISelectResults<object> results = query.Execute();
 
-            Assert.IsFalse(ErrorOccurred, "Query expected exceptions did not occur.");
+          Util.Log("Query exception did not occur for index {0}.", qryIdx);
+          ErrorOccurred = true;
+          qryIdx++;
         }
+        catch (GemFireException)
+        {
+          // ok, exception expected, do nothing.
+          qryIdx++;
+        }
+        catch (Exception)
+        {
+          Util.Log("Query unexpected exception occurred for index {0}.", qryIdx);
+          ErrorOccurred = true;
+          qryIdx++;
+        }
+      }
 
-        #endregion Functions invoked by the tests
+      Assert.IsFalse(ErrorOccurred, "Query expected exceptions did not occur.");
+    }
 
-        [Test]
-        public void RemoteQueryRS()
-        {
-            Util.Log("DoRemoteQueryRS: AppDomain: " + AppDomain.CurrentDomain.Id);
-            CacheHelper.SetupJavaServers(true, "remotequeryN.xml");
-            CacheHelper.StartJavaLocator(1, "GFELOC");
-            Util.Log("Locator started");
-            CacheHelper.StartJavaServerWithLocators(1, "GFECS1", 1);
-            Util.Log("Cacheserver 1 started.");
+    #endregion Functions invoked by the tests
 
-            CreateCache(CacheHelper.Locators);
-            Util.Log("CreateCache complete.");
+    [Test]
+    public void RemoteQueryRS()
+    {
+      Util.Log("DoRemoteQueryRS: AppDomain: " + AppDomain.CurrentDomain.Id);
+      CacheHelper.SetupJavaServers(true, "remotequeryN.xml");
+      CacheHelper.StartJavaLocator(1, "GFELOC");
+      Util.Log("Locator started");
+      CacheHelper.StartJavaServerWithLocators(1, "GFECS1", 1);
+      Util.Log("Cacheserver 1 started.");
 
-            PopulateRegions();
-            Util.Log("PopulateRegions complete.");
+      CreateCache(CacheHelper.Locators);
+      Util.Log("CreateCache complete.");
 
-            VerifyQueries();
-            Util.Log("VerifyQueries complete.");
+      PopulateRegions();
+      Util.Log("PopulateRegions complete.");
 
-            VerifyUnsupporteQueries();
-            Util.Log("VerifyUnsupporteQueries complete.");
+      VerifyQueries();
+      Util.Log("VerifyQueries complete.");
 
-            Close();
+      VerifyUnsupporteQueries();
+      Util.Log("VerifyUnsupporteQueries complete.");
 
-            CacheHelper.StopJavaServer(1);
-            Util.Log("Cacheserver 1 stopped.");
+      Close();
 
-            CacheHelper.StopJavaLocator(1);
-            Util.Log("Locator stopped");
-        }
+      CacheHelper.StopJavaServer(1);
+      Util.Log("Cacheserver 1 stopped.");
+
+      CacheHelper.StopJavaLocator(1);
+      Util.Log("Locator stopped");
     }
+  }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/ThinClientCSTXN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCSTXN.cs b/src/clicache/integration-test/ThinClientCSTXN.cs
index 201ea71..211a52c 100644
--- a/src/clicache/integration-test/ThinClientCSTXN.cs
+++ b/src/clicache/integration-test/ThinClientCSTXN.cs
@@ -772,7 +772,7 @@ namespace Apache.Geode.Client.UnitTests
       private AutoResetEvent m_txevent = null;
 
     }
-    
+
     public void initializePdxSerializer()
     {
       Serializable.RegisterPdxSerializer(new PdxSerializer());
@@ -800,11 +800,11 @@ namespace Apache.Geode.Client.UnitTests
       for (int i = 100; i < 110; i++)
       {
         object put = new SerializePdx1(true);
-        o_region1.Region[i] = put;                
+        o_region1.Region[i] = put;
         put = new SerializePdx2(true);
         o_region1.Region[i + 10] = put;
         put = new SerializePdx3(true, i % 2);
-        o_region1.Region[i + 20] = put;        
+        o_region1.Region[i + 20] = put;
       }
       CacheHelper.CSTXManager.Commit();
 
@@ -821,7 +821,7 @@ namespace Apache.Geode.Client.UnitTests
         Assert.AreEqual(put, ret);
       }
       Util.Log("Region keys count after pdx-keys commit = {0} ", o_region1.Region.Keys.Count);
-      Assert.AreEqual(60, o_region1.Region.Keys.Count, "Commit didn't put two values in the region");      
+      Assert.AreEqual(60, o_region1.Region.Keys.Count, "Commit didn't put two values in the region");
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/ThinClientDocExamplesN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDocExamplesN.cs b/src/clicache/integration-test/ThinClientDocExamplesN.cs
index b2b56ea..d9bfe83 100644
--- a/src/clicache/integration-test/ThinClientDocExamplesN.cs
+++ b/src/clicache/integration-test/ThinClientDocExamplesN.cs
@@ -29,7 +29,7 @@ namespace Apache.Geode.Client.UnitTests
   using Apache.Geode.Client.Examples;
   using Apache.Geode.Client;
 
-  namespace gemfire.cliwrap.Examples
+  namespace geode.cliwrap.Examples
   {
     public class ExampleCacheListenerCallback<TKey, TValue> : ICacheListener<TKey, TValue>
     {
@@ -55,7 +55,7 @@ namespace Apache.Geode.Client.UnitTests
 
       public static void Main()
       {
-        // Create a GemFire cache
+        // Create a Geode cache
         DSInit();
         // Enter puts and gets manually
         DoCommand();
@@ -851,8 +851,8 @@ namespace Apache.Geode.Client.UnitTests
       secProp.Insert("security-client-auth-factory",
       "Apache.Geode.Templates.Cache.Security.UserPasswordAuthInit.Create");
       secProp.Insert("security-client-auth-library", "Apache.Geode.Templates.Cache.Security");
-      secProp.Insert("security-username", " gemfire6");
-      secProp.Insert("security-password", " gemfire6Pass");
+      secProp.Insert("security-username", " geode6");
+      secProp.Insert("security-password", " geode6Pass");
       CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(secProp);
       Cache cache = cacheFactory.Create();
     }
@@ -1498,7 +1498,7 @@ namespace Apache.Geode.Client.UnitTests
     {
       CacheHelper.SetupJavaServers(false, "cacheserver_notify_subscription_forDoc.xml");
       CacheHelper.StartJavaServer(1, "GFECS1");
-      m_client1.Call(gemfire.cliwrap.Examples.ExamplePutGet.Main);
+      m_client1.Call(geode.cliwrap.Examples.ExamplePutGet.Main);
       CacheHelper.StopJavaServers();
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/ThinClientDurableTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDurableTestsN.cs b/src/clicache/integration-test/ThinClientDurableTestsN.cs
index 7d55bec..473cfc7 100644
--- a/src/clicache/integration-test/ThinClientDurableTestsN.cs
+++ b/src/clicache/integration-test/ThinClientDurableTestsN.cs
@@ -192,7 +192,7 @@ namespace Apache.Geode.Client.UnitTests
       lkeys.Add((object)m_mixKeys[3]);
       region1.GetSubscriptionService().RegisterKeys(lkeys, true, false);
 
-      ICollection<object> ldkeys = new List<object>();;
+      ICollection<object> ldkeys = new List<object>(); ;
       ldkeys.Add((object)m_mixKeys[2]);
       region1.GetSubscriptionService().RegisterKeys(ldkeys, false, false);
     }
@@ -347,7 +347,7 @@ namespace Apache.Geode.Client.UnitTests
         }
         catch (AssertionException e)
         {
-          Util.Log("VERIFICATION FAILED for client {0}: {1} ",client,e);
+          Util.Log("VERIFICATION FAILED for client {0}: {1} ", client, e);
           throw e;
         }
       }
@@ -364,15 +364,15 @@ namespace Apache.Geode.Client.UnitTests
     {
       CacheHelper.SetupJavaServers(true,
         "cacheserver_notify_subscription.xml", "cacheserver_notify_subscription2.xml");
-       CacheHelper.StartJavaLocator(1, "GFELOC");
+      CacheHelper.StartJavaLocator(1, "GFELOC");
 
       for (int redundancy = 0; redundancy <= 1; redundancy++)
       {
-        for (int closeType = 1; closeType <= 2; closeType++)  
+        for (int closeType = 1; closeType <= 2; closeType++)
         {
           for (int downtime = 0; downtime <= 1; downtime++) // downtime updates
           {
-            Util.Log("Starting loop with closeType = {0}, redundancy = {1}, downtime = {2} ",closeType,redundancy, downtime );
+            Util.Log("Starting loop with closeType = {0}, redundancy = {1}, downtime = {2} ", closeType, redundancy, downtime);
 
             CacheHelper.StartJavaServerWithLocators(1, "GFECS1", 1);
             Util.Log("Cacheserver 1 started.");
@@ -387,40 +387,40 @@ namespace Apache.Geode.Client.UnitTests
             Util.Log("Feeder initialized.");
 
             m_client1.Call(ClearChecker, 1);
-            m_client2.Call(ClearChecker, 2);   
+            m_client2.Call(ClearChecker, 2);
 
             m_client1.Call(InitDurableClient, 1, CacheHelper.Locators, redundancy, DurableClientId1, 300);
             m_client2.Call(InitDurableClient, 2, CacheHelper.Locators, redundancy, DurableClientId2, 3);
-            
+
             Util.Log("Clients initialized.");
 
             m_feeder.Call(FeederUpdate, 1, 10);
-            
+
             Util.Log("Feeder performed first update.");
             Thread.Sleep(45000); // wait for HA Q to drain and notify ack to go out.
 
             switch (closeType)
             {
               case 1:
-                
+
                 m_client1.Call(ClientDown, true);
                 m_client2.Call(ClientDown, true);
-                
+
                 Util.Log("Clients downed with keepalive true.");
                 break;
               case 2:
-                
-                m_client1.Call(ClientDown, false); 
+
+                m_client1.Call(ClientDown, false);
                 m_client2.Call(ClientDown, false);
-                
+
                 Util.Log("Clients downed with keepalive false.");
                 break;
               case 3:
-                
+
                 m_client1.Call(CrashClient);
-                
+
                 m_client2.Call(CrashClient);
-                
+
                 Util.Log("Clients downed as crash.");
                 break;
               default:
@@ -430,44 +430,44 @@ namespace Apache.Geode.Client.UnitTests
             if (downtime == 1)
             {
               m_feeder.Call(FeederUpdate, 2, 10);
-              
+
               Util.Log("Feeder performed update during downtime.");
               Thread.Sleep(20000); // wait for HA Q to drain and notify ack to go out.
             }
 
             m_client1.Call(InitDurableClient, 1, CacheHelper.Locators, redundancy, DurableClientId1, 300);
-            
+
             // Sleep for 45 seconds since durable timeout is 30 seconds so that client2 times out
             Thread.Sleep(45000);
 
             m_client2.Call(InitDurableClient, 2, CacheHelper.Locators, redundancy, DurableClientId2, 30);
-            
+
             Util.Log("Clients brought back up.");
 
             if (closeType != 2 && downtime == 1)
             {
               m_client1.Call(VerifyBasic, 1, 4, 12, 2, 1);
-              
+
               m_client2.Call(VerifyBasic, 2, 4, 8, 1, 1);
-              
+
             }
             else
             {
-              
+
               m_client1.Call(VerifyBasic, 1, 4, 8, 1, 1);
-              
+
               m_client2.Call(VerifyBasic, 2, 4, 8, 1, 1);
-              
+
             }
 
             Util.Log("Verification completed.");
 
             m_feeder.Call(ClientDown, false);
-            
+
             m_client1.Call(ClientDown, false);
-            
+
             m_client2.Call(ClientDown, false);
-            
+
             Util.Log("Feeder and Clients closed.");
 
             CacheHelper.StopJavaServer(1);
@@ -489,7 +489,7 @@ namespace Apache.Geode.Client.UnitTests
 
     // Basic Durable Test to check durable event recieving for different combination
     // of Close type ( Keep Alive = true / false ) , Intermediate update and rudundancy
-    
+
     [Test]
     public void DurableAndNonDurableBasic()
     {
@@ -535,7 +535,7 @@ namespace Apache.Geode.Client.UnitTests
       region1.GetSubscriptionService().UnregisterRegex(m_regexes[0]);
 
       // Unregister list only durable
-      string[] ldkeys =  new string[]{m_mixKeys[3] };
+      string[] ldkeys = new string[] { m_mixKeys[3] };
       region1.GetSubscriptionService().RegisterKeys(ldkeys, true, false);
       region1.GetSubscriptionService().UnregisterKeys(ldkeys);
     }
@@ -684,7 +684,7 @@ namespace Apache.Geode.Client.UnitTests
         Assert.Fail("RegisterKeys threw unexpected exception: {0}", other.Message);
       }
     }
-    
+
     public void FeederUpdateForFailover(string region, int value, int sleep)
     {
       //update only 2 keys.
@@ -709,7 +709,7 @@ namespace Apache.Geode.Client.UnitTests
       {
         for (int redundancy = 0; redundancy <= 1; redundancy++)
         {
-          Util.Log("Starting loop with clientDown = {0}, redundancy = {1}", clientDown, redundancy );
+          Util.Log("Starting loop with clientDown = {0}, redundancy = {1}", clientDown, redundancy);
 
           CacheHelper.StartJavaServerWithLocators(1, "GFECS1", 1);
           Util.Log("Cacheserver 1 started.");
@@ -727,7 +727,7 @@ namespace Apache.Geode.Client.UnitTests
 
           CacheHelper.StartJavaServerWithLocators(2, "GFECS2", 1);
           Util.Log("Cacheserver 2 started.");
-          
+
           //Time for redundancy thread to detect.
           Thread.Sleep(35000);
 
@@ -748,13 +748,13 @@ namespace Apache.Geode.Client.UnitTests
           //Restart Client
           if (clientDown == 1)
           {
-            m_client1.Call(InitDurableClientForFailover, 1,CacheHelper.Locators,
+            m_client1.Call(InitDurableClientForFailover, 1, CacheHelper.Locators,
               redundancy, DurableClientId1, 300);
             Util.Log("Client Restarted with redundancy level as {0}.", redundancy);
           }
 
           //Verify
-          if (clientDown == 1 )
+          if (clientDown == 1)
           {
             if (redundancy == 0) // Events missed
             {
@@ -800,7 +800,7 @@ namespace Apache.Geode.Client.UnitTests
                                 .SetSubscriptionAckInterval(5000)
                                 .SetSubscriptionMessageTrackingTimeout(5000)
                                 .Create();
-      Util.Log("Created the GemFire Cache Programmatically");
+      Util.Log("Created the Geode Cache Programmatically");
 
       RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
       IRegion<object, object> region = regionFactory.Create<object, object>("DistRegionAck");
@@ -829,7 +829,7 @@ namespace Apache.Geode.Client.UnitTests
 
       Util.Log("Sent ReadyForEvents message to server");
       Thread.Sleep(10000);
-      // Close the GemFire Cache with keepalive = true.  Server will queue events for
+      // Close the Geode Cache with keepalive = true.  Server will queue events for
       // durable registered keys and will deliver all events when client will reconnect
       // within timeout period and send "readyForEvents()"
 
@@ -837,7 +837,7 @@ namespace Apache.Geode.Client.UnitTests
 
       cache.Close(true);
 
-      Util.Log("Closed the GemFire Cache with keepalive as true");
+      Util.Log("Closed the Geode Cache with keepalive as true");
     }
 
     void runDurableClientWithTwoPools()
@@ -850,7 +850,7 @@ namespace Apache.Geode.Client.UnitTests
 
       m_feeder.Call(InitFeeder2, CacheHelper.Locators, 0);
       Util.Log("Feeder started.");
-        
+
       m_client1.Call(InitDurableClientWithTwoPools, CacheHelper.Locators, 0, DurableClientId1, 30, -2, -2);
       Util.Log("DurableClient with Two Pools Initialized");
 
@@ -888,10 +888,10 @@ namespace Apache.Geode.Client.UnitTests
     void RunFeeder()
     {
       CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
-      Util.Log("Feeder connected to the GemFire Distributed System");
+      Util.Log("Feeder connected to the Geode Distributed System");
 
       Cache cache = cacheFactory.Create();
-      Util.Log("Created the GemFire Cache");
+      Util.Log("Created the Geode Cache");
 
       RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY);
       Util.Log("Created the RegionFactory");
@@ -902,25 +902,25 @@ namespace Apache.Geode.Client.UnitTests
 
       PendingEventCount(region, 0, true);
 
-      for ( int i =0; i < 10; i++) 
-      {        
-        region[ i ] = i;
+      for (int i = 0; i < 10; i++)
+      {
+        region[i] = i;
       }
       Thread.Sleep(10000);
       Util.Log("put on 0-10 keys done.");
 
-      // Close the GemFire Cache
+      // Close the Geode Cache
       cache.Close();
-      Util.Log("Closed the GemFire Cache");
+      Util.Log("Closed the Geode Cache");
     }
 
     void RunFeeder1()
     {
       CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
-      Util.Log("Feeder connected to the GemFire Distributed System");
+      Util.Log("Feeder connected to the Geode Distributed System");
 
       Cache cache = cacheFactory.Create();
-      Util.Log("Created the GemFire Cache");
+      Util.Log("Created the Geode Cache");
 
       RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY);
       Util.Log("Created the RegionFactory");
@@ -931,15 +931,16 @@ namespace Apache.Geode.Client.UnitTests
 
       PendingEventCount(region, 0, true);
 
-      for (int i = 10; i < 20; i++) {
+      for (int i = 10; i < 20; i++)
+      {
         region[i] = i;
       }
       Thread.Sleep(10000);
       Util.Log("put on 10-20 keys done.");
 
-      // Close the GemFire Cache
+      // Close the Geode Cache
       cache.Close();
-      Util.Log("Closed the GemFire Cache");
+      Util.Log("Closed the Geode Cache");
     }
 
     void VerifyEvents()

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/ThinClientQueryTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientQueryTestsN.cs b/src/clicache/integration-test/ThinClientQueryTestsN.cs
index 4539788..2693ebb 100644
--- a/src/clicache/integration-test/ThinClientQueryTestsN.cs
+++ b/src/clicache/integration-test/ThinClientQueryTestsN.cs
@@ -24,13 +24,13 @@ namespace Apache.Geode.Client.UnitTests
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests;
-  
+
   using Apache.Geode.Client;
 
   using QueryStatics = Apache.Geode.Client.Tests.QueryStatics;
   using QueryCategory = Apache.Geode.Client.Tests.QueryCategory;
   using QueryStrings = Apache.Geode.Client.Tests.QueryStrings;
-  
+
   [TestFixture]
   [Category("group1")]
   [Category("unicast_only")]
@@ -135,7 +135,7 @@ namespace Apache.Geode.Client.UnitTests
 
       QueryService<object, object> qs = null;
       qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
-    
+
       Query<object> qry = qs.NewQuery("select distinct * from /" + QERegionName);
       ISelectResults<object> results = qry.Execute();
       Int32 count = results.Size;
@@ -155,7 +155,7 @@ namespace Apache.Geode.Client.UnitTests
       Int32 count = results.Size;
       Assert.AreEqual(4, count, "Expected 4 as number of portfolio objects.");
     }
-    
+
     public void StepOne(string locators, bool isPdx)
     {
       m_isPdx = isPdx;
@@ -172,12 +172,12 @@ namespace Apache.Geode.Client.UnitTests
       Apache.Geode.Client.RegionAttributes<object, object> regattrs = region.Attributes;
       region.CreateSubRegion(QueryRegionNames[1], regattrs);
     }
-    
+
     public void StepTwo(bool isPdx)
     {
       m_isPdx = isPdx;
       IRegion<object, object> region0 = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-      IRegion<object, object> subRegion0 = (IRegion<object, object>) region0.GetSubRegion(QueryRegionNames[1]);
+      IRegion<object, object> subRegion0 = (IRegion<object, object>)region0.GetSubRegion(QueryRegionNames[1]);
       IRegion<object, object> region1 = CacheHelper.GetRegion<object, object>(QueryRegionNames[1]);
       IRegion<object, object> region2 = CacheHelper.GetRegion<object, object>(QueryRegionNames[2]);
       IRegion<object, object> region3 = CacheHelper.GetRegion<object, object>(QueryRegionNames[3]);
@@ -260,7 +260,7 @@ namespace Apache.Geode.Client.UnitTests
           {
             Util.Log("Skipping query index {0} for Pdx because it is function type.", qryIdx);
             qryIdx++;
-            continue;  
+            continue;
           }
         }
 
@@ -343,7 +343,7 @@ namespace Apache.Geode.Client.UnitTests
           }
         }
 
-        qryIdx++;        
+        qryIdx++;
       }
 
       Assert.IsFalse(ErrorOccurred, "One or more query validation errors occurred.");
@@ -387,7 +387,7 @@ namespace Apache.Geode.Client.UnitTests
             paramList[ind] = numVal;
             //Util.Log("NIL::PQRS::361 Interger Args:: paramList[0] = {1}", ind, paramList[ind]);
           }
-          catch (FormatException )
+          catch (FormatException)
           {
             //Console.WriteLine("Param string is not a sequence of digits.");
             paramList[ind] = (System.String)QueryStatics.QueryParamSet[qryIdx][ind];
@@ -470,7 +470,7 @@ namespace Apache.Geode.Client.UnitTests
             }
           }
         }
-        
+
         qryIdx++;
       }
 
@@ -562,7 +562,7 @@ namespace Apache.Geode.Client.UnitTests
             paramList[ind] = numVal;
             //Util.Log("NIL::PQRS:: Interger Args:: paramList[0] = {1}", ind, paramList[ind]);
           }
-          catch (FormatException )
+          catch (FormatException)
           {
             //Console.WriteLine("Param string is not a sequence of digits.");
             paramList[ind] = (System.String)QueryStatics.QueryParamSet[qryIdx][ind];
@@ -659,7 +659,7 @@ namespace Apache.Geode.Client.UnitTests
         }
 
         Util.Log("Query index {0} has {1} rows and {2} fields.", qryIdx, rows, fields);
-        
+
         qryIdx++;
       }
 
@@ -715,7 +715,7 @@ namespace Apache.Geode.Client.UnitTests
             paramList[ind] = numVal;
             //Util.Log("NIL::PQRS:: Interger Args:: paramList[0] = {1}", ind, paramList[ind]);
           }
-          catch (FormatException )
+          catch (FormatException)
           {
             //Console.WriteLine("Param string is not a sequence of digits.");
             paramList[ind] = (System.String)QueryStatics.QueryParamSetSS[qryIdx][ind];
@@ -753,7 +753,7 @@ namespace Apache.Geode.Client.UnitTests
         }
 
         Util.Log("Query index {0} has {1} rows and {2} fields.", qryIdx, rows, fields);
-        
+
         qryIdx++;
       }
 
@@ -846,7 +846,7 @@ namespace Apache.Geode.Client.UnitTests
             paramList[ind] = numVal;
             //Util.Log("NIL::PQRS:: Interger Args:: paramList[0] = {1}", ind, paramList[ind]);
           }
-          catch (FormatException )
+          catch (FormatException)
           {
             //Console.WriteLine("Param string is not a sequence of digits.");
             paramList[ind] = (System.String)QueryStatics.QueryParamSetSS[qryIdx][ind];
@@ -1099,7 +1099,7 @@ namespace Apache.Geode.Client.UnitTests
       qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
 
       Query<object> query = qs.NewQuery(QueryStatics.StructSetParamQueries[5].Query);
-      
+
 
       try
       {
@@ -1116,7 +1116,7 @@ namespace Apache.Geode.Client.UnitTests
             paramList[ind] = numVal;
             //Util.Log("NIL::PQRS:: Interger Args:: paramList[0] = {1}", ind, paramList[ind]);
           }
-          catch (FormatException )
+          catch (FormatException)
           {
             //Console.WriteLine("Param string is not a sequence of digits.");
             paramList[ind] = (System.String)QueryStatics.QueryParamSetSS[5][ind];
@@ -1158,7 +1158,7 @@ namespace Apache.Geode.Client.UnitTests
             paramList[ind] = numVal;
             //Util.Log("NIL::PQRS:: Interger Args:: paramList[0] = {1}", ind, paramList[ind]);
           }
-          catch (FormatException )
+          catch (FormatException)
           {
             //Console.WriteLine("Param string is not a sequence of digits.");
             paramList[ind] = (System.String)QueryStatics.QueryParamSetSS[5][ind];
@@ -1175,7 +1175,7 @@ namespace Apache.Geode.Client.UnitTests
         Assert.Fail("Sixth execute unwanted exception: {0}", excp.Message);
       }
     }
-    
+
     public void StepThreeRQ()
     {
       bool ErrorOccurred = false;
@@ -1185,7 +1185,7 @@ namespace Apache.Geode.Client.UnitTests
       int qryIdx = 0;
 
       foreach (QueryStrings qrystr in QueryStatics.RegionQueries)
-      {        
+      {
         if (qrystr.Category == QueryCategory.Unsupported)
         {
           Util.Log("Skipping query index {0} because it is unsupported.", qryIdx);
@@ -1214,7 +1214,7 @@ namespace Apache.Geode.Client.UnitTests
             QueryStatics.RegionQueryRowCounts[qryIdx], results.Size);
           qryIdx++;
           continue;
-        }        
+        }
         qryIdx++;
       }
 
@@ -1222,37 +1222,37 @@ namespace Apache.Geode.Client.UnitTests
 
       try
       {
-          ISelectResults<object> results = region.Query<object>("");
-          Assert.Fail("Expected IllegalArgumentException exception for empty predicate");
+        ISelectResults<object> results = region.Query<object>("");
+        Assert.Fail("Expected IllegalArgumentException exception for empty predicate");
       }
       catch (IllegalArgumentException ex)
       {
-          Util.Log("got expected IllegalArgumentException exception for empty predicate:");
-          Util.Log(ex.Message);
+        Util.Log("got expected IllegalArgumentException exception for empty predicate:");
+        Util.Log(ex.Message);
       }
 
 
       try
       {
-          ISelectResults<object> results = region.Query<object>(QueryStatics.RegionQueries[0].Query, 2200000);
-          Assert.Fail("Expected IllegalArgumentException exception for invalid timeout");
+        ISelectResults<object> results = region.Query<object>(QueryStatics.RegionQueries[0].Query, 2200000);
+        Assert.Fail("Expected IllegalArgumentException exception for invalid timeout");
       }
       catch (IllegalArgumentException ex)
       {
-          Util.Log("got expected IllegalArgumentException exception for invalid timeout:");
-          Util.Log(ex.Message);
+        Util.Log("got expected IllegalArgumentException exception for invalid timeout:");
+        Util.Log(ex.Message);
       }
 
-      
+
       try
       {
-          ISelectResults<object> results = region.Query<object>("bad predicate");
-          Assert.Fail("Expected QueryException exception for wrong predicate");
+        ISelectResults<object> results = region.Query<object>("bad predicate");
+        Assert.Fail("Expected QueryException exception for wrong predicate");
       }
       catch (QueryException ex)
       {
-          Util.Log("got expected QueryException exception for wrong predicate:");
-          Util.Log(ex.Message);
+        Util.Log("got expected QueryException exception for wrong predicate:");
+        Util.Log(ex.Message);
       }
     }
 
@@ -1286,44 +1286,44 @@ namespace Apache.Geode.Client.UnitTests
           qryIdx++;
           continue;
         }
-        
+
         qryIdx++;
       }
 
       Assert.IsFalse(ErrorOccurred, "One or more query validation errors occurred.");
       try
       {
-          bool existsValue = region.ExistsValue("");
-          Assert.Fail("Expected IllegalArgumentException exception for empty predicate");
+        bool existsValue = region.ExistsValue("");
+        Assert.Fail("Expected IllegalArgumentException exception for empty predicate");
       }
       catch (IllegalArgumentException ex)
       {
-          Util.Log("got expected IllegalArgumentException exception for empty predicate:");
-          Util.Log(ex.Message);
+        Util.Log("got expected IllegalArgumentException exception for empty predicate:");
+        Util.Log(ex.Message);
       }
 
 
       try
       {
-          bool existsValue = region.ExistsValue(QueryStatics.RegionQueries[0].Query, 2200000);
-          Assert.Fail("Expected IllegalArgumentException exception for invalid timeout");
+        bool existsValue = region.ExistsValue(QueryStatics.RegionQueries[0].Query, 2200000);
+        Assert.Fail("Expected IllegalArgumentException exception for invalid timeout");
       }
       catch (IllegalArgumentException ex)
       {
-          Util.Log("got expected IllegalArgumentException exception for invalid timeout:");
-          Util.Log(ex.Message);
+        Util.Log("got expected IllegalArgumentException exception for invalid timeout:");
+        Util.Log(ex.Message);
       }
 
-      
+
       try
       {
-          bool existsValue = region.ExistsValue("bad predicate");
-          Assert.Fail("Expected QueryException exception for wrong predicate");
+        bool existsValue = region.ExistsValue("bad predicate");
+        Assert.Fail("Expected QueryException exception for wrong predicate");
       }
       catch (QueryException ex)
       {
-          Util.Log("got expected QueryException exception for wrong predicate:");
-          Util.Log(ex.Message);
+        Util.Log("got expected QueryException exception for wrong predicate:");
+        Util.Log(ex.Message);
       }
     }
 
@@ -1385,36 +1385,36 @@ namespace Apache.Geode.Client.UnitTests
 
       try
       {
-          Object result = region.SelectValue("");
-          Assert.Fail("Expected IllegalArgumentException exception for empty predicate");
+        Object result = region.SelectValue("");
+        Assert.Fail("Expected IllegalArgumentException exception for empty predicate");
       }
       catch (IllegalArgumentException ex)
       {
-          Util.Log("got expected IllegalArgumentException exception for empty predicate:");
-          Util.Log(ex.Message);
+        Util.Log("got expected IllegalArgumentException exception for empty predicate:");
+        Util.Log(ex.Message);
       }
 
 
       try
       {
-          Object result = region.SelectValue(QueryStatics.RegionQueries[0].Query, 2200000);
-          Assert.Fail("Expected IllegalArgumentException exception for invalid timeout");
+        Object result = region.SelectValue(QueryStatics.RegionQueries[0].Query, 2200000);
+        Assert.Fail("Expected IllegalArgumentException exception for invalid timeout");
       }
       catch (IllegalArgumentException ex)
       {
-          Util.Log("got expected IllegalArgumentException exception for invalid timeout:");
-          Util.Log(ex.Message);
+        Util.Log("got expected IllegalArgumentException exception for invalid timeout:");
+        Util.Log(ex.Message);
       }
 
       try
       {
-          Object result = region.SelectValue("bad predicate");
-          Assert.Fail("Expected QueryException exception for wrong predicate");
+        Object result = region.SelectValue("bad predicate");
+        Assert.Fail("Expected QueryException exception for wrong predicate");
       }
       catch (QueryException ex)
       {
-          Util.Log("got expected QueryException exception for wrong predicate:");
-          Util.Log(ex.Message);
+        Util.Log("got expected QueryException exception for wrong predicate:");
+        Util.Log(ex.Message);
       }
     }
 
@@ -1459,13 +1459,13 @@ namespace Apache.Geode.Client.UnitTests
 
       Assert.IsFalse(ErrorOccurred, "Query expected exceptions did not occur.");
     }
-    
+
     //private void CreateRegions(object p, object USE_ACK, object endPoint1, bool p_4)
     //{
     //  throw new Exception("The method or operation is not implemented.");
     //}
 
-    
+
     //public void CompareMap(CacheableHashMap map1, CacheableHashMap map2)
     //{
     //  if (map1.Count != map2.Count)
@@ -1979,6 +1979,6 @@ namespace Apache.Geode.Client.UnitTests
       }
       m_isPdx = false;
     }
-    
+
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/ThinClientRegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionTestsN.cs b/src/clicache/integration-test/ThinClientRegionTestsN.cs
index a9676df..a358d34 100644
--- a/src/clicache/integration-test/ThinClientRegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionTestsN.cs
@@ -52,7 +52,7 @@ namespace Apache.Geode.Client.UnitTests
     }
   }
 
- [Serializable]
+  [Serializable]
   public class CustomPartitionResolver1<TValue> : IFixedPartitionResolver<int, TValue>
   {
     public CustomPartitionResolver1()
@@ -81,25 +81,32 @@ namespace Apache.Geode.Client.UnitTests
     {
       Util.Log("CustomPartitionResolver1::GetPartitionName");
       int newkey = entryEvent.Key % 6;
-      if (newkey == 0) {
+      if (newkey == 0)
+      {
         return "P1";
       }
-      else if (newkey == 1) {
+      else if (newkey == 1)
+      {
         return "P2";
       }
-      else if (newkey == 2) {
+      else if (newkey == 2)
+      {
         return "P3";
       }
-      else if (newkey == 3) {
+      else if (newkey == 3)
+      {
         return "P4";
       }
-      else if (newkey == 4) {
+      else if (newkey == 4)
+      {
         return "P5";
       }
-      else if (newkey == 5) {
+      else if (newkey == 5)
+      {
         return "P6";
       }
-      else {
+      else
+      {
         return "Invalid";
       }
     }
@@ -134,25 +141,32 @@ namespace Apache.Geode.Client.UnitTests
       string key = entryEvent.Key.ToString();
       int numKey = Convert.ToInt32(key);
       int newkey = numKey % 6;
-      if (newkey == 0) {
+      if (newkey == 0)
+      {
         return "P1";
       }
-      else if (newkey == 1) {
+      else if (newkey == 1)
+      {
         return "P2";
       }
-      else if (newkey == 2) {
+      else if (newkey == 2)
+      {
         return "P3";
       }
-      else if (newkey == 3) {
+      else if (newkey == 3)
+      {
         return "P4";
       }
-      else if (newkey == 4) {
+      else if (newkey == 4)
+      {
         return "P5";
       }
-      else if (newkey == 5) {
+      else if (newkey == 5)
+      {
         return "P6";
       }
-      else {
+      else
+      {
         return "Invalid";
       }
     }
@@ -187,16 +201,20 @@ namespace Apache.Geode.Client.UnitTests
       string key = entryEvent.Key.ToString();
       int numKey = Convert.ToInt32(key);
       int newkey = numKey % 3;
-      if (newkey == 0) {
+      if (newkey == 0)
+      {
         return "P1";
       }
-      else if (newkey == 1) {
+      else if (newkey == 1)
+      {
         return "P2";
       }
-      else if (newkey == 2) {
+      else if (newkey == 2)
+      {
         return "P3";
       }
-      else {
+      else
+      {
         return "Invalid";
       }
     }
@@ -339,13 +357,15 @@ namespace Apache.Geode.Client.UnitTests
     [TearDown]
     public override void EndTest()
     {
-      try {
+      try
+      {
         m_client1.Call(DestroyRegions);
         m_client2.Call(DestroyRegions);
         CacheHelper.ClearEndpoints();
         CacheHelper.ClearLocators();
       }
-      finally {
+      finally
+      {
         CacheHelper.StopJavaServers();
         CacheHelper.StopJavaLocators();
       }
@@ -379,12 +399,12 @@ namespace Apache.Geode.Client.UnitTests
         }
         catch (GemFireIOException ex)
         {
-          if (exType == OtherType.ExceptionType.Gemfire)
+          if (exType == OtherType.ExceptionType.Geode)
           {
             // Successfully changed exception back and forth
             Util.Log("Got expected exception in Put: " + ex);
           }
-          else if (exType == OtherType.ExceptionType.GemfireGemfire)
+          else if (exType == OtherType.ExceptionType.GeodeGeode)
           {
             if (ex.InnerException is CacheServerException)
             {
@@ -403,7 +423,7 @@ namespace Apache.Geode.Client.UnitTests
         }
         catch (CacheServerException ex)
         {
-          if (exType == OtherType.ExceptionType.GemfireSystem)
+          if (exType == OtherType.ExceptionType.GeodeSystem)
           {
             if (ex.InnerException is IOException)
             {
@@ -434,7 +454,7 @@ namespace Apache.Geode.Client.UnitTests
         }
         catch (ApplicationException ex)
         {
-          if (exType == OtherType.ExceptionType.SystemGemfire)
+          if (exType == OtherType.ExceptionType.SystemGeode)
           {
             if (ex.InnerException is CacheServerException)
             {
@@ -534,7 +554,7 @@ namespace Apache.Geode.Client.UnitTests
       TallyWriter<object, object> writer = new TallyWriter<object, object>();
       attrMutator.SetCacheWriter(writer);
     }
-    
+
     public void ClearRegionStep2()
     {
       //Console.WriteLine("IRegion<object, object> Name = {0}", m_regionNames[0]);
@@ -613,7 +633,7 @@ namespace Apache.Geode.Client.UnitTests
       {
         Assert.Fail("Expected region size 2");
       }
-      
+
       if (!region0.ContainsKey(m_keys[0]))
       {
         Assert.Fail("m_key[0] is not on Server");
@@ -664,7 +684,7 @@ namespace Apache.Geode.Client.UnitTests
         }
       }
 
-      ICollection<object>  keyvCol = region0.GetSubscriptionService().GetInterestList();
+      ICollection<object> keyvCol = region0.GetSubscriptionService().GetInterestList();
       string[] keyv = new string[keyvCol.Count];
       keyvCol.CopyTo(keyv, 0);
 
@@ -829,7 +849,7 @@ namespace Apache.Geode.Client.UnitTests
       region1.GetSubscriptionService().UnregisterAllKeys();
     }
 
-    public void RegexInterestAllStep9() 
+    public void RegexInterestAllStep9()
     {
       UpdateEntry(m_regionNames[0], m_keys[0], m_vals[0], false);
       VerifyEntry(m_regionNames[0], m_keys[1], m_vals[1], false);
@@ -837,7 +857,7 @@ namespace Apache.Geode.Client.UnitTests
       VerifyEntry(m_regionNames[1], m_keys[3], m_vals[3], false);
     }
 
-    public void RegexInterestAllStep10() 
+    public void RegexInterestAllStep10()
     {
       VerifyEntry(m_regionNames[0], m_keys[0], m_nvals[0]);
       VerifyEntry(m_regionNames[0], m_keys[1], m_vals[1]);
@@ -993,7 +1013,7 @@ namespace Apache.Geode.Client.UnitTests
       Util.Log("Step three completes");
     }
 
-    public void PutAllStep4() 
+    public void PutAllStep4()
     {
       Dictionary<object, object> map0 = new Dictionary<object, object>();
       Dictionary<object, object> map1 = new Dictionary<object, object>();
@@ -1017,7 +1037,7 @@ namespace Apache.Geode.Client.UnitTests
       Util.Log("Put All Complets");
     }
 
-    public void PutAllStep5() 
+    public void PutAllStep5()
     {
       VerifyCreated(m_regionNames[0], m_keys[0]);
       VerifyCreated(m_regionNames[0], m_keys[1]);
@@ -1031,11 +1051,11 @@ namespace Apache.Geode.Client.UnitTests
       Util.Log("StepFive complete.");
     }
 
-    public void PutAllStep6() 
+    public void PutAllStep6()
     {
       Dictionary<object, object> map0 = new Dictionary<object, object>();
       Dictionary<object, object> map1 = new Dictionary<object, object>();
-      
+
       object key0 = m_keys[0];
       object key1 = m_keys[1];
       string val0 = m_nvals[0];
@@ -1106,7 +1126,7 @@ namespace Apache.Geode.Client.UnitTests
       VerifyDestroyed(m_regionNames[1], m_keys[3]);
       VerifyDestroyed(m_regionNames[1], m_keys[4]);
       VerifyDestroyed(m_regionNames[1], m_keys[5]);
-      
+
       IRegion<object, object> region0 = CacheHelper.GetVerifyRegion<object, object>(m_regionNames[0]);
       IRegion<object, object> region1 = CacheHelper.GetVerifyRegion<object, object>(m_regionNames[1]);
       Assert.AreEqual(region0.Count, 0, "Remove all should remove the entries specified");
@@ -1307,8 +1327,8 @@ namespace Apache.Geode.Client.UnitTests
     }
 
     void putGetTest()
-    { 
-      
+    {
+
     }
 
     void runPdxAppDomainTest(bool caching, bool readPdxSerialized)
@@ -1319,7 +1339,7 @@ namespace Apache.Geode.Client.UnitTests
       CacheHelper.StartJavaServerWithLocators(1, "GFECS1", 1);
       Util.Log("Cacheserver 1 started.");
 
-     
+
       m_client1.Call(InitializeAppDomain);
 
       m_client1.Call(CreateTCRegions_Pool_AD2, RegionNames,
@@ -1336,7 +1356,7 @@ namespace Apache.Geode.Client.UnitTests
 
       //putGetTest.TestAllKeyValuePairs(m_client1, m_client2,
       //RegionNames[0], true, pool);
-     // m_client1.Call(TestAllKeyValuePairsAD, RegionNames[0], true, pool);
+      // m_client1.Call(TestAllKeyValuePairsAD, RegionNames[0], true, pool);
       m_client1.Call(CloseCacheAD);
 
       Util.Log("Client 1 closed");
@@ -1422,7 +1442,7 @@ namespace Apache.Geode.Client.UnitTests
 
       m_client1.Call(CreateTCRegion2, TradeKeyRegion, true, true, TradeKeyResolver.Create(),
         CacheHelper.Locators, true);
-      Util.Log("Client 1 (pool locators) region created");          
+      Util.Log("Client 1 (pool locators) region created");
 
       PutGetTests putGetTest = new PutGetTests();
       m_client1.Call(putGetTest.DoPRSHTradeResolverTasks, TradeKeyRegion);
@@ -1502,7 +1522,7 @@ namespace Apache.Geode.Client.UnitTests
 
       CacheHelper.ClearEndpoints();
       CacheHelper.ClearLocators();
-    }    
+    }
 
     void runCheckPut()
     {
@@ -1558,11 +1578,11 @@ namespace Apache.Geode.Client.UnitTests
       Util.Log("StepOne (pool locators) complete.");
 
       m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.None);
-      m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.Gemfire);
+      m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.Geode);
       m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.System);
-      m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.GemfireGemfire);
-      m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.GemfireSystem);
-      m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.SystemGemfire);
+      m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.GeodeGeode);
+      m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.GeodeSystem);
+      m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.SystemGeode);
       m_client1.Call(DoPutsOtherTypeWithEx, OtherType.ExceptionType.SystemSystem);
 
       m_client1.Call(Close);
@@ -1820,7 +1840,7 @@ namespace Apache.Geode.Client.UnitTests
     {
       runFailoverInterestAll(false);
     }
-    
+
     void runFailoverInterestAll(bool ssl)
     {
       CacheHelper.SetupJavaServers(true, "cacheserver_notify_subscription.xml",
@@ -2101,15 +2121,15 @@ namespace Apache.Geode.Client.UnitTests
       m_client1.Call(CreateTCRegions_Pool, RegionNames2,
           CacheHelper.Locators, "__TESTPOOL1_", false);
       Util.Log("StepOne (pool locators) complete.");
-       
+
       m_client1.Call(IdictionaryRegionOperations, "DistRegionAck");
       Util.Log("IdictionaryRegionOperations complete.");
 
       m_client1.Call(IdictionaryRegionNullKeyOperations, "DistRegionAck");
-      Util.Log("IdictionaryRegionNullKeyOperations complete."); 
+      Util.Log("IdictionaryRegionNullKeyOperations complete.");
 
       m_client1.Call(IdictionaryRegionArrayOperations, "DistRegionAck");
-      Util.Log("IdictionaryRegionArrayOperations complete.");     
+      Util.Log("IdictionaryRegionArrayOperations complete.");
 
       m_client1.Call(Close);
       Util.Log("Client 1 closed");
@@ -2127,7 +2147,7 @@ namespace Apache.Geode.Client.UnitTests
     public void EmptyByteArrayTest()
     {
       IRegion<int, byte[]> region = CacheHelper.GetVerifyRegion<int, byte[]>(RegionNames3[0]);
-      
+
       IRegionService regServ = region.RegionService;
 
       Cache cache = regServ as Cache;
@@ -2142,7 +2162,7 @@ namespace Apache.Geode.Client.UnitTests
       Util.Log("Put non empty byteArray in region");
 
       Assert.AreEqual(2, region[1].Length);
-      
+
       region[2] = System.Text.Encoding.ASCII.GetBytes("TestString");
       Util.Log("Put string in region");
 
@@ -2185,7 +2205,7 @@ namespace Apache.Geode.Client.UnitTests
       m_client1.Call(CheckAndPutKey);
       Util.Log("Check for ContainsKeyOnServer complete.");
 
-     
+
       CacheHelper.StopJavaServer(1);
       Util.Log("Cacheserver 1 stopped.");
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/src/AttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.cpp b/src/clicache/src/AttributesFactory.cpp
index 6495411..23cb9ad 100644
--- a/src/clicache/src/AttributesFactory.cpp
+++ b/src/clicache/src/AttributesFactory.cpp
@@ -197,7 +197,7 @@ namespace Apache
       }
 
       // PERSISTENCE
-       generic<class TKey, class TValue>
+      generic<class TKey, class TValue>
       void AttributesFactory<TKey, TValue>::SetPersistenceManager(IPersistenceManager<TKey, TValue>^ persistenceManager, Properties<String^, String^>^ config )
       {
         apache::geode::client::PersistenceManagerPtr persistenceManagerptr;

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/src/AttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.cpp b/src/clicache/src/AttributesMutator.cpp
index 6008d34..14c48f2 100644
--- a/src/clicache/src/AttributesMutator.cpp
+++ b/src/clicache/src/AttributesMutator.cpp
@@ -176,8 +176,7 @@ namespace Apache
 
         NativePtr->setCacheWriter( mg_libpath.CharPtr,
           mg_factoryFunctionName.CharPtr );
+      }
     }  // namespace Client
   }  // namespace Geode
 }  // namespace Apache
-
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/src/Cache.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Cache.hpp b/src/clicache/src/Cache.hpp
index 47d20f8..a181a5b 100644
--- a/src/clicache/src/Cache.hpp
+++ b/src/clicache/src/Cache.hpp
@@ -22,7 +22,7 @@
 //#include "impl/NativeWrapper.hpp"
 #include "RegionShortcut.hpp"
 //#include "RegionFactory.hpp"
-#include "IGemFireCache.hpp"
+#include "IGeodeCache.hpp"
 //#include "IRegionService.hpp"
 #include "IRegion.hpp"
 //#include "QueryService.hpp"
@@ -39,13 +39,13 @@ namespace Apache
     namespace Client
     {
 
-				generic<class TKey, class TResult>
-				ref class QueryService;
+      generic<class TKey, class TResult>
+      ref class QueryService;
 
-				ref class RegionFactory;
-				enum class ExpirationAction;
+      ref class RegionFactory;
+      enum class ExpirationAction;
       ref class DistributedSystem;
-	  ref class CacheTransactionManager2PC;
+      ref class CacheTransactionManager2PC;
       //ref class FunctionService;
 
       /// <summary>
@@ -63,7 +63,7 @@ namespace Apache
       /// </para>
       /// </remarks>
       public ref class Cache sealed
-        : public IGemFireCache, Internal::SBWrap<apache::geode::client::Cache>
+        : public IGeodeCache, Internal::SBWrap<apache::geode::client::Cache>
       {
       public:
 
@@ -71,7 +71,7 @@ namespace Apache
         /// Initializes the cache from an XML file.
         /// </summary>
         /// <param name="cacheXml">pathname of a <c>cache.xml</c> file</param>
-        virtual void InitializeDeclarativeCache( String^ cacheXml );
+        virtual void InitializeDeclarativeCache(String^ cacheXml);
 
         /// <summary>
         /// Returns the name of this cache.
@@ -83,7 +83,7 @@ namespace Apache
         /// <returns>the string name of this cache</returns>
         virtual property String^ Name
         {
-          String^ get( );
+          String^ get();
         }
 
         /// <summary>
@@ -97,7 +97,7 @@ namespace Apache
         /// <returns>true if this cache is closed, otherwise false</returns>
         virtual property bool IsClosed
         {
-          bool get( );
+          bool get();
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ namespace Apache
         /// </remarks>
         virtual property Apache::Geode::Client::DistributedSystem^ DistributedSystem
         {
-          Apache::Geode::Client::DistributedSystem^ get( );
+          Apache::Geode::Client::DistributedSystem^ get();
         }
 
         /// <summary>
@@ -119,7 +119,7 @@ namespace Apache
         /// </summary>
         virtual property Apache::Geode::Client::CacheTransactionManager^ CacheTransactionManager
         {
-          Apache::Geode::Client::CacheTransactionManager^ get( );
+          Apache::Geode::Client::CacheTransactionManager^ get();
         }
 
         /// <summary>
@@ -133,7 +133,7 @@ namespace Apache
         /// <exception cref="CacheClosedException">
         /// if the cache is already closed.
         /// </exception>
-        virtual void Close( );
+        virtual void Close();
 
         /// <summary>
         /// Terminates this object cache and releases all the local resources.
@@ -147,7 +147,7 @@ namespace Apache
         /// <exception cref="CacheClosedException">
         /// if the cache is already closed.
         /// </exception>
-        virtual void Close( bool keepalive );
+        virtual void Close(bool keepalive);
 
         /// <summary>
         /// Send the client-ready message to the server for a durable client.        
@@ -159,8 +159,8 @@ namespace Apache
         /// <exception cref="IllegalStateException">
         /// if there was a problem sending the message to the server.
         /// </exception>
-        virtual void ReadyForEvents( );
-  
+        virtual void ReadyForEvents();
+
         /// <summary>
         /// Returns an existing region given the full path from root, or null 
         /// if no such region exists.
@@ -172,7 +172,7 @@ namespace Apache
         /// <param name="path">the pathname of the region</param>
         /// <returns>the region</returns>
         generic<class TKey, class TValue>
-        virtual IRegion<TKey, TValue>^ GetRegion( String^ path );
+        virtual IRegion<TKey, TValue>^ GetRegion(String^ path);
 
         /// <summary>
         /// Returns an array of root regions in the cache. This set is a
@@ -207,7 +207,7 @@ namespace Apache
         /// before actually firing a query.
         /// </remarks>
         generic<class TKey, class TResult>
-        virtual Client::QueryService<TKey, TResult>^ GetQueryService(String^ poolName );
+        virtual Client::QueryService<TKey, TResult>^ GetQueryService(String^ poolName);
 
         /// <summary>
         /// Returns the instance of <see cref="RegionFactory" /> to create the region
@@ -217,7 +217,7 @@ namespace Apache
         /// </remarks>
         /// <param name="regionShortcut">the regionShortcut to set the default region attributes</param>
         /// <returns>Instance of RegionFactory</returns>
-        RegionFactory^ CreateRegionFactory(RegionShortcut regionShortcut); 
+        RegionFactory^ CreateRegionFactory(RegionShortcut regionShortcut);
 
         /// <summary>
         /// Returns the instance of <see cref="IRegionService" /> to do the operation on Cache with different Credential.
@@ -240,10 +240,10 @@ namespace Apache
         /// <returns>Instance of IRegionService</returns>
         IRegionService^ CreateAuthenticatedView(Properties<String^, Object^>^ credentials, String^ poolName);
 
-				///<summary>
-				/// Returns whether Cache saves unread fields for Pdx types.
-				///</summary>
-				virtual bool GetPdxIgnoreUnreadFields();
+        ///<summary>
+        /// Returns whether Cache saves unread fields for Pdx types.
+        ///</summary>
+        virtual bool GetPdxIgnoreUnreadFields();
 
         ///<summary>
         /// Returns whether { @link PdxInstance} is preferred for PDX types instead of .NET object.
@@ -268,10 +268,10 @@ namespace Apache
         /// <returns>
         /// The managed wrapper object; null if the native pointer is null.
         /// </returns>
-        inline static Cache^ Create( apache::geode::client::Cache* nativeptr )
+        inline static Cache^ Create(apache::geode::client::Cache* nativeptr)
         {
-          return ( nativeptr != nullptr ?
-            gcnew Cache( nativeptr ) : nullptr );
+          return (nativeptr != nullptr ?
+                  gcnew Cache(nativeptr) : nullptr);
         }
 
 
@@ -281,8 +281,8 @@ namespace Apache
         /// Private constructor to wrap a native object pointer
         /// </summary>
         /// <param name="nativeptr">The native object pointer</param>
-        inline Cache( apache::geode::client::Cache* nativeptr )
-          : SBWrap( nativeptr ) { }
+        inline Cache(apache::geode::client::Cache* nativeptr)
+          : SBWrap(nativeptr) { }
       };
     }  // namespace Client
   }  // namespace Geode


Mime
View raw message