Bug 1188751 - Deploying Versioned WAR package from repository to JBOS

Fix itests - removed test for creating deployment child to serverGroup
resource (removed from code base prior 3.3)

(cherry picked from commit cb3d26e)
Signed-off-by: Libor Zoubek <lzoubek@redhat.com>

Author: Libor Zoubek

modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/UploadAndDeployTest.java

@@ -368,46 +368,4 @@ public void testUploadViaCreateChild1() throws Exception {
         }
     }
 
-    /**
-     * Test the real API code for uploading - case 2: upload to /deployment and a server group
-     * @throws Exception if anything goes wrong.
-     */
-    public void testUploadViaCreateChild2() throws Exception {
-        BaseComponent bc = new BaseComponent();
-        bc.setPath("server-group=main-server-group");
-        ResourceType rt = new ResourceType();
-        rt.setName("Deployment");
-        Resource resource = new Resource("server-group=main-server-group", TEST_WAR_FILE_NAME, rt);
-        resource.setUuid(UUID.randomUUID().toString());
-        StandaloneASComponent parentComponent = new StandaloneASComponent();
-        parentComponent.setConnection(getDomainControllerASConnection());
-        ResourceContext context = new ResourceContext(resource, parentComponent, null, null, null, null, null, null,
-            null, null, null, null, null, null);
-        bc.start(context);
-
-        String bytes_value = uploadToAs(TEST_WAR_PATH);
-
-        ResourcePackageDetails details = new ResourcePackageDetails(new PackageDetailsKey(TEST_WAR_FILE_NAME, "1.0",
-            "deployment", "all"));
-        CreateResourceReport report = new CreateResourceReport(TEST_WAR_FILE_NAME, rt, new Configuration(),
-            new Configuration(), details);
-        try {
-            report = bc.runDeploymentMagicOnServer(report, TEST_WAR_FILE_NAME, TEST_WAR_FILE_NAME, bytes_value);
-            assert report != null;
-            assert report.getErrorMessage() == null : "Report contained an unexpected error: "
-                + report.getErrorMessage();
-            assert report.getStatus() != null : "Report did not contain a status";
-            assert report.getStatus() == CreateResourceStatus.SUCCESS : "Status was no success";
-            assert report.getResourceName().equals(TEST_WAR_FILE_NAME);
-            assert report.getResourceKey().equals("server-group=main-server-group,deployment=" + TEST_WAR_FILE_NAME) : "Resource key was wrong";
-        } finally {
-            Address sgd = new Address("server-group", "main-server-group");
-            sgd.add("deployment", TEST_WAR_FILE_NAME);
-            Remove r = new Remove(sgd);
-            getDomainControllerASConnection().execute(r);
-            r = new Remove("deployment", TEST_WAR_FILE_NAME);
-            getDomainControllerASConnection().execute(r);
-        }
-    }
-
 }

modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java

@@ -52,6 +52,7 @@
 import org.rhq.core.domain.configuration.Configuration;
 import org.rhq.core.domain.configuration.PropertySimple;
 import org.rhq.core.domain.content.PackageDetailsKey;
+import org.rhq.core.domain.content.transfer.ContentResponseResult;
 import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
 import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
 import org.rhq.core.domain.measurement.DataType;
@@ -209,7 +210,7 @@ public void testRedeploy() throws Exception {
                 Collections.singleton(packageDetails));
 
             DeployPackagesResponse response = pluginContainer.getContentManager().deployPackagesImmediately(request);
-
+            assertEquals(response.getOverallRequestResult(), ContentResponseResult.SUCCESS);
             testContentRetrieval(TestDeployments.DEPLOYMENT_2);
         } finally {
             //switch the served deployment back, so that other tests aren't affected

modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java

@@ -11,7 +11,7 @@
 */
 enum TestDeployments {
     DEPLOYMENT_1("test-simple-1.0.war", "test-simple.war"), //
-    DEPLOYMENT_2("test-simple-2.war"), //
+    DEPLOYMENT_2("test-simple-2.0.war"), //
     JAVAEE6_TEST_APP("javaee6-test-app.war");
 
     private String deploymentName;