Skip to content

Commit c70db60

Browse files
committed
Fixed test compilation issue
1 parent 8f8d134 commit c70db60

File tree

5 files changed

+9
-131
lines changed

5 files changed

+9
-131
lines changed

modules/org.restlet.test/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -214,5 +214,11 @@
214214
<version>2.4-SNAPSHOT</version>
215215

216216
</dependency>
217+
<dependency>
218+
<groupId>org.restlet.dev</groupId>
219+
<artifactId>org.restlet.ext.nio</artifactId>
220+
<version>2.4-SNAPSHOT</version>
221+
222+
</dependency>
217223
</dependencies>
218224
</project>

modules/org.restlet.test/src/main/java/org/restlet/test/engine/EngineTestSuite.java

-4
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
import org.restlet.test.engine.connector.ConnectorsTestSuite;
3232
import org.restlet.test.engine.connector.HttpInboundRequestTestCase;
3333
import org.restlet.test.engine.io.BioUtilsTestCase;
34-
import org.restlet.test.engine.io.BufferTestCase;
3534
import org.restlet.test.engine.io.ReaderInputStreamTestCase;
36-
import org.restlet.test.engine.util.Base64TestCase;
3735

3836
/**
3937
* Suite of unit tests for the Restlet Framework.
@@ -56,8 +54,6 @@ public EngineTestSuite() {
5654
super("Engine package");
5755
addTestSuite(AlphaNumericComparatorTestCase.class);
5856
addTestSuite(AnnotationUtilsTestCase.class);
59-
addTestSuite(Base64TestCase.class);
60-
addTestSuite(BufferTestCase.class);
6157
addTestSuite(BioUtilsTestCase.class);
6258
addTestSuite(CookiesTestCase.class);
6359
addTestSuite(ContentTypeTestCase.class);

modules/org.restlet.test/src/main/java/org/restlet/test/engine/HeaderTestCase.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import java.io.IOException;
2828
import java.util.ArrayList;
29+
import java.util.Base64;
2930
import java.util.Date;
3031
import java.util.List;
3132

@@ -39,7 +40,6 @@
3940
import org.restlet.engine.header.HeaderUtils;
4041
import org.restlet.engine.header.PreferenceReader;
4142
import org.restlet.engine.header.TokenReader;
42-
import org.restlet.engine.util.Base64;
4343
import org.restlet.engine.util.DateUtils;
4444
import org.restlet.representation.Representation;
4545
import org.restlet.test.RestletTestCase;
@@ -100,11 +100,10 @@ public void testExtracting() {
100100
ArrayList<Header> headers = new ArrayList<Header>();
101101
String md5hash = "aaaaaaaaaaaaaaaa";
102102
// encodes to "YWFhYWFhYWFhYWFhYWFhYQ==", the "==" at the end is padding
103-
String encodedWithPadding = Base64.encode(md5hash.getBytes(), false);
103+
String encodedWithPadding = Base64.getEncoder().encodeToString(md5hash.getBytes());
104104
String encodedNoPadding = encodedWithPadding.substring(0, 22);
105105

106-
Header header = new Header(HeaderConstants.HEADER_CONTENT_MD5,
107-
encodedWithPadding);
106+
Header header = new Header(HeaderConstants.HEADER_CONTENT_MD5, encodedWithPadding);
108107
headers.add(header);
109108

110109
// extract Content-MD5 header with padded Base64 encoding, make sure it

modules/org.restlet.test/src/main/java/org/restlet/test/engine/util/Base64TestCase.java

-74
This file was deleted.

modules/org.restlet/src/test/java/org/restlet/engine/util/Base64Test.java

-49
This file was deleted.

0 commit comments

Comments
 (0)