rename test classes to allow tests to run

MicroShed · May 9, 2019 · f114966 · f114966
1 parent ce9e26d
commit f114966
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/boost-maven/boost-boms/booster-ee8-bom/pom.xml b/boost-maven/boost-boms/booster-ee8-bom/pom.xml
@@ -60,12 +60,12 @@
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
-				<groupId>io.openliberty.boosters</groupId>
+				<groupId>boost.boosters</groupId>
 				<artifactId>cdi</artifactId>
 				<version>0.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
-				<groupId>io.openliberty.boosters</groupId>
+				<groupId>boost.boosters</groupId>
 				<artifactId>jsonp</artifactId>
 				<version>0.2-SNAPSHOT</version>
 			</dependency>

diff --git a/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/pom.xml b/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/pom.xml
@@ -1,7 +1,6 @@
-<?xml version='1.0' encoding='utf-8'?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>boost</groupId>
 	<artifactId>test-cdi-2.0</artifactId>
@@ -81,7 +80,6 @@
             <scope>test</scope>
         </dependency>
         <!-- Support for JDK 9 and above -->
-        <!-- 
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -97,7 +95,6 @@
             <artifactId>jaxb-impl</artifactId>
             <version>2.3.2</version>
         </dependency>
-        -->
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>activation</artifactId>

diff --git a/...rc/it/test-cdi-2.0/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java b/...rc/it/test-cdi-2.0/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java
@@ -27,7 +27,9 @@
 public class SystemClient {
 
     // Constants for building URI to the system service.
-    private final int DEFAULT_PORT = Integer.valueOf(System.getProperty("default.http.port"));
+    // private final int DEFAULT_PORT =
+    // Integer.valueOf(System.getProperty("default.http.port"));
+    private final int DEFAULT_PORT = 9000;
     private final String SYSTEM_PROPERTIES = "/system/properties";
     private final String PROTOCOL = "http";
 

diff --git a/...ides/inventory/InventoryEndpointTest.java → ...guides/inventory/InventoryEndpointIT.java b/...ides/inventory/InventoryEndpointTest.java → ...guides/inventory/InventoryEndpointIT.java
@@ -28,7 +28,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class InventoryEndpointTest {
+public class InventoryEndpointIT {
 
     private static String port;
     private static String baseUrl;
@@ -41,7 +41,7 @@ public class InventoryEndpointTest {
     @BeforeClass
     public static void oneTimeSetup() {
         // port = System.getProperty("liberty.test.port");
-        String port = "9080";
+        String port = "9000";
         baseUrl = "http://localhost:" + port + "/";
     }
 

diff --git a/...rty/guides/system/SystemEndpointTest.java → ...berty/guides/system/SystemEndpointIT.java b/...rty/guides/system/SystemEndpointTest.java → ...berty/guides/system/SystemEndpointIT.java
@@ -22,12 +22,12 @@
 import org.apache.cxf.jaxrs.provider.jsrjsonp.JsrJsonpProvider;
 import org.junit.Test;
 
-public class SystemEndpointTest {
+public class SystemEndpointIT {
 
     @Test
     public void testGetProperties() {
         // String port = System.getProperty("liberty.test.port");
-        String port = "9080";
+        String port = "9000";
         String url = "http://localhost:" + port + "/";
 
         Client client = ClientBuilder.newClient();