You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2020/07/02 18:11:04 UTC

[geode] 28/29: WIP - Fix tests.

This is an automated email from the ASF dual-hosted git repository.

udo pushed a commit to branch feature/GEODE-8294
in repository https://gitbox.apache.org/repos/asf/geode.git

commit bf3d236e8d4ecc3e295b20ae182fcfc4110a54ae
Author: Patrick Johnson <pj...@pivotal.io>
AuthorDate: Thu Jul 2 09:58:49 2020 -0700

    WIP - Fix tests.
---
 .../apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java  | 1 +
 .../java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java  | 2 ++
 .../internal/membership/MembershipDependenciesJUnitTest.java           | 3 ++-
 .../distributed/internal/membership/api/MembershipAPIArchUnitTest.java | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
index 86391a2a..3c52efb 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
@@ -76,6 +76,7 @@ public class CacheXmlParserJUnitTest {
   @Test
   public void testGetDelegate() {
     final TestCacheXmlParser cacheXmlParser = new TestCacheXmlParser();
+    cacheXmlParser.init(ModuleService.DEFAULT);
     assertThat(cacheXmlParser.getDelegates()).as("delegates should be empty.").isEmpty();
 
     final MockXmlParser delegate = (MockXmlParser) cacheXmlParser.getDelegate(NAMESPACE_URI);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
index 4b4f09d..6d078be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
@@ -2833,6 +2833,8 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
               break;
             }
           }
+        } else {
+          logger.error(serviceLoadResult.getErrorMessage());
         }
       } catch (final Exception e) {
         logger.error(e.getMessage(), e);
diff --git a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
index e287583..4f4ff78 100644
--- a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
+++ b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java
@@ -57,7 +57,8 @@ public class MembershipDependenciesJUnitTest {
               .or(resideInAPackage("org.apache.geode.distributed.internal.tcpserver.."))
               .or(resideInAPackage("org.apache.geode.internal.inet.."))
               .or(resideInAPackage("org.apache.geode.internal.lang.."))
-              .or(resideInAPackage(" org.apache.geode.services.module.."))
+              .or(resideInAPackage("org.apache.geode.services.module.."))
+              .or(resideInAPackage("org.apache.geode.services.result.."))
 
               .or(not(resideInAPackage("org.apache.geode..")))
               .or(type(AvailablePortHelper.class))
diff --git a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/MembershipAPIArchUnitTest.java b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/MembershipAPIArchUnitTest.java
index c412d62..09523c8 100644
--- a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/MembershipAPIArchUnitTest.java
+++ b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/MembershipAPIArchUnitTest.java
@@ -50,7 +50,7 @@ public class MembershipAPIArchUnitTest {
               // Serialization is a dependency of membership
               .or(resideInAPackage("org.apache.geode.internal.serialization.."))
               .or(resideInAPackage("org.apache.geode.distributed.internal.tcpserver.."))
-              .or(resideInAPackage(" org.apache.geode.services.module.."))
+              .or(resideInAPackage("org.apache.geode.services.module.."))
               // allowed implementation class accesses
               .or(type(MembershipBuilderImpl.class))
               .or(type(MembershipLocatorBuilderImpl.class))