Ditch Truth from web-jetty-impl

Use JUnit assertions instead.

Change-Id: Id5cc0addd95c0b313c86bc825f128163e7b6aa6e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/web/impl-jetty/pom.xml b/web/impl-jetty/pom.xml
index 935dff0a63d681a8bb8a5d7932e3974b3e7037cb..c7f47d120b8d3b5306101af3dfc3e920768c785f 100644 (file)
--- a/web/impl-jetty/pom.xml
+++ b/web/impl-jetty/pom.xml
@@ -52,10 +52,5 @@
       <artifactId>javax.annotation-api</artifactId>
       <optional>true</optional>
     </dependency>
-
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-    </dependency>
   </dependencies>
 </project>

diff --git a/web/impl-jetty/src/test/java/org/opendaylight/aaa/web/test/AbstractWebServerTest.java b/web/impl-jetty/src/test/java/org/opendaylight/aaa/web/test/AbstractWebServerTest.java
index 64aca73a50cece82d41ad2c6a770504f119be1dd..2907347966bd137d845cdf6ae25b3e0a7889fb7e 100644 (file)
--- a/web/impl-jetty/src/test/java/org/opendaylight/aaa/web/test/AbstractWebServerTest.java
+++ b/web/impl-jetty/src/test/java/org/opendaylight/aaa/web/test/AbstractWebServerTest.java
@@ -7,15 +7,16 @@
  */
 package org.opendaylight.aaa.web.test;
 
-import static com.google.common.truth.Truth.assertThat;
-import static java.nio.charset.StandardCharsets.US_ASCII;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import com.google.common.io.CharStreams;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
-import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
 import javax.servlet.ServletException;
 import org.junit.Test;
 import org.opendaylight.aaa.web.FilterDetails;
@@ -64,7 +65,7 @@ public abstract class AbstractWebServerTest {
             .putContextParam("testParam1", "avalue")
             .addFilter(FilterDetails.builder().addUrlPattern("/*").name("Test").filter(testFilter).build());
         WebContextRegistration webContextRegistration = getWebServer().registerWebContext(webContextBuilder.build());
-        assertThat(testFilter.isInitialized).isTrue();
+        assertTrue(testFilter.isInitialized);
         webContextRegistration.close();
     }
 
@@ -73,24 +74,20 @@ public abstract class AbstractWebServerTest {
         WebContextBuilder webContextBuilder = WebContext.builder().contextPath("/testingListener");
         TestListener testListener = new TestListener();
         webContextBuilder.addListener(testListener);
-        assertThat(testListener.isInitialized).isFalse();
+        assertFalse(testListener.isInitialized);
         WebContextRegistration webContextRegistration = getWebServer().registerWebContext(webContextBuilder.build());
-        assertThat(testListener.isInitialized).isTrue();
+        assertTrue(testListener.isInitialized);
         webContextRegistration.close();
-        assertThat(testListener.isInitialized).isFalse();
+        assertFalse(testListener.isInitialized);
     }
 
     static void checkTestServlet(String urlPrefix) throws IOException {
-        URL url = new URL(urlPrefix + "/something");
-        URLConnection conn = url.openConnection();
-        try (InputStream inputStream = conn.getInputStream()) {
+        try (InputStream inputStream = new URL(urlPrefix + "/something").openConnection().getInputStream()) {
             // The hard-coded ASCII here is strictly speaking wrong of course
             // (should interpret header from reply), but good enough for a test.
-            try (InputStreamReader reader = new InputStreamReader(inputStream, US_ASCII)) {
-                String result = CharStreams.toString(reader);
-                assertThat(result).startsWith("hello, world");
+            try (InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.US_ASCII)) {
+                assertEquals("hello, world\r\n", CharStreams.toString(reader));
             }
         }
     }
-
 }

diff --git a/web/impl-jetty/src/test/java/org/opendaylight/aaa/web/test/TestFilter.java b/web/impl-jetty/src/test/java/org/opendaylight/aaa/web/test/TestFilter.java
index ddfc38078e8bfbacc7a2104573ba9786e1bc3c85..8ac6a49ddc6418cfe520a4f9b530a3e178d65c64 100644 (file)
--- a/web/impl-jetty/src/test/java/org/opendaylight/aaa/web/test/TestFilter.java
+++ b/web/impl-jetty/src/test/java/org/opendaylight/aaa/web/test/TestFilter.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.aaa.web.test;
 
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
 import javax.servlet.Filter;
@@ -18,12 +18,11 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
 public class TestFilter implements Filter {
-
     public boolean isInitialized = false;
 
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
-        assertThat(filterConfig.getServletContext().getAttribute("testParam1")).isEqualTo("avalue");
+        assertEquals("avalue", filterConfig.getServletContext().getAttribute("testParam1"));
         isInitialized = true;
     }
 
@@ -36,5 +35,4 @@ public class TestFilter implements Filter {
     @Override
     public void destroy() {
     }
-
 }