File tree Expand file tree Collapse file tree 5 files changed +9
-131
lines changed
src/main/java/org/restlet/test/engine
org.restlet/src/test/java/org/restlet/engine/util Expand file tree Collapse file tree 5 files changed +9
-131
lines changed Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 3131import org .restlet .test .engine .connector .ConnectorsTestSuite ;
3232import org .restlet .test .engine .connector .HttpInboundRequestTestCase ;
3333import org .restlet .test .engine .io .BioUtilsTestCase ;
34- import org .restlet .test .engine .io .BufferTestCase ;
3534import 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 );
Original file line number Diff line number Diff line change 2626
2727import java .io .IOException ;
2828import java .util .ArrayList ;
29+ import java .util .Base64 ;
2930import java .util .Date ;
3031import java .util .List ;
3132
3940import org .restlet .engine .header .HeaderUtils ;
4041import org .restlet .engine .header .PreferenceReader ;
4142import org .restlet .engine .header .TokenReader ;
42- import org .restlet .engine .util .Base64 ;
4343import org .restlet .engine .util .DateUtils ;
4444import org .restlet .representation .Representation ;
4545import 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
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments