Closes #46

holon-platform · Feb 28, 2019 · 0da9e85 · 0da9e85
1 parent a9dd131
commit 0da9e85
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 24 deletions.
diff --git a/client-reactor/pom.xml b/client-reactor/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>
 
 	<parent>
@@ -55,13 +57,18 @@
 		</dependency>
 
 		<!-- Test -->
+
 		<dependency>
 			<groupId>com.holon-platform.core</groupId>
 			<artifactId>holon-test</artifactId>
 			<version>${holon.core.version}</version>
 			<scope>test</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>

diff --git a/...or/src/test/java/com/holonplatform/jaxrs/client/reactor/test/TestReactiveJaxrsClient.java b/...or/src/test/java/com/holonplatform/jaxrs/client/reactor/test/TestReactiveJaxrsClient.java
@@ -18,6 +18,7 @@
 import static com.holonplatform.core.property.PathProperty.create;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
@@ -66,7 +67,6 @@
 import com.holonplatform.jaxrs.client.reactor.JaxrsReactiveRestClient;
 import com.holonplatform.reactor.http.ReactiveRestClient;
 import com.holonplatform.test.JerseyTest5;
-import com.holonplatform.test.TestUtils;
 
 public class TestReactiveJaxrsClient extends JerseyTest5 {
 
@@ -439,7 +439,7 @@ public void testErrors() {
 					assertEquals("ERR000", error.getCode());
 				}).block();
 
-		TestUtils.expectedException(UnsuccessfulResponseException.class, () -> {
+		assertThrows(UnsuccessfulResponseException.class, () -> {
 			client.request().path("test").path("data2/{id}").resolve("id", -1).getForEntity(TestData.class).block();
 		});
 

diff --git a/client/pom.xml b/client/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>
 
 	<parent>
@@ -55,12 +57,17 @@
 		</dependency>
 
 		<!-- Test -->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.holon-platform.core</groupId>
 			<artifactId>holon-test</artifactId>

diff --git a/client/src/test/java/com/holonplatform/jaxrs/client/test/TestAsyncJaxrsClient.java b/client/src/test/java/com/holonplatform/jaxrs/client/test/TestAsyncJaxrsClient.java
@@ -18,6 +18,7 @@
 import static com.holonplatform.core.property.PathProperty.create;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
@@ -71,7 +72,6 @@
 import com.holonplatform.jaxrs.client.test.TestJaxrsClient.ApiError;
 import com.holonplatform.jaxrs.client.test.TestJaxrsClient.TestData;
 import com.holonplatform.test.JerseyTest5;
-import com.holonplatform.test.TestUtils;
 
 public class TestAsyncJaxrsClient extends JerseyTest5 {
 
@@ -442,7 +442,7 @@ public void testErrors() {
 					assertEquals("ERR000", error.getCode());
 				}).toCompletableFuture().join();
 
-		TestUtils.expectedException(CompletionException.class, () -> {
+		assertThrows(CompletionException.class, () -> {
 			client.request().path("test").path("data2/{id}").resolve("id", -1).getForEntity(TestData.class)
 					.toCompletableFuture().join();
 		});

diff --git a/client/src/test/java/com/holonplatform/jaxrs/client/test/TestJaxrsClient.java b/client/src/test/java/com/holonplatform/jaxrs/client/test/TestJaxrsClient.java
@@ -18,6 +18,7 @@
 import static com.holonplatform.core.property.PathProperty.create;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
@@ -63,7 +64,6 @@
 import com.holonplatform.http.rest.RestClient;
 import com.holonplatform.jaxrs.client.JaxrsRestClient;
 import com.holonplatform.test.JerseyTest5;
-import com.holonplatform.test.TestUtils;
 
 public class TestJaxrsClient extends JerseyTest5 {
 
@@ -372,7 +372,7 @@ public void testErrors() {
 		assertNotNull(error);
 		assertEquals("ERR000", error.getCode());
 
-		TestUtils.expectedException(UnsuccessfulResponseException.class, () -> {
+		assertThrows(UnsuccessfulResponseException.class, () -> {
 			client.request().path("test").path("data2/{id}").resolve("id", -1).getForEntity(TestData.class)
 					.orElse(null);
 		});

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -55,6 +55,11 @@
 			<version>${holon.core.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.glassfish.jersey.test-framework.providers</groupId>

diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>
 
 	<parent>
@@ -58,13 +60,13 @@
 		<bintray.package>holon-jaxrs</bintray.package>
 
 		<!-- Holon core -->
-		<holon.core.version>5.2.0</holon.core.version>
+		<holon.core.version>5.2.1</holon.core.version>
 
 		<!-- Holon json -->
-		<holon.json.version>5.2.0</holon.json.version>
+		<holon.json.version>5.2.1</holon.json.version>
 
 		<!-- Holon reactor -->
-		<holon.reactor.version>5.2.0</holon.reactor.version>
+		<holon.reactor.version>5.2.1</holon.reactor.version>
 
 		<!-- JAX-RS API -->
 		<jax-rs.api.version>2.1</jax-rs.api.version>
@@ -129,12 +131,6 @@
 			<artifactId>junit-jupiter-engine</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<!-- Logback for tests -->
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/server/pom.xml b/server/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>
 
 	<parent>
@@ -80,13 +82,18 @@
 			<version>${holon.core.version}</version>
 			<scope>test</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>com.holon-platform.core</groupId>
 			<artifactId>holon-test</artifactId>
 			<version>${holon.core.version}</version>
 			<scope>test</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>

diff --git a/spring-security/pom.xml b/spring-security/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>
 
 	<parent>
@@ -76,7 +78,11 @@
 			<version>${holon.core.version}</version>
 			<scope>test</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>