You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ec...@apache.org on 2017/08/10 15:20:34 UTC
[26/27] geode-native git commit: GEODE-2729: Remove global variables
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDurableCqTestsN.cs b/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
index 4864b23..b6b0a01 100644
--- a/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
+++ b/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
@@ -61,7 +61,7 @@ namespace Apache.Geode.Client.UnitTests
Util.Log("Registering Cqs for client1.");
CqAttributesFactory<object, object> cqAf = new CqAttributesFactory<object, object>();
CqAttributes<object, object> attributes = cqAf.Create();
- QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ QueryService<object, object> qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
if (!isRecycle)
{
@@ -85,7 +85,7 @@ namespace Apache.Geode.Client.UnitTests
Util.Log("Registering Cqs for client1 for multiple chunks.");
CqAttributesFactory<object, object> cqAf = new CqAttributesFactory<object, object>();
CqAttributes<object, object> attributes = cqAf.Create();
- QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ QueryService<object, object> qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
for (int i = 0; i < m_NumberOfCqs; i++)
qs.NewCq("MyCq_" + i.ToString(), "Select * From /" + QueryRegionNames[0] + " where id = 1", attributes, true).ExecuteWithInitialResults();
@@ -97,7 +97,7 @@ namespace Apache.Geode.Client.UnitTests
Util.Log("Registering Cqs for client2.");
CqAttributesFactory<object, object> cqAf = new CqAttributesFactory<object, object>();
CqAttributes<object, object> attributes = cqAf.Create();
- QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ QueryService<object, object> qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
if (!isRecycle)
{
@@ -118,7 +118,7 @@ namespace Apache.Geode.Client.UnitTests
public void VerifyDurableCqListClient1MultipleChunks()
{
Util.Log("Verifying durable Cqs for client1.");
- QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ QueryService<object, object> qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
System.Collections.Generic.List<string> durableCqList = qs.GetAllDurableCqsFromServer();
Assert.AreNotEqual(null, durableCqList);
@@ -130,7 +130,7 @@ namespace Apache.Geode.Client.UnitTests
public void VerifyDurableCqListClient1(bool isRecycle)
{
Util.Log("Verifying durable Cqs for client1.");
- QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ QueryService<object, object> qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
System.Collections.Generic.List<string> durableCqList = qs.GetAllDurableCqsFromServer();
Assert.AreNotEqual(null, durableCqList);
@@ -154,7 +154,7 @@ namespace Apache.Geode.Client.UnitTests
public void VerifyDurableCqListClient2(bool isRecycle)
{
Util.Log("Verifying durable Cqs for client2.");
- QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ QueryService<object, object> qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
System.Collections.Generic.List<string> durableCqList = qs.GetAllDurableCqsFromServer();
Assert.AreNotEqual(null, durableCqList);
@@ -183,7 +183,7 @@ namespace Apache.Geode.Client.UnitTests
public void VerifyEmptyDurableCqListClient1()
{
Util.Log("Verifying empty durable Cqs for client1.");
- QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ QueryService<object, object> qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
System.Collections.Generic.List<string> durableCqList = qs.GetAllDurableCqsFromServer();
Assert.AreNotEqual(null, durableCqList);
Assert.AreEqual(0, durableCqList.Count, "Durable CQ list sholuld be empty");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/clicache/integration-test/ThinClientDurableTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDurableTestsN.cs b/src/clicache/integration-test/ThinClientDurableTestsN.cs
index 473cfc7..e75856e 100644
--- a/src/clicache/integration-test/ThinClientDurableTestsN.cs
+++ b/src/clicache/integration-test/ThinClientDurableTestsN.cs
@@ -127,13 +127,13 @@ namespace Apache.Geode.Client.UnitTests
Assert.Fail("RegisterAllKeys threw unexpected exception: {0}", other.Message);
}
- Pool pool0 = PoolManager.Find(region0.Attributes.PoolName);
+ Pool pool0 = CacheHelper.DCache.GetPoolManager().Find(region0.Attributes.PoolName);
int pendingEventCount0 = pool0.PendingEventCount;
Util.Log("pendingEventCount0 for pool = {0} {1} ", pendingEventCount0, region0.Attributes.PoolName);
string msg = string.Format("Expected Value ={0}, Actual = {1}", expectedQ0, pendingEventCount0);
Assert.AreEqual(expectedQ0, pendingEventCount0, msg);
- Pool pool1 = PoolManager.Find(region1.Attributes.PoolName);
+ Pool pool1 = CacheHelper.DCache.GetPoolManager().Find(region1.Attributes.PoolName);
int pendingEventCount1 = pool1.PendingEventCount;
Util.Log("pendingEventCount1 for pool = {0} {1} ", pendingEventCount1, region1.Attributes.PoolName);
string msg1 = string.Format("Expected Value ={0}, Actual = {1}", expectedQ1, pendingEventCount1);
@@ -214,7 +214,7 @@ namespace Apache.Geode.Client.UnitTests
if (poolName != null)
{
Util.Log("PendingEventCount poolName = {0} ", poolName);
- Pool pool = PoolManager.Find(poolName);
+ Pool pool = CacheHelper.DCache.GetPoolManager().Find(poolName);
if (exception)
{
try
@@ -796,10 +796,10 @@ namespace Apache.Geode.Client.UnitTests
pp.Insert("durable-timeout", "30");
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(pp);
- Cache cache = cacheFactory.SetSubscriptionEnabled(true)
- .SetSubscriptionAckInterval(5000)
- .SetSubscriptionMessageTrackingTimeout(5000)
- .Create();
+ Cache cache = cacheFactory.Create();
+ cache.GetPoolFactory().SetSubscriptionEnabled(true);
+ cache.GetPoolFactory().SetSubscriptionAckInterval(5000);
+ cache.GetPoolFactory().SetSubscriptionMessageTrackingTimeout(5000);
Util.Log("Created the Geode Cache Programmatically");
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs b/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
index e41fff6..2fcb1ba 100644
--- a/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
@@ -328,7 +328,7 @@ namespace Apache.Geode.Client.UnitTests
//---------------------Test for function execution with sendException Done-----------------------//
- Pool/*<object, object>*/ pl = PoolManager/*<object, object>*/.Find(poolName);
+ Pool/*<object, object>*/ pl = CacheHelper.DCache.GetPoolManager().Find(poolName);
//test date independant fucntion execution on one server
// test get function with result
@@ -420,7 +420,7 @@ namespace Apache.Geode.Client.UnitTests
public void genericFEResultIntTest(string locators)
{
IRegion<int, int> region = CacheHelper.GetVerifyRegion<int, int>(QERegionName);
- Pool pl = PoolManager.Find(poolName);
+ Pool pl = CacheHelper.DCache.GetPoolManager().Find(poolName);
for (int n = 0; n < 34; n++)
{
@@ -463,7 +463,7 @@ namespace Apache.Geode.Client.UnitTests
public void genericFEResultStringTest(string locators)
{
IRegion<string, string> region = CacheHelper.GetVerifyRegion<string, string>(QERegionName);
- Pool pl = PoolManager.Find(poolName);
+ Pool pl = CacheHelper.DCache.GetPoolManager().Find(poolName);
for (int n = 0; n < 34; n++)
{
@@ -513,7 +513,7 @@ namespace Apache.Geode.Client.UnitTests
public void genericFEResultDCStringTest(string locators)
{
IRegion<string, string> region = CacheHelper.GetVerifyRegion<string, string>(QERegionName);
- Pool pl = PoolManager.Find(poolName);
+ Pool pl = CacheHelper.DCache.GetPoolManager().Find(poolName);
for (int n = 0; n < 34; n++)
{
@@ -560,7 +560,7 @@ namespace Apache.Geode.Client.UnitTests
Serializable.RegisterPdxType(PdxTests.PdxTypes1.CreateDeserializable);
Serializable.RegisterPdxType(PdxTests.PdxTypes8.CreateDeserializable);
IRegion<string, IPdxSerializable> region = CacheHelper.GetVerifyRegion<string, IPdxSerializable>(QERegionName);
- Pool pl = PoolManager.Find(poolName);
+ Pool pl = CacheHelper.DCache.GetPoolManager().Find(poolName);
for (int n = 0; n < 34; n++)
{
@@ -985,7 +985,7 @@ namespace Apache.Geode.Client.UnitTests
Util.Log("ExecuteFETimeOut onRegion Done");
}
- Pool pool = PoolManager.Find(poolName);
+ Pool pool = CacheHelper.DCache.GetPoolManager().Find(poolName);
Execution<object> excs = Client.FunctionService<object>.OnServer(pool);
IResultCollector<object> rcs = excs.WithArgs<Object>(args).Execute(FuncTimeOutName, 5000);
ICollection<object> ServerFunctionResult = rcs.GetResult();
@@ -1319,7 +1319,7 @@ namespace Apache.Geode.Client.UnitTests
}
//test data independant function execution with result onServer
- Pool/*<TKey, TValue>*/ pool = PoolManager/*<TKey, TValue>*/.Find(poolName);
+ Pool/*<TKey, TValue>*/ pool = CacheHelper.DCache.GetPoolManager().Find(poolName);
Apache.Geode.Client.Execution<object> exc = Client.FunctionService<object>.OnServer(pool);
Assert.IsTrue(exc != null, "onServer Returned NULL");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/clicache/integration-test/ThinClientHARegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientHARegionTestsN.cs b/src/clicache/integration-test/ThinClientHARegionTestsN.cs
index 935cd44..5a00367 100644
--- a/src/clicache/integration-test/ThinClientHARegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientHARegionTestsN.cs
@@ -641,8 +641,8 @@ namespace Apache.Geode.Client.UnitTests
try
{
- Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
- Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable, CacheHelper.DCache);
+ Serializable.RegisterTypeGeneric(Position.CreateDeserializable, CacheHelper.DCache);
}
catch (IllegalStateException)
{
@@ -674,7 +674,7 @@ namespace Apache.Geode.Client.UnitTests
KillServerDelegate ksd = new KillServerDelegate(KillServer);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
for (int i = 0; i < 10000; i++)
{
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/clicache/integration-test/ThinClientPdxTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPdxTests.cs b/src/clicache/integration-test/ThinClientPdxTests.cs
index e598ff7..66a7935 100755
--- a/src/clicache/integration-test/ThinClientPdxTests.cs
+++ b/src/clicache/integration-test/ThinClientPdxTests.cs
@@ -160,22 +160,6 @@ namespace Apache.Geode.Client.UnitTests
Assert.AreEqual(CacheHelper.DCache.GetPdxReadSerialized(), false, "Pdx read serialized property should be false.");
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
}
void VerifyGetOnly()
@@ -187,22 +171,7 @@ namespace Apache.Geode.Client.UnitTests
PdxType pRet = (PdxType)region0[1];
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
+
}
void PutAndVerifyVariousPdxTypes()
@@ -229,22 +198,7 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes1 pRet = (PdxTypes1)region0[11];
Assert.AreEqual(p1, pRet);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
+
}
{
@@ -253,22 +207,7 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes2 pRet2 = (PdxTypes2)region0[12];
Assert.AreEqual(p2, pRet2);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
+
}
{
@@ -277,22 +216,7 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes3 pRet3 = (PdxTypes3)region0[13];
Assert.AreEqual(p3, pRet3);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
+
}
{
@@ -301,22 +225,7 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes4 pRet4 = (PdxTypes4)region0[14];
Assert.AreEqual(p4, pRet4);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
+
}
{
@@ -325,22 +234,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes5 pRet5 = (PdxTypes5)region0[15];
Assert.AreEqual(p5, pRet5);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
}
{
@@ -349,22 +242,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes6 pRet6 = (PdxTypes6)region0[16];
Assert.AreEqual(p6, pRet6);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
}
{
@@ -373,22 +250,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes7 pRet7 = (PdxTypes7)region0[17];
Assert.AreEqual(p7, pRet7);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
}
{
@@ -397,22 +258,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes8 pRet8 = (PdxTypes8)region0[18];
Assert.AreEqual(p8, pRet8);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
}
{
PdxTypes9 p9 = new PdxTypes9();
@@ -420,22 +265,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes9 pRet9 = (PdxTypes9)region0[19];
Assert.AreEqual(p9, pRet9);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
}
{
@@ -443,22 +272,6 @@ namespace Apache.Geode.Client.UnitTests
region0[20] = pf;
PortfolioPdx retpf = (PortfolioPdx)region0[20];
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
//Assert.AreEqual(p9, pRet9);
}
@@ -467,22 +280,6 @@ namespace Apache.Geode.Client.UnitTests
region0[21] = pf;
PortfolioPdx retpf = (PortfolioPdx)region0[21];
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
//Assert.AreEqual(p9, pRet9);
}
{
@@ -491,22 +288,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes10 pRet10 = (PdxTypes10)region0[22];
Assert.AreEqual(p10, pRet10);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
}
{
AllPdxTypes apt = new AllPdxTypes(true);
@@ -514,22 +295,6 @@ namespace Apache.Geode.Client.UnitTests
AllPdxTypes aptRet = (AllPdxTypes)region0[23];
Assert.AreEqual(apt, aptRet);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
}
}
@@ -555,22 +320,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes1 pRet = (PdxTypes1)region0[11];
Assert.AreEqual(p1, pRet);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
@@ -578,22 +327,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes2 pRet2 = (PdxTypes2)region0[12];
Assert.AreEqual(p2, pRet2);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
@@ -601,22 +334,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes3 pRet3 = (PdxTypes3)region0[13];
Assert.AreEqual(p3, pRet3);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
@@ -624,22 +341,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes4 pRet4 = (PdxTypes4)region0[14];
Assert.AreEqual(p4, pRet4);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
@@ -647,22 +348,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes5 pRet5 = (PdxTypes5)region0[15];
Assert.AreEqual(p5, pRet5);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
@@ -670,22 +355,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes6 pRet6 = (PdxTypes6)region0[16];
Assert.AreEqual(p6, pRet6);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
@@ -693,22 +362,6 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes7 pRet7 = (PdxTypes7)region0[17];
Assert.AreEqual(p7, pRet7);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
@@ -716,128 +369,32 @@ namespace Apache.Geode.Client.UnitTests
PdxTypes8 pRet8 = (PdxTypes8)region0[18];
Assert.AreEqual(p8, pRet8);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
PdxTypes9 p9 = new PdxTypes9();
PdxTypes9 pRet9 = (PdxTypes9)region0[19];
Assert.AreEqual(p9, pRet9);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
PortfolioPdx retpf = (PortfolioPdx)region0[20];
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
PortfolioPdx retpf = (PortfolioPdx)region0[21];
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
PdxTypes10 p10 = new PdxTypes10();
PdxTypes10 pRet10 = (PdxTypes10)region0[22];
Assert.AreEqual(p10, pRet10);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
{
AllPdxTypes apt = new AllPdxTypes(true);
AllPdxTypes aptRet = (AllPdxTypes)region0[23];
Assert.AreEqual(apt, aptRet);
checkPdxInstanceToStringAtServer(region0);
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.Greater(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be greater than Total pdxSerializations.");
- Assert.Greater(rStats.GetLong((string)"pdxDeserializedBytes"), rStats.GetLong((string)"pdxSerializedBytes"),
- "Total pdxDeserializedBytes should be greater than Total pdxSerializationsBytes");
- }
- }
}
}
@@ -1128,7 +685,7 @@ namespace Apache.Geode.Client.UnitTests
{
try
{
- Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable, CacheHelper.DCache);
Serializable.RegisterPdxType(NestedPdx.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes1.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes2.CreateDeserializable);
@@ -1156,7 +713,7 @@ namespace Apache.Geode.Client.UnitTests
{
try
{
- Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable, CacheHelper.DCache);
Serializable.RegisterPdxType(NestedPdx.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes1.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes2.CreateDeserializable);
@@ -1371,7 +928,7 @@ namespace Apache.Geode.Client.UnitTests
{
try
{
- Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable, CacheHelper.DCache);
Serializable.RegisterPdxType(NestedPdx.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes1.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes2.CreateDeserializable);
@@ -1438,25 +995,6 @@ namespace Apache.Geode.Client.UnitTests
object origVal = all[key];
Assert.AreEqual(kv.Value, origVal);
}
-
-
-
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxSerializations {0} ", rStats.GetInt((string)"pdxSerializations"));
- Util.Log("pdxDeserializations = {0} ", rStats.GetInt((string)"pdxDeserializations"));
- Util.Log("pdxSerializedBytes = {0} ", rStats.GetLong((string)"pdxSerializedBytes"));
- Util.Log("pdxDeserializedBytes = {0} ", rStats.GetLong((string)"pdxDeserializedBytes"));
- Assert.AreEqual(rStats.GetInt((string)"pdxDeserializations"), rStats.GetInt((string)"pdxSerializations"),
- "Total pdxDeserializations should be equal to Total pdxSerializations.");
- Assert.AreEqual(rStats.GetLong((string)"pdxSerializedBytes"), rStats.GetLong((string)"pdxDeserializedBytes"),
- "Total pdxDeserializedBytes should be equal to Total pdxSerializationsBytes");
- }
- }
}
@@ -1502,7 +1040,7 @@ namespace Apache.Geode.Client.UnitTests
{
try
{
- Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable, CacheHelper.DCache);
Serializable.RegisterPdxType(NestedPdx.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes1.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes2.CreateDeserializable);
@@ -3487,20 +3025,6 @@ namespace Apache.Geode.Client.UnitTests
Assert.AreEqual(pp, ppOrig, "Parent pdx should be equal ");
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxInstanceDeserializations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceDeserializations"));
- Util.Log("pdxInstanceCreations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceCreations"));
- Util.Log("pdxInstanceDeserializationTime for PdxInstance getObject = {0} ", rStats.GetLong((string)"pdxInstanceDeserializationTime"));
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceDeserializations"), 2, "pdxInstanceDeserializations should be 2.");
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceCreations"), 2, "pdxInstanceCreations should be 2");
- Assert.Greater(rStats.GetLong((string)"pdxInstanceDeserializationTime"), 0, "pdxInstanceDeserializationTime should be greater than 0");
- }
- }
}
void verifyPdxInstanceEquals()
@@ -3520,21 +3044,6 @@ namespace Apache.Geode.Client.UnitTests
ret = (IPdxInstance)region0["pdxput2"];
ret2 = (IPdxInstance)region0["pdxput2"];
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxInstanceDeserializations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceDeserializations"));
- Util.Log("pdxInstanceCreations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceCreations"));
- Util.Log("pdxInstanceDeserializationTime for PdxInstance getObject = {0} ", rStats.GetLong((string)"pdxInstanceDeserializationTime"));
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceDeserializations"), 2, "pdxInstanceDeserializations should be 2.");
- Assert.Greater(rStats.GetInt((string)"pdxInstanceCreations"), 2, "pdxInstanceCreations should be greater than 2");
- Assert.Greater(rStats.GetLong((string)"pdxInstanceDeserializationTime"), 0, "pdxInstanceDeserializationTime should be greater than 0");
- }
- }
-
Assert.AreEqual(ret, ret2, "parent pdx equals are not matched.");
}
@@ -3558,21 +3067,6 @@ namespace Apache.Geode.Client.UnitTests
ret = (IPdxInstance)region0["pdxput2"];
pdxInstHashcode = ret.GetHashCode();
Assert.AreEqual(javaPdxHC, pdxInstHashcode, "Pdxhashcode hashcode not matched with java padx hash code for Parentpdx class.");
-
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxInstanceDeserializations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceDeserializations"));
- Util.Log("pdxInstanceCreations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceCreations"));
- Util.Log("pdxInstanceDeserializationTime for PdxInstance getObject = {0} ", rStats.GetLong((string)"pdxInstanceDeserializationTime"));
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceDeserializations"), 2, "pdxInstanceDeserializations should be 2.");
- Assert.Greater(rStats.GetInt((string)"pdxInstanceCreations"), 2, "pdxInstanceCreations should be greater than 2");
- Assert.Greater(rStats.GetLong((string)"pdxInstanceDeserializationTime"), 0, "pdxInstanceDeserializationTime should be greater than 0");
- }
- }
}
void accessPdxInstance()
@@ -3992,21 +3486,6 @@ namespace Apache.Geode.Client.UnitTests
Assert.AreNotEqual(pdxins, newpdxins, "parent pdx should be not equal");
Assert.AreNotEqual(cpi, newpdxins.GetField("_childPdx"), "child pdx instance should be equal");
Assert.AreEqual(new ChildPdx(2), ((IPdxInstance)(newpdxins.GetField("_childPdx"))).GetObject(), "child pdx instance should be equal");
-
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxInstanceDeserializations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceDeserializations"));
- Util.Log("pdxInstanceCreations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceCreations"));
- Util.Log("pdxInstanceDeserializationTime for PdxInstance getObject = {0} ", rStats.GetLong((string)"pdxInstanceDeserializationTime"));
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceDeserializations"), 6, "pdxInstanceDeserializations should be 6.");
- Assert.Greater(rStats.GetInt((string)"pdxInstanceCreations"), 2, "pdxInstanceCreations should be greater than 2");
- Assert.Greater(rStats.GetLong((string)"pdxInstanceDeserializationTime"), 0, "pdxInstanceDeserializationTime should be greater than 0");
- }
- }
}
void runPdxInstanceTest()
@@ -4097,21 +3576,6 @@ namespace Apache.Geode.Client.UnitTests
IPdxInstance pi2 = (IPdxInstance)region0[1];
Assert.AreEqual(pi, pi2, "Both pdx instance should equal.");
-
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxInstanceDeserializations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceDeserializations"));
- Util.Log("pdxInstanceCreations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceCreations"));
- Util.Log("pdxInstanceDeserializationTime for PdxInstance getObject = {0} ", rStats.GetLong((string)"pdxInstanceDeserializationTime"));
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceDeserializations"), 0, "pdxInstanceDeserializations should be 0.");
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceCreations"), 2, "pdxInstanceCreations should be 2");
- Assert.AreEqual(rStats.GetLong((string)"pdxInstanceDeserializationTime"), 0, "pdxInstanceDeserializationTime should be 0");
- }
- }
}
void putPdxWithNullIdentityFields()
@@ -4144,21 +3608,6 @@ namespace Apache.Geode.Client.UnitTests
region0.GetAll(keys, values, null);
Assert.AreEqual(values.Count, 2, "Getall count should be two");
-
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxInstanceDeserializations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceDeserializations"));
- Util.Log("pdxInstanceCreations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceCreations"));
- Util.Log("pdxInstanceDeserializationTime for PdxInstance getObject = {0} ", rStats.GetLong((string)"pdxInstanceDeserializationTime"));
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceDeserializations"), 0, "pdxInstanceDeserializations should be 0.");
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceCreations"), 6, "pdxInstanceCreations should be 6");
- Assert.AreEqual(rStats.GetLong((string)"pdxInstanceDeserializationTime"), 0, "pdxInstanceDeserializationTime should be 0");
- }
- }
}
void runPdxReadSerializedTest()
@@ -4553,21 +4002,6 @@ namespace Apache.Geode.Client.UnitTests
newpdxins = (IPdxInstance)lRegion["pdxput"];
Assert.AreEqual((CacheableLinkedHashSet)newpdxins.GetField("m_clhs"), clhs, "CacheableLinkedHashSet is not equal");
Assert.AreNotEqual(pdxins, newpdxins, "PdxInstance should not be equal");
-
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxInstanceDeserializations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceDeserializations"));
- Util.Log("pdxInstanceCreations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceCreations"));
- Util.Log("pdxInstanceDeserializationTime for PdxInstance getObject = {0} ", rStats.GetLong((string)"pdxInstanceDeserializationTime"));
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceDeserializations"), 0, "pdxInstanceDeserializations should be 0.");
- Assert.Greater(rStats.GetInt((string)"pdxInstanceCreations"), 0, "pdxInstanceCreations should be greater than 0");
- Assert.AreEqual(rStats.GetLong((string)"pdxInstanceDeserializationTime"), 0, "pdxInstanceDeserializationTime should be 0");
- }
- }
}
void runPdxInstanceLocalTest()
@@ -4693,20 +4127,6 @@ namespace Apache.Geode.Client.UnitTests
ret = region0["pp"];
Assert.AreEqual(ret, pp, "parent pdx should be same");
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxInstanceDeserializations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceDeserializations"));
- Util.Log("pdxInstanceCreations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceCreations"));
- Util.Log("pdxInstanceDeserializationTime for PdxInstance getObject = {0} ", rStats.GetLong((string)"pdxInstanceDeserializationTime"));
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceDeserializations"), 1, "pdxInstanceDeserializations should be 1.");
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceCreations"), 0, "pdxInstanceCreations should be 0");
- Assert.Greater(rStats.GetLong((string)"pdxInstanceDeserializationTime"), 0, "pdxInstanceDeserializationTime should be greater than 0");
- }
- }
}
//this test use write field Api
@@ -4795,21 +4215,6 @@ namespace Apache.Geode.Client.UnitTests
ret = region0["ppwf"];
Assert.AreEqual(ret, pp, "parent pdx should be same");
-
- //Statistics chk for Pdx.
- StatisticsFactory factory = StatisticsFactory.GetExistingInstance();
- StatisticsType type = factory.FindType("CachePerfStats");
- if (type != null) {
- Statistics rStats = factory.FindFirstStatisticsByType(type);
- if (rStats != null) {
- Util.Log("pdxInstanceDeserializations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceDeserializations"));
- Util.Log("pdxInstanceCreations for PdxInstance getObject = {0} ", rStats.GetInt((string)"pdxInstanceCreations"));
- Util.Log("pdxInstanceDeserializationTime for PdxInstance getObject = {0} ", rStats.GetLong((string)"pdxInstanceDeserializationTime"));
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceDeserializations"), 2, "pdxInstanceDeserializations should be 2.");
- Assert.AreEqual(rStats.GetInt((string)"pdxInstanceCreations"), 0, "pdxInstanceCreations should be 0");
- Assert.Greater(rStats.GetLong((string)"pdxInstanceDeserializationTime"), 0, "pdxInstanceDeserializationTime should be greater than 0");
- }
- }
}
public void runPdxInstanceFactoryTest()
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/clicache/integration-test/ThinClientPoolTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPoolTestsN.cs b/src/clicache/integration-test/ThinClientPoolTestsN.cs
index 42b0bcd..32e0d5e 100644
--- a/src/clicache/integration-test/ThinClientPoolTestsN.cs
+++ b/src/clicache/integration-test/ThinClientPoolTestsN.cs
@@ -263,9 +263,9 @@ namespace Apache.Geode.Client.UnitTests
Assert.AreEqual("test_pool_2", poolNameRegion2);
Assert.AreEqual("test_pool_2", poolNameSubRegion);
- Pool poolOfRegion1 = PoolManager.Find(poolNameRegion1);
- Pool poolOfRegion2 = PoolManager.Find(poolNameRegion2);
- Pool poolOfSubRegion = PoolManager.Find(poolNameSubRegion);
+ Pool poolOfRegion1 = CacheHelper.DCache.GetPoolManager().Find(poolNameRegion1);
+ Pool poolOfRegion2 = CacheHelper.DCache.GetPoolManager().Find(poolNameRegion2);
+ Pool poolOfSubRegion = CacheHelper.DCache.GetPoolManager().Find(poolNameSubRegion);
string[] locators = new string[1] { "localhost:" + CacheHelper.LOCATOR_PORT_1 };
string[] servers = new string[2] { "localhost:" + CacheHelper.HOST_PORT_1, "localhost:" + CacheHelper.HOST_PORT_2 };
@@ -360,7 +360,7 @@ namespace Apache.Geode.Client.UnitTests
{
CacheHelper.Init();
- PoolFactory factory = PoolManager.CreateFactory();
+ PoolFactory factory = CacheHelper.DCache.GetPoolManager().CreateFactory();
factory.SetFreeConnectionTimeout(10000);
factory.SetLoadConditioningInterval(1);
factory.SetSocketBufferSize(1024);
@@ -380,7 +380,7 @@ namespace Apache.Geode.Client.UnitTests
factory.AddLocator("localhost", CacheHelper.LOCATOR_PORT_1);
factory.SetPRSingleHopEnabled(false);
- Pool pool = factory.Create(poolName);
+ Pool pool = factory.Create(poolName, CacheHelper.DCache);
Assert.AreEqual(10000, pool.FreeConnectionTimeout, "FreeConnectionTimeout");
Assert.AreEqual(1, pool.LoadConditioningInterval, "LoadConditioningInterval");
@@ -411,7 +411,7 @@ namespace Apache.Geode.Client.UnitTests
config.Insert("cache-xml-file", xmlFile);
CacheHelper.InitConfig(config);
- Pool pool = PoolManager.Find(poolName);
+ Pool pool = CacheHelper.DCache.GetPoolManager().Find(poolName);
Assert.AreEqual("clientPool", pool.Name, "Pool Name");
Assert.AreEqual(10000, pool.FreeConnectionTimeout, "FreeConnectionTimeout");
@@ -435,10 +435,10 @@ namespace Apache.Geode.Client.UnitTests
public void testExistingPool(string poolName)
{
- PoolFactory factory = PoolManager.CreateFactory();
+ PoolFactory factory = CacheHelper.DCache.GetPoolManager().CreateFactory();
try
{
- factory.Create(poolName);
+ factory.Create(poolName, CacheHelper.DCache);
Assert.Fail("Did not get expected IllegalStateException");
}
catch (IllegalStateException /*excp*/)
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/clicache/integration-test/ThinClientQueryTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientQueryTestsN.cs b/src/clicache/integration-test/ThinClientQueryTestsN.cs
index c03aa1d..ef6c0e1 100644
--- a/src/clicache/integration-test/ThinClientQueryTestsN.cs
+++ b/src/clicache/integration-test/ThinClientQueryTestsN.cs
@@ -59,8 +59,6 @@ namespace Apache.Geode.Client.UnitTests
public override void InitTests()
{
base.InitTests();
- m_client1.Call(InitClient);
- m_client2.Call(InitClient);
}
[TearDown]
@@ -70,32 +68,31 @@ namespace Apache.Geode.Client.UnitTests
base.EndTest();
}
+ [SetUp]
+ public override void InitTest()
+ {
+ m_client1.Call(InitClient);
+ m_client2.Call(InitClient);
+ }
+
#region Functions invoked by the tests
public void InitClient()
{
CacheHelper.Init();
- try
- {
- Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
- Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
- Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PortfolioPdx.CreateDeserializable);
- Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PositionPdx.CreateDeserializable);
- }
- catch (IllegalStateException)
- {
- // ignore since we run multiple iterations for pool and non pool configs
- }
+ Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable, CacheHelper.DCache);
+ Serializable.RegisterTypeGeneric(Position.CreateDeserializable, CacheHelper.DCache);
+ Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PortfolioPdx.CreateDeserializable);
+ Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PositionPdx.CreateDeserializable);
}
public void StepOneQE(string locators, bool isPdx)
{
m_isPdx = isPdx;
- CacheHelper.Init();
try
{
QueryService<object, object> qsFail = null;
- qsFail = PoolManager/*<object, object>*/.CreateFactory().Create("_TESTFAILPOOL_").GetQueryService<object, object>();
+ qsFail = CacheHelper.DCache.GetPoolManager().CreateFactory().Create("_TESTFAILPOOL_", CacheHelper.DCache).GetQueryService<object, object>();
Query<object> qryFail = qsFail.NewQuery("select distinct * from /" + QERegionName);
ISelectResults<object> resultsFail = qryFail.Execute();
Assert.Fail("Since no endpoints defined, so exception expected");
@@ -134,7 +131,7 @@ namespace Apache.Geode.Client.UnitTests
}
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
Query<object> qry = qs.NewQuery("select distinct * from /" + QERegionName);
ISelectResults<object> results = qry.Execute();
@@ -148,7 +145,7 @@ namespace Apache.Geode.Client.UnitTests
public void StepTwoQE()
{
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
Util.Log("Going to execute the query");
Query<object> qry = qs.NewQuery("select distinct * from /" + QERegionName);
ISelectResults<object> results = qry.Execute();
@@ -182,7 +179,7 @@ namespace Apache.Geode.Client.UnitTests
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();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
Util.Log("SetSize {0}, NumSets {1}.", qh.PortfolioSetSize,
qh.PortfolioNumSets);
@@ -219,7 +216,7 @@ namespace Apache.Geode.Client.UnitTests
IRegion<object, object> region0 = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
IRegion<object, object> subRegion0 = region0.GetSubRegion(QueryRegionNames[1]);
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
if (!m_isPdx)
{
@@ -237,11 +234,11 @@ namespace Apache.Geode.Client.UnitTests
{
bool ErrorOccurred = false;
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
int qryIdx = 0;
@@ -353,11 +350,11 @@ namespace Apache.Geode.Client.UnitTests
{
bool ErrorOccurred = false;
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
int qryIdx = 0;
@@ -481,11 +478,11 @@ namespace Apache.Geode.Client.UnitTests
{
bool ErrorOccurred = false;
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
int qryIdx = 0;
@@ -529,11 +526,11 @@ namespace Apache.Geode.Client.UnitTests
{
bool ErrorOccurred = false;
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
int qryIdx = 0;
@@ -598,11 +595,11 @@ namespace Apache.Geode.Client.UnitTests
{
bool ErrorOccurred = false;
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
int qryIdx = 0;
@@ -670,11 +667,11 @@ namespace Apache.Geode.Client.UnitTests
{
bool ErrorOccurred = false;
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
int qryIdx = 0;
@@ -764,11 +761,11 @@ namespace Apache.Geode.Client.UnitTests
{
bool ErrorOccurred = false;
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
int qryIdx = 0;
@@ -812,11 +809,11 @@ namespace Apache.Geode.Client.UnitTests
{
bool ErrorOccurred = false;
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
int qryIdx = 0;
@@ -939,7 +936,7 @@ namespace Apache.Geode.Client.UnitTests
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
for (int i = 0; i < 10000; i++)
{
@@ -976,7 +973,7 @@ namespace Apache.Geode.Client.UnitTests
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
for (int i = 0; i < 10000; i++)
{
@@ -1009,9 +1006,9 @@ namespace Apache.Geode.Client.UnitTests
public void StepThreeQT()
{
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
Util.Log("query " + QueryStatics.ResultSetQueries[34].Query);
Query<object> query = qs.NewQuery(QueryStatics.ResultSetQueries[34].Query);
@@ -1031,9 +1028,9 @@ namespace Apache.Geode.Client.UnitTests
public void StepFourQT()
{
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
Query<object> query = qs.NewQuery(QueryStatics.ResultSetQueries[35].Query);
@@ -1052,9 +1049,9 @@ namespace Apache.Geode.Client.UnitTests
public void StepFiveQT()
{
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
Query<object> query = qs.NewQuery(QueryStatics.StructSetQueries[17].Query);
@@ -1074,9 +1071,9 @@ namespace Apache.Geode.Client.UnitTests
public void StepSixQT()
{
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
Query<object> query = qs.NewQuery(QueryStatics.StructSetQueries[17].Query);
try
@@ -1094,9 +1091,9 @@ namespace Apache.Geode.Client.UnitTests
public void StepThreePQT()
{
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
Query<object> query = qs.NewQuery(QueryStatics.StructSetParamQueries[5].Query);
@@ -1137,9 +1134,9 @@ namespace Apache.Geode.Client.UnitTests
public void StepFourPQT()
{
- QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
QueryService<object, object> qs = null;
- qs = PoolManager/*<object, object>*/.Find("__TESTPOOL1_").GetQueryService<object, object>();
+ qs = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_").GetQueryService<object, object>();
Query<object> query = qs.NewQuery(QueryStatics.StructSetParamQueries[5].Query);
@@ -1500,7 +1497,7 @@ namespace Apache.Geode.Client.UnitTests
// List<ICacheableKey> PortKeys = new List<ICacheableKey>();
// CacheableHashMap ExpectedPosMap = new CacheableHashMap();
// CacheableHashMap ExpectedPortMap = new CacheableHashMap();
- // QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper();
+ // QueryHelper<object, object> qh = QueryHelper<object, object>.GetHelper(CacheHelper.DCache);
// int SetSize = qh.PositionSetSize;
// int NumSets = qh.PositionNumSets;
// for (int set = 1; set <= NumSets; set++)
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/clicache/integration-test/ThinClientRegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionTestsN.cs b/src/clicache/integration-test/ThinClientRegionTestsN.cs
index 2e974a6..3f3242e 100644
--- a/src/clicache/integration-test/ThinClientRegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionTestsN.cs
@@ -376,7 +376,7 @@ namespace Apache.Geode.Client.UnitTests
{
try
{
- Serializable.RegisterTypeGeneric(OtherType.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(OtherType.CreateDeserializable, CacheHelper.DCache);
}
catch (IllegalStateException)
{
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
index 19bd388..a66c41d 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
@@ -406,7 +406,7 @@ namespace Apache.Geode.Client.UnitTests
region.RemoveAll(keys);
break;
case OperationCode.ExecuteCQ:
- Pool/*<object, object>*/ pool = PoolManager/*<object, object>*/.Find("__TESTPOOL1_");
+ Pool/*<object, object>*/ pool = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_");
QueryService<object, object> qs;
if (pool != null)
{
@@ -429,7 +429,7 @@ namespace Apache.Geode.Client.UnitTests
case OperationCode.ExecuteFunction:
if (!isMultiuser)
{
- Pool/*<object, object>*/ pool2 = PoolManager/*<object, object>*/.Find("__TESTPOOL1_");
+ Pool/*<object, object>*/ pool2 = CacheHelper.DCache.GetPoolManager().Find("__TESTPOOL1_");
if (pool2 != null)
{
Client.FunctionService<object>.OnServer(pool2).Execute("securityTest");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
index 2ac9a12..3d697bb 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
@@ -238,8 +238,8 @@ namespace Apache.Geode.Client.UnitTests
try
{
- Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
- Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable, CacheHelper.DCache);
+ Serializable.RegisterTypeGeneric(Position.CreateDeserializable, CacheHelper.DCache);
Util.Log("registerCQ portfolio registered");
}
catch (IllegalStateException)
@@ -267,8 +267,8 @@ namespace Apache.Geode.Client.UnitTests
try
{
- Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
- Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable, CacheHelper.DCache);
+ Serializable.RegisterTypeGeneric(Position.CreateDeserializable, CacheHelper.DCache);
Util.Log("doCQPut portfolio registered");
}
catch (IllegalStateException)