Itests still not resolving the correct dependencies. Another fix.

- updated Abstract classes to consistently use the same properties - update plugin container itests to check before going to classpath.
rhq-project · Jul 24, 2014 · 8a1e9e6 · 8a1e9e6
1 parent c5a5410
commit 8a1e9e6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml
@@ -68,6 +68,10 @@
                  <value>org.rhq.test.testng.StdoutReporter</value>
               </property>
             </properties>
+            <systemPropertyVariables>
+              <rhq.version>${rhq.pom.version}</rhq.version>
+              <rhq-platform-plugin.version>${rhq-platform-plugin.version}</rhq-platform-plugin.version>
+            </systemPropertyVariables>
           </configuration>
         </plugin>
 

diff --git a/.../plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java b/.../plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java
@@ -119,7 +119,15 @@ public abstract class AbstractAgentPluginTest extends Arquillian {
     @Deployment(name = "platform", order = 1)
     public static RhqAgentPluginArchive getPlatformPlugin() throws Exception {
         MavenResolverSystem mavenDependencyResolver = Maven.resolver();
-        String platformPluginArtifact = "org.rhq:rhq-platform-plugin:jar:" + getPlatformPluginVersion();
+        //check for system property specifiers before going to classpath
+        String rhqPlatformPluginVersion = System.getProperty("rhq-platform-plugin.version");
+        //complete maven gav construction.
+        String platformPluginArtifact = "org.rhq:rhq-platform-plugin:jar:";
+        if ((rhqPlatformPluginVersion == null) || rhqPlatformPluginVersion.trim().isEmpty()) {
+            platformPluginArtifact += getRhqVersion();//got to classpath and MavenArtifactProperties
+        } else {
+            platformPluginArtifact += rhqPlatformPluginVersion;
+        }
 
         return mavenDependencyResolver.offline().loadPomFromFile("pom.xml").resolve(platformPluginArtifact)
             .withoutTransitivity().asSingle(RhqAgentPluginArchive.class);
@@ -645,17 +653,12 @@ private long getDefaultTimeout(ResourceType resourceType, String operationName)
     private static String getRhqVersion() {
         MavenArtifactProperties rhqPluginContainerPom = null;
         try {
-            rhqPluginContainerPom = MavenArtifactProperties.getInstance("org.rhq", "rhq-parent");
-        } catch (MavenArtifactNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-        return rhqPluginContainerPom.getVersion();
-    }
-
-    private static String getPlatformPluginVersion() {
-        MavenArtifactProperties rhqPluginContainerPom = null;
-        try {
-            rhqPluginContainerPom = MavenArtifactProperties.getInstance("org.rhq", "rhq-platform-plugin");
+            //check for system property specifiers before going to classpath
+            String rhqVersion = System.getProperty("rhq.version");
+            if ((rhqVersion != null) && !(rhqVersion.trim().isEmpty())) {
+                return rhqVersion;
+            }
+            rhqPluginContainerPom = MavenArtifactProperties.getInstance("org.rhq", "rhq-core-plugin-container");
         } catch (MavenArtifactNotFoundException e) {
             throw new RuntimeException(e);
         }

diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
@@ -541,7 +541,7 @@
             <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
             <clean.db>${clean.db}</clean.db>
             <log4j.configDebug>false</log4j.configDebug>
-            <project.version>${project.version}</project.version>
+            <rhq.version>${rhq.pom.version}</rhq.version>
             <rhq.skip.oracle>${skip.oracle}</rhq.skip.oracle>
             <rhq.ojdbc.version>${ojdbc6.version}</rhq.ojdbc.version>
             <rhq-platform-plugin.version>${rhq-platform-plugin.version}</rhq-platform-plugin.version>

diff --git a/...rprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/...rprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -334,7 +334,7 @@ protected static EnterpriseArchive getBaseDeployment() {
         testClassesJar.addAsResource("org/rhq/enterprise/server/plugins/ant/recipe-no-manageRootDir.xml");
 
         // create test ear by starting with rhq.ear and thinning it
-        String projectVersion = System.getProperty("project.version");
+        String projectVersion = System.getProperty("rhq.version");
         String rhqCoreClientApiVersion = System.getProperty("rhq-core-client-api.version");
         if ((rhqCoreClientApiVersion == null) || rhqCoreClientApiVersion.trim().isEmpty()) {
             rhqCoreClientApiVersion = projectVersion;