Fixed test compilation issue

restlet · Oct 26, 2017 · c70db60 · c70db60
1 parent 8f8d134
commit c70db60
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 131 deletions.
diff --git a/modules/org.restlet.test/pom.xml b/modules/org.restlet.test/pom.xml
@@ -214,5 +214,11 @@
             <version>2.4-SNAPSHOT</version>
 
         </dependency>
+        <dependency>
+            <groupId>org.restlet.dev</groupId>
+            <artifactId>org.restlet.ext.nio</artifactId>
+            <version>2.4-SNAPSHOT</version>
+
+        </dependency>
     </dependencies>
 </project>
diff --git a/modules/org.restlet.test/src/main/java/org/restlet/test/engine/EngineTestSuite.java b/modules/org.restlet.test/src/main/java/org/restlet/test/engine/EngineTestSuite.java
@@ -31,9 +31,7 @@
 import org.restlet.test.engine.connector.ConnectorsTestSuite;
 import org.restlet.test.engine.connector.HttpInboundRequestTestCase;
 import org.restlet.test.engine.io.BioUtilsTestCase;
-import org.restlet.test.engine.io.BufferTestCase;
 import org.restlet.test.engine.io.ReaderInputStreamTestCase;
-import org.restlet.test.engine.util.Base64TestCase;
 
 /**
  * Suite of unit tests for the Restlet Framework.
@@ -56,8 +54,6 @@ public EngineTestSuite() {
         super("Engine package");
         addTestSuite(AlphaNumericComparatorTestCase.class);
         addTestSuite(AnnotationUtilsTestCase.class);
-        addTestSuite(Base64TestCase.class);
-        addTestSuite(BufferTestCase.class);
         addTestSuite(BioUtilsTestCase.class);
         addTestSuite(CookiesTestCase.class);
         addTestSuite(ContentTypeTestCase.class);

diff --git a/modules/org.restlet.test/src/main/java/org/restlet/test/engine/HeaderTestCase.java b/modules/org.restlet.test/src/main/java/org/restlet/test/engine/HeaderTestCase.java
@@ -26,6 +26,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Date;
 import java.util.List;
 
@@ -39,7 +40,6 @@
 import org.restlet.engine.header.HeaderUtils;
 import org.restlet.engine.header.PreferenceReader;
 import org.restlet.engine.header.TokenReader;
-import org.restlet.engine.util.Base64;
 import org.restlet.engine.util.DateUtils;
 import org.restlet.representation.Representation;
 import org.restlet.test.RestletTestCase;
@@ -100,11 +100,10 @@ public void testExtracting() {
         ArrayList<Header> headers = new ArrayList<Header>();
         String md5hash = "aaaaaaaaaaaaaaaa";
         // encodes to "YWFhYWFhYWFhYWFhYWFhYQ==", the "==" at the end is padding
-        String encodedWithPadding = Base64.encode(md5hash.getBytes(), false);
+        String encodedWithPadding = Base64.getEncoder().encodeToString(md5hash.getBytes());
         String encodedNoPadding = encodedWithPadding.substring(0, 22);
 
-        Header header = new Header(HeaderConstants.HEADER_CONTENT_MD5,
-                encodedWithPadding);
+        Header header = new Header(HeaderConstants.HEADER_CONTENT_MD5, encodedWithPadding);
         headers.add(header);
 
         // extract Content-MD5 header with padded Base64 encoding, make sure it

diff --git a/modules/org.restlet.test/src/main/java/org/restlet/test/engine/util/Base64TestCase.java b/modules/org.restlet.test/src/main/java/org/restlet/test/engine/util/Base64TestCase.java
diff --git a/modules/org.restlet/src/test/java/org/restlet/engine/util/Base64Test.java b/modules/org.restlet/src/test/java/org/restlet/engine/util/Base64Test.java