You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/09/12 18:40:10 UTC
incubator-geode git commit: GEODE-37 fixed unit tests
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-37_1 a456c1100 -> bc1fa468e
GEODE-37 fixed unit tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bc1fa468
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bc1fa468
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bc1fa468
Branch: refs/heads/feature/GEODE-37_1
Commit: bc1fa468eaeccbf055e71795d7e144f7836f88c8
Parents: a456c11
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Mon Sep 12 11:40:16 2016 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Mon Sep 12 11:40:43 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/geode/internal/GemFireVersion.java | 7 ++++++-
.../membership/gms/messenger/JGroupsMessengerJUnitTest.java | 2 +-
.../java/org/apache/geode/internal/PdxRenameDUnitTest.java | 8 ++++----
.../java/org/apache/geode/internal/PdxRenameJUnitTest.java | 8 ++++----
.../geode/internal/cache/EvictionObjectSizerDUnitTest.java | 8 ++++----
.../internal/cli/commands/DiskStoreCommandsDUnitTest.java | 6 +++---
.../java/org/apache/geode/pdx/AutoSerializableJUnitTest.java | 2 +-
7 files changed, 23 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc1fa468/geode-core/src/main/java/org/apache/geode/internal/GemFireVersion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/GemFireVersion.java b/geode-core/src/main/java/org/apache/geode/internal/GemFireVersion.java
index ea6b16d..a289635 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/GemFireVersion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/GemFireVersion.java
@@ -207,7 +207,12 @@ public class GemFireVersion {
}
public String getProperty(String key) {
- return error.orElse(description.getProperty(key));
+ if(description != null) {
+ return error.orElse(description.getProperty(key));
+ } else {
+ return null;
+ }
+
}
public String getNativeCodeVersion() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc1fa468/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index 058b3c7..e3c0877 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -155,7 +155,7 @@ public class JGroupsMessengerJUnitTest {
when(services.getMessenger()).thenReturn(messenger);
String jgroupsConfig = messenger.getJGroupsStackConfig();
- int startIdx = jgroupsConfig.indexOf("<com");
+ int startIdx = jgroupsConfig.indexOf("<org");
int insertIdx = jgroupsConfig.indexOf('>', startIdx+4) + 1;
jgroupsConfig = jgroupsConfig.substring(0, insertIdx) +
"<"+InterceptUDP.class.getName()+"/>" +
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc1fa468/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
index 7759e9e..7b3173c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
@@ -122,16 +122,16 @@ public class PdxRenameDUnitTest extends JUnit4CacheTestCase{
vm1.invoke(new SerializableCallable() {
public Object call() throws Exception {
- Collection<Object> renameResults = DiskStoreImpl.pdxRename(DS_NAME, new File[]{f}, "gemstone", "pivotal");
+ Collection<Object> renameResults = DiskStoreImpl.pdxRename(DS_NAME, new File[]{f}, "apache", "pivotal");
assertEquals(2, renameResults.size());
for(Object o : renameResults) {
if(o instanceof PdxType) {
PdxType t = (PdxType)o;
- assertEquals("com.pivotal.gemfire.internal.PdxRenameDUnitTest$PdxValue", t.getClassName());
+ assertEquals("org.pivotal.geode.internal.PdxRenameDUnitTest$PdxValue", t.getClassName());
} else {
EnumInfo ei = (EnumInfo) o;
- assertEquals("com.pivotal.gemfire.internal.PdxRenameDUnitTest$Day", ei.getClassName());
+ assertEquals("org.pivotal.geode.internal.PdxRenameDUnitTest$Day", ei.getClassName());
}
}
return null;
@@ -166,7 +166,7 @@ public class PdxRenameDUnitTest extends JUnit4CacheTestCase{
Region region1 = rf1.create("region1");
PdxInstance v = (PdxInstance) region1.get("key1");
assertNotNull(v);
- assertEquals("com.pivotal.gemfire.internal.PdxRenameDUnitTest$PdxValue", ((PdxInstanceImpl)v).getClassName());
+ assertEquals("org.pivotal.geode.internal.PdxRenameDUnitTest$PdxValue", ((PdxInstanceImpl)v).getClassName());
cache.close();
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc1fa468/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
index 87a79d7..642b8aa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
@@ -91,21 +91,21 @@ public class PdxRenameJUnitTest {
region1.put("key1", new PdxValue(1));
cache.close();
- Collection<Object> renameResults = DiskStoreImpl.pdxRename(DS_NAME, new File[]{f}, "gemstone", "pivotal");
+ Collection<Object> renameResults = DiskStoreImpl.pdxRename(DS_NAME, new File[]{f}, "apache", "pivotal");
assertEquals(2, renameResults.size());
for(Object o : renameResults) {
if(o instanceof PdxType) {
PdxType t = (PdxType)o;
- assertEquals("com.pivotal.gemfire.internal.PdxRenameJUnitTest$PdxValue", t.getClassName());
+ assertEquals("org.pivotal.geode.internal.PdxRenameJUnitTest$PdxValue", t.getClassName());
} else {
EnumInfo ei = (EnumInfo) o;
- assertEquals("com.pivotal.gemfire.internal.PdxRenameJUnitTest$Day", ei.getClassName());
+ assertEquals("org.pivotal.geode.internal.PdxRenameJUnitTest$Day", ei.getClassName());
}
}
Collection<PdxType> types = DiskStoreImpl.getPdxTypes(DS_NAME, new File[]{f});
assertEquals(1, types.size());
- assertEquals("com.pivotal.gemfire.internal.PdxRenameJUnitTest$PdxValue", types.iterator().next().getClassName());
+ assertEquals("org.pivotal.geode.internal.PdxRenameJUnitTest$PdxValue", types.iterator().next().getClassName());
} finally {
if (!cache.isClosed()) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc1fa468/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionObjectSizerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionObjectSizerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionObjectSizerDUnitTest.java
index 0e01fd4..c2a9a68 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionObjectSizerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionObjectSizerDUnitTest.java
@@ -173,10 +173,10 @@ public class EvictionObjectSizerDUnitTest extends JUnit4CacheTestCase {
// Size of overhead= 49
// Size of Integer key= 0(inlined)
- // Size of TestObjectSizerImpl= 160 (serialized size)
+ // Size of TestObjectSizerImpl= 160 (serialized size), changed to 156 because package changed to org.apache.geode
// Total Size of entry should be= 71
putCustomizedData(1, new TestObjectSizerImpl());
- int expected = (0+160+(Sizeable.PER_OBJECT_OVERHEAD*2)+((HeapLRUCapacityController)((PartitionedRegion)region).getEvictionController()).getPerEntryOverhead());
+ int expected = (0+156+(Sizeable.PER_OBJECT_OVERHEAD*2)+((HeapLRUCapacityController)((PartitionedRegion)region).getEvictionController()).getPerEntryOverhead());
LogWriterUtils.getLogWriter().info("testObjectSizerForHeapLRU_CustomizedSizerObject expected= " + expected);
assertEquals(expected, getSizeOfCustomizedData(1));
assertEquals(expected, ((PartitionedRegion)region).getEvictionController()
@@ -192,10 +192,10 @@ public class EvictionObjectSizerDUnitTest extends JUnit4CacheTestCase {
// Size of overhead= 49
// Size of TestNonSizerObject key= 1(customized)
- // Size of TestObjectSizerImpl= 160 (serialized size)
+ // Size of TestObjectSizerImpl= 160 (serialized size), changed to 156 because package changed to org.apache.geode
// Total Size of entry should be= 72
putCustomizedObjects(new TestNonSizerObject("1"), new TestObjectSizerImpl());
- int expected = (1+160+(Sizeable.PER_OBJECT_OVERHEAD*2)+((HeapLRUCapacityController)((PartitionedRegion)region).getEvictionController()).getPerEntryOverhead());
+ int expected = (1+156+(Sizeable.PER_OBJECT_OVERHEAD*2)+((HeapLRUCapacityController)((PartitionedRegion)region).getEvictionController()).getPerEntryOverhead());
LogWriterUtils.getLogWriter().info("testObjectSizerForHeapLRU_CustomizedSizerObjects expected= " + expected);
assertEquals(expected, getSizeOfCustomizedObject(new TestNonSizerObject("1")));
assertEquals(expected, ((PartitionedRegion)region).getEvictionController()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc1fa468/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index 1155ca9..cde39aa 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -312,11 +312,11 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
"describe offline-disk-store --name=" + diskStoreName1 + " --disk-dirs=" + diskStoreDir.getAbsolutePath() + " --pdx=true");
String stringResult = commandResultToString(cmdResult);
assertTrue(stringContainsLine(stringResult, ".*PDX Types.*"));
- assertTrue(stringContainsLine(stringResult, ".*com\\.gemstone\\.gemfire\\.cache\\.query\\.data\\.PortfolioPdx.*"));
- assertTrue(stringContainsLine(stringResult, ".*com\\.gemstone\\.gemfire\\.cache\\.query\\.data\\.PositionPdx.*"));
+ assertTrue(stringContainsLine(stringResult, ".*org\\.apache\\.geode\\.cache\\.query\\.data\\.PortfolioPdx.*"));
+ assertTrue(stringContainsLine(stringResult, ".*org\\.apache\\.geode\\.cache\\.query\\.data\\.PositionPdx.*"));
assertTrue(stringContainsLine(stringResult, ".*PDX Enums.*"));
assertTrue(
- stringContainsLine(stringResult, ".*com\\.gemstone\\.gemfire\\.cache\\.query\\.data\\.PortfolioPdx\\$Day.*"));
+ stringContainsLine(stringResult, ".*org\\.apache\\.geode\\.cache\\.query\\.data\\.PortfolioPdx\\$Day.*"));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc1fa468/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
index f97291a..0c222c8 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
@@ -1219,7 +1219,7 @@ public class AutoSerializableJUnitTest {
setupSerializer(stdSerializableClasses);
ChildFirstClassLoader cfcl =
new ChildFirstClassLoader(javaClassPathToUrl(), this.getClass().getClassLoader());
- cfcl.addIncludedClass("com\\.gemstone.*");
+ cfcl.addIncludedClass("org\\.apache.*");
// Need to exclude DomainObject as that is what the newly created objects
// get cast to.
cfcl.addExcludedClass(".*DomainObject");