[BZ 1022943] Don't duplicate the test setup that can be shared.

rhq-project · Apr 30, 2014 · af569be · af569be
1 parent a5aff45
commit af569be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/...n-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/AbstractBase.java b/...n-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/AbstractBase.java
@@ -54,13 +54,16 @@ public abstract class AbstractBase {
     int _platformId ;
     int _platformTypeId;
 
-    @Before
-    public void setUp() throws Exception {
-
+    protected static void setupRestAssured() {
         RestAssured.baseURI = "http://" + System.getProperty("rest.server","localhost")  ;
         RestAssured.port = 7080;
         RestAssured.basePath = "/rest/";
         RestAssured.authentication = basic("rhqadmin","rhqadmin");
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        setupRestAssured();
 
         Resource resource = new Resource();
         resource.setResourceName(REST_TEST_DUMMY);

diff --git a/...on-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/PluginsTest.java b/...on-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/PluginsTest.java
@@ -19,19 +19,14 @@
 
 package org.rhq.modules.integrationTests.restApi;
 
-import static com.jayway.restassured.RestAssured.basic;
 import static com.jayway.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.Matchers.endsWith;
-import static org.hamcrest.Matchers.isOneOf;
-import static org.hamcrest.Matchers.startsWith;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
-import com.jayway.restassured.RestAssured;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.path.json.JsonPath;
 
@@ -50,10 +45,7 @@ public class PluginsTest extends AbstractBase {
 
     @BeforeClass
     public static void installDummyPlugin() throws Exception {
-        RestAssured.baseURI = "http://" + System.getProperty("rest.server","localhost")  ;
-        RestAssured.port = 7080;
-        RestAssured.basePath = "/rest/";
-        RestAssured.authentication = basic("rhqadmin","rhqadmin");
+        setupRestAssured();
 
         InputStream in =
             PluginsTest.class.getClassLoader().getResourceAsStream("dummy-rhq-plugin.xml");