Merge pull request #70 from dwalluck/fix-deprecated-calls

Replace deprecated `assertThat` and `IOUtils.toString()` calls

Author: dwalluck

junit4/src/test/java/org/commonjava/test/http/junt4/TestHttpServerTest.java

@@ -29,10 +29,11 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TestHttpServerTest
 {
@@ -94,7 +95,7 @@ private String getHttpContent(String url) throws IOException
         try(CloseableHttpResponse response = client.execute( request ))
         {
             InputStream stream = response.getEntity().getContent();
-            return IOUtils.toString( stream );
+            return IOUtils.toString( stream, StandardCharsets.UTF_8 );
         }
         finally
         {

junit5/src/test/java/org/commonjava/test/http/junit5/AbstractExtensionTest.java

@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
@@ -91,7 +92,7 @@ public void simpleDownload()
         {
             response = client.execute( request );
             stream = response.getEntity().getContent();
-            final String result = IOUtils.toString( stream );
+            final String result = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
             assertThat( result, notNullValue() );
             assertThat( result, equalTo( content ) );

quarkus/src/test/java/org/commonjava/test/http/quarkus/TestHttpServerWithQuarkus.java

@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
@@ -94,7 +95,7 @@ public void simpleDownload()
         {
             response = client.execute( request );
             stream = response.getEntity().getContent();
-            final String result = IOUtils.toString( stream );
+            final String result = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
             assertThat( result, notNullValue() );
             assertThat( result, equalTo( content ) );