18
18
19
19
import static org .junit .Assert .assertEquals ;
20
20
import static org .junit .Assert .assertFalse ;
21
+ import static org .junit .Assert .assertNotNull ;
21
22
import static org .junit .Assert .assertTrue ;
22
23
import static org .mockito .ArgumentMatchers .any ;
23
24
import static org .mockito .ArgumentMatchers .eq ;
46
47
import java .io .ByteArrayInputStream ;
47
48
import java .nio .Buffer ;
48
49
import java .nio .ByteBuffer ;
49
- import java .nio .charset .Charset ;
50
+ import java .nio .charset .StandardCharsets ;
50
51
import java .util .ArrayList ;
51
52
import java .util .HashMap ;
52
53
import java .util .List ;
@@ -102,7 +103,7 @@ void setStream(CronetClientStream stream) {
102
103
@ Override
103
104
@ SuppressWarnings ("GuardedBy" )
104
105
public void run () {
105
- assertTrue (stream != null );
106
+ assertNotNull (stream );
106
107
stream .transportState ().start (factory );
107
108
}
108
109
}
@@ -168,7 +169,7 @@ public void write() {
168
169
for (int i = 0 ; i < 5 ; ++i ) {
169
170
requests [i ] = "request" + i ;
170
171
buffers [i ] = allocator .allocate (requests [i ].length ());
171
- buffers [i ].write (requests [i ].getBytes (Charset . forName ( "UTF-8" ) ), 0 , requests [i ].length ());
172
+ buffers [i ].write (requests [i ].getBytes (StandardCharsets . UTF_8 ), 0 , requests [i ].length ());
172
173
// The 3rd and 5th writeFrame calls have flush=true.
173
174
clientStream .abstractClientStreamSink ().writeFrame (buffers [i ], false , i == 2 || i == 4 , 1 );
174
175
}
@@ -253,7 +254,7 @@ public void read() {
253
254
callback .onReadCompleted (
254
255
cronetStream ,
255
256
info ,
256
- createMessageFrame (new String ( "response1" ) .getBytes (Charset . forName ( "UTF-8" ) )),
257
+ createMessageFrame ("response1" .getBytes (StandardCharsets . UTF_8 )),
257
258
false );
258
259
// Haven't request any message, so no callback is called here.
259
260
verify (clientListener , times (0 )).messagesAvailable (isA (MessageProducer .class ));
@@ -283,9 +284,9 @@ public void streamSucceeded() {
283
284
verify (cronetStream , times (0 )).write (isA (ByteBuffer .class ), isA (Boolean .class ));
284
285
// Send the first data frame.
285
286
CronetWritableBufferAllocator allocator = new CronetWritableBufferAllocator ();
286
- String request = new String ( "request" ) ;
287
+ String request = "request" ;
287
288
WritableBuffer writableBuffer = allocator .allocate (request .length ());
288
- writableBuffer .write (request .getBytes (Charset . forName ( "UTF-8" ) ), 0 , request .length ());
289
+ writableBuffer .write (request .getBytes (StandardCharsets . UTF_8 ), 0 , request .length ());
289
290
clientStream .abstractClientStreamSink ().writeFrame (writableBuffer , false , true , 1 );
290
291
ArgumentCaptor <ByteBuffer > bufferCaptor = ArgumentCaptor .forClass (ByteBuffer .class );
291
292
verify (cronetStream , times (1 )).write (bufferCaptor .capture (), isA (Boolean .class ));
@@ -304,7 +305,7 @@ public void streamSucceeded() {
304
305
callback .onReadCompleted (
305
306
cronetStream ,
306
307
info ,
307
- createMessageFrame (new String ( "response" ) .getBytes (Charset . forName ( "UTF-8" ) )),
308
+ createMessageFrame ("response" .getBytes (StandardCharsets . UTF_8 )),
308
309
false );
309
310
verify (clientListener , times (1 )).messagesAvailable (isA (MessageProducer .class ));
310
311
verify (cronetStream , times (2 )).read (isA (ByteBuffer .class ));
@@ -680,7 +681,7 @@ public void getUnaryRequest() {
680
681
.newBidirectionalStreamBuilder (
681
682
isA (String .class ), isA (BidirectionalStream .Callback .class ), isA (Executor .class ));
682
683
683
- byte [] msg = "request" .getBytes (Charset . forName ( "UTF-8" ) );
684
+ byte [] msg = "request" .getBytes (StandardCharsets . UTF_8 );
684
685
stream .writeMessage (new ByteArrayInputStream (msg ));
685
686
// We still haven't built the stream or sent anything.
686
687
verify (cronetStream , times (0 )).write (isA (ByteBuffer .class ), isA (Boolean .class ));
0 commit comments