Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 139738f2 authored by lucaslin's avatar lucaslin
Browse files

Refine NetworkMonitorTest#testReadAsString_StreamShorterThanLimit() 

The characters of string may not only contain ASCII characters,
so the length of string may not the same as bytes.

Replace the string to byte[].

Bug: 154217644
Test: atest NetworkStackTests:NetworkMonitorTest
Change-Id: I6552a6c8a291d54fc16bd3a1df3ab29a4481b20d
parent d918a7c3

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+7 −9
Original line number Diff line number Diff line
@@ -1861,15 +1861,13 @@ public class NetworkMonitorTest { 
    @Test

    public void testReadAsString_StreamShorterThanLimit() throws Exception {

        final WrappedNetworkMonitor wnm = makeNotMeteredNetworkMonitor();

        final String content = "The HTTP response code is 200 but it is not a captive portal.";

        ByteArrayInputStream inputStream = new ByteArrayInputStream(

                content.getBytes(StandardCharsets.UTF_8));

        assertEquals(content, wnm.readAsString(inputStream, content.length(),

                StandardCharsets.UTF_8));

        // Reset the inputStream and test the case that the stream ends earlier than the limit.

        inputStream = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));

        assertEquals(content, wnm.readAsString(inputStream, content.length() + 10,

                StandardCharsets.UTF_8));

        final byte[] content = "The HTTP response code is 200 but it is not a captive portal."

                .getBytes(StandardCharsets.UTF_8);

        assertEquals(new String(content), wnm.readAsString(new ByteArrayInputStream(content),

                content.length, StandardCharsets.UTF_8));

        // Test the case that the stream ends earlier than the limit.

        assertEquals(new String(content), wnm.readAsString(new ByteArrayInputStream(content),

                content.length + 10, StandardCharsets.UTF_8));

    }



    @Test