This is an automated email from the ASF dual-hosted git repository. udo pushed a commit to branch feature/GEODE-8067 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 38e7f8eec325d70b95764f65f4c01b59a221a3a2 Author: Patrick Johnson <pjohn...@pivotal.io> AuthorDate: Thu Jun 11 14:11:09 2020 -0700 GEODE-8190: Clean up tests and automate Geode version. (#5243) --- geode-modules/build.gradle | 6 +- ...esServiceImplWithPopulatedManifestFileTest.java | 13 +-- .../jboss/modules/GeodeJarModuleFinderTest.java | 95 +++++++++------------- 3 files changed, 51 insertions(+), 63 deletions(-) diff --git a/geode-modules/build.gradle b/geode-modules/build.gradle index 853c638..bfbd6f5 100644 --- a/geode-modules/build.gradle +++ b/geode-modules/build.gradle @@ -47,7 +47,7 @@ sourceSets { def moduleTasks = [] def moduleCopyTasks = [] -def geodeProjects = ['geode-common-services','geode-common'] +def geodeProjects = ['geode-common-services', 'geode-common'] facets.each { thisConfig -> if (thisConfig.name.contains("WithoutManifest")) { @@ -163,5 +163,7 @@ dependencies { module4WithManifestCompileOnly(sourceSets.test.output) module5WithManifestCompileOnly(sourceSets.test.output) - module1WithManifestCompile('org.springframework:spring-core') + module1WithManifestCompile('com.google.guava:guava:29.0-jre') + + testCompile(project(":geode-core")) } diff --git a/geode-modules/src/test/java/org/apache/geode/services/module/impl/JBossModulesServiceImplWithPopulatedManifestFileTest.java b/geode-modules/src/test/java/org/apache/geode/services/module/impl/JBossModulesServiceImplWithPopulatedManifestFileTest.java index 145d7ac..8e5d43d 100644 --- a/geode-modules/src/test/java/org/apache/geode/services/module/impl/JBossModulesServiceImplWithPopulatedManifestFileTest.java +++ b/geode-modules/src/test/java/org/apache/geode/services/module/impl/JBossModulesServiceImplWithPopulatedManifestFileTest.java @@ -25,6 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.junit.Before; import org.junit.Test; +import org.apache.geode.internal.GemFireVersion; import org.apache.geode.services.module.ModuleDescriptor; import org.apache.geode.services.module.ModuleService; import org.apache.geode.services.result.ModuleServiceResult; @@ -32,6 +33,8 @@ import org.apache.geode.services.result.impl.Failure; public class JBossModulesServiceImplWithPopulatedManifestFileTest { + private static String gemFireVersion = GemFireVersion.getGemFireVersion(); + private static final String MODULE1_PATH = System.getProperty("user.dir") + "/../libs/module1WithManifest-1.0.jar"; private static final String MODULE2_PATH = @@ -43,9 +46,9 @@ public class JBossModulesServiceImplWithPopulatedManifestFileTest { private static final String MODULE5_PATH = System.getProperty("user.dir") + "/../libs/module5WithManifest-1.0.jar"; private static final String GEODE_COMMONS_SERVICES_PATH = - System.getProperty("user.dir") + "/../libs/geode-common-services-1.14.0-build.0.jar"; + System.getProperty("user.dir") + "/../libs/geode-common-services-" + gemFireVersion + ".jar"; private static final String GEODE_COMMONS_PATH = - System.getProperty("user.dir") + "/../libs/geode-common-1.14.0-build.0.jar"; + System.getProperty("user.dir") + "/../libs/geode-common-" + gemFireVersion + ".jar"; private ModuleService moduleService; private ModuleDescriptor geodeCommonsServiceDescriptor; @@ -55,11 +58,11 @@ public class JBossModulesServiceImplWithPopulatedManifestFileTest { public void setup() { moduleService = new JBossModuleServiceImpl(LogManager.getLogger()); geodeCommonsServiceDescriptor = - new ModuleDescriptor.Builder("geode-common-services-1.14.0-build.0") + new ModuleDescriptor.Builder("geode-common-services", gemFireVersion) .fromResourcePaths(GEODE_COMMONS_SERVICES_PATH) .build(); - geodeCommonDescriptor = new ModuleDescriptor.Builder("geode-common-1.14.0-build.0") + geodeCommonDescriptor = new ModuleDescriptor.Builder("geode-common", gemFireVersion) .fromResourcePaths(GEODE_COMMONS_PATH) .build(); } @@ -84,7 +87,7 @@ public class JBossModulesServiceImplWithPopulatedManifestFileTest { loadModuleAndAssert(module2Descriptor); ModuleServiceResult<Map<String, Class<?>>> loadClassResult = - moduleService.loadClass("org.springframework.util.StringUtils"); + moduleService.loadClass("com.google.common.base.Strings"); assertThat(loadClassResult.isSuccessful()).isTrue(); diff --git a/geode-modules/src/test/java/org/jboss/modules/GeodeJarModuleFinderTest.java b/geode-modules/src/test/java/org/jboss/modules/GeodeJarModuleFinderTest.java index 99846a4..6111a25 100644 --- a/geode-modules/src/test/java/org/jboss/modules/GeodeJarModuleFinderTest.java +++ b/geode-modules/src/test/java/org/jboss/modules/GeodeJarModuleFinderTest.java @@ -19,17 +19,20 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; import java.util.Arrays; -import java.util.List; import java.util.Set; import java.util.stream.Collectors; import org.apache.logging.log4j.LogManager; +import org.junit.BeforeClass; import org.junit.Test; +import org.apache.geode.internal.GemFireVersion; import org.apache.geode.services.module.ModuleDescriptor; public class GeodeJarModuleFinderTest { + private static String gemFireVersion = GemFireVersion.getGemFireVersion(); + private static final String MODULE1_PATH = System.getProperty("user.dir") + "/../libs/module1WithManifest-1.0.jar"; private static final String MODULE2_PATH = @@ -40,9 +43,26 @@ public class GeodeJarModuleFinderTest { System.getProperty("user.dir") + "/../libs/module4WithManifest-1.0.jar"; private static final String GEODE_COMMONS_SERVICES_PATH = - System.getProperty("user.dir") + "/../libs/geode-common-services-1.14.0-build.0.jar"; + System.getProperty("user.dir") + "/../libs/geode-common-services-" + gemFireVersion + ".jar"; private static final String GEODE_COMMONS_PATH = - System.getProperty("user.dir") + "/../libs/geode-common-1.14.0-build.0.jar"; + System.getProperty("user.dir") + "/../libs/geode-common-" + gemFireVersion + ".jar"; + + private static ModuleDescriptor geodeCommonsServiceDescriptor; + + private static ModuleDescriptor geodeCommonDescriptor; + + @BeforeClass + public static void setup() { + geodeCommonsServiceDescriptor = + new ModuleDescriptor.Builder("geode-common-services", gemFireVersion) + .fromResourcePaths(GEODE_COMMONS_SERVICES_PATH) + .build(); + + geodeCommonDescriptor = + new ModuleDescriptor.Builder("geode-common", gemFireVersion) + .fromResourcePaths(GEODE_COMMONS_PATH) + .build(); + } @Test public void findModuleSimpleJar() throws IOException, ModuleLoadException { @@ -56,23 +76,10 @@ public class GeodeJarModuleFinderTest { assertThat(moduleSpec.getName()).isEqualTo(moduleDescriptor.getName()); assertThat(moduleSpec.getDependencies().length).isEqualTo(4); - String[] expectedDependencies = new String[] {"spring-core", "spring-jcl", "log4j-core", - "log4j-api", "jboss-modules", "module1WithManifest"}; - ResourceLoaderSpec[] resourceLoaders = moduleSpec.getResourceLoaders(); - assertThat(resourceLoaders.length).isEqualTo(expectedDependencies.length); - List<String> loadedResources = Arrays.stream(resourceLoaders) - .map(resourceLoaderSpec -> resourceLoaderSpec.getResourceLoader().getLocation().toString()) - .collect(Collectors.toList()); - for (String expectedDependency : expectedDependencies) { - boolean found = false; - for (String loadedResource : loadedResources) { - boolean contains = loadedResource.contains(expectedDependency); - if (contains) { - found = true; - } - } - assertThat(found).isTrue(); - } + String[] expectedDependencies = new String[] {"log4j-core", "log4j-api", "jboss-modules", + "module1WithManifest", "guava", "failureaccess", "listenablefuture", + "jsr305", "checker-qual", "error_prone_annotations", "j2objc-annotations"}; + assertModuleResourcesEqual(moduleSpec, expectedDependencies); } @Test @@ -88,11 +95,12 @@ public class GeodeJarModuleFinderTest { assertThat(moduleSpec.getName()).isEqualTo(moduleDescriptor.getName()); // This contain duplicate entries for 'geode-common-services'. This is because the underlying - // moduleBuilder does - // check for duplicates + // moduleBuilder does check for duplicates assertThat(moduleSpec.getDependencies().length).isEqualTo(5); - String[] expectedDependencies = new String[] {"spring-core", "spring-jcl", "log4j-core", - "log4j-api", "jboss-modules", "module1WithManifest", "module2WithManifest"}; + String[] expectedDependencies = new String[] {"log4j-core", "log4j-api", "jboss-modules", + "module1WithManifest", "module2WithManifest", "guava", "failureaccess", "listenablefuture", + "jsr305", "checker-qual", "error_prone_annotations", "j2objc-annotations"}; + assertModuleResourcesEqual(moduleSpec, expectedDependencies); } @@ -127,8 +135,9 @@ public class GeodeJarModuleFinderTest { assertThat(moduleSpec.getName()).isEqualTo(moduleDescriptor.getName()); assertThat(moduleSpec.getDependencies().length).isEqualTo(5); - String[] expectedDependencies = new String[] {"spring-core", "spring-jcl", "log4j-core", - "log4j-api", "jboss-modules", "module1WithManifest"}; + String[] expectedDependencies = new String[] {"log4j-core", "log4j-api", "jboss-modules", + "module1WithManifest", "guava", "failureaccess", "listenablefuture", + "jsr305", "checker-qual", "error_prone_annotations", "j2objc-annotations"}; assertModuleResourcesEqual(moduleSpec, expectedDependencies); } @@ -138,16 +147,6 @@ public class GeodeJarModuleFinderTest { new ModuleDescriptor.Builder("module1WithManifest", "1.0").fromResourcePaths(MODULE1_PATH) .build(); - ModuleDescriptor geodeCommonsServiceDescriptor = - new ModuleDescriptor.Builder("geode-common-services-1.14.0-build.0") - .fromResourcePaths(GEODE_COMMONS_SERVICES_PATH) - .build(); - - ModuleDescriptor geodeCommonDescriptor = - new ModuleDescriptor.Builder("geode-common-1.14.0-build.0") - .fromResourcePaths(GEODE_COMMONS_PATH) - .build(); - ModuleLoader moduleLoader = new TestModuleLoader(Module.getSystemModuleLoader(), new ModuleFinder[] { new GeodeJarModuleFinder(LogManager.getLogger(), @@ -168,16 +167,6 @@ public class GeodeJarModuleFinderTest { .fromResourcePaths(MODULE1_PATH, MODULE2_PATH) .build(); - ModuleDescriptor geodeCommonsServiceDescriptor = - new ModuleDescriptor.Builder("geode-common-services-1.14.0-build.0") - .fromResourcePaths(GEODE_COMMONS_SERVICES_PATH) - .build(); - - ModuleDescriptor geodeCommonDescriptor = - new ModuleDescriptor.Builder("geode-common-1.14.0-build.0") - .fromResourcePaths(GEODE_COMMONS_PATH) - .build(); - ModuleLoader moduleLoader = new TestModuleLoader(Module.getSystemModuleLoader(), new ModuleFinder[] { new GeodeJarModuleFinder(LogManager.getLogger(), moduleDescriptor), @@ -190,12 +179,6 @@ public class GeodeJarModuleFinderTest { @Test public void loadJarFileWithDependencies() throws IOException, ModuleLoadException { - ModuleDescriptor commonServices = - new ModuleDescriptor.Builder("geode-common-services", "1.14.0-build.0") - .fromResourcePaths(GEODE_COMMONS_SERVICES_PATH).build(); - - ModuleDescriptor geodeCommon = new ModuleDescriptor.Builder("geode-common", "1.14.0-build.0") - .fromResourcePaths(GEODE_COMMONS_PATH).build(); ModuleDescriptor module1Descriptor = new ModuleDescriptor.Builder("module1WithManifest", "1.0").fromResourcePaths(MODULE1_PATH) @@ -208,15 +191,15 @@ public class GeodeJarModuleFinderTest { ModuleLoader moduleLoader = new TestModuleLoader(Module.getSystemModuleLoader(), new ModuleFinder[] { - new GeodeJarModuleFinder(LogManager.getLogger(), geodeCommon), - new GeodeJarModuleFinder(LogManager.getLogger(), commonServices), + new GeodeJarModuleFinder(LogManager.getLogger(), geodeCommonDescriptor), + new GeodeJarModuleFinder(LogManager.getLogger(), geodeCommonsServiceDescriptor), new GeodeJarModuleFinder(LogManager.getLogger(), module1Descriptor), new GeodeJarModuleFinder(LogManager.getLogger(), module2Descriptor) }); - assertThat(moduleLoader.loadModule(geodeCommon.getName())).isNotNull(); - assertThat(moduleLoader.loadModule(commonServices.getName())).isNotNull(); + assertThat(moduleLoader.loadModule(geodeCommonDescriptor.getName())).isNotNull(); + assertThat(moduleLoader.loadModule(geodeCommonsServiceDescriptor.getName())).isNotNull(); assertThat(moduleLoader.loadModule(module1Descriptor.getName())).isNotNull(); Module module = moduleLoader.loadModule(module2Descriptor.getName()); assertThat(module).isNotNull();