iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with fork

This commit is contained in:
Ahmed Tawila 2017-10-27 10:17:01 +02:00
parent e6058445d9
commit 5a23a69081
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core-java/src/test/java/com/baeldung/string/StringTest.java
View File

@ -5,10 +5,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
<<<<<<< HEAD
=======
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
>>>>>>> ef4ee45a18de65b0c81bbe8da16c0b063b2201a5
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.IllegalFormatException; import java.util.IllegalFormatException;
import java.util.regex.PatternSyntaxException; import java.util.regex.PatternSyntaxException;
@ -33,13 +30,6 @@ public class StringTest {
} }
@Test @Test
<<<<<<< HEAD
public void whenGetBytes_thenCorrect() {
byte[] byteArray = "abcd".getBytes();
byte[] expected = new byte[] { 97, 98, 99, 100 };
assertArrayEquals(expected, byteArray);
=======
public void whenGetBytes_thenCorrect() throws UnsupportedEncodingException { public void whenGetBytes_thenCorrect() throws UnsupportedEncodingException {
byte[] byteArray1 = "abcd".getBytes(); byte[] byteArray1 = "abcd".getBytes();
byte[] byteArray2 = "efgh".getBytes(StandardCharsets.US_ASCII); byte[] byteArray2 = "efgh".getBytes(StandardCharsets.US_ASCII);
@ -51,7 +41,6 @@ public class StringTest {
assertArrayEquals(expected1, byteArray1); assertArrayEquals(expected1, byteArray1);
assertArrayEquals(expected2, byteArray2); assertArrayEquals(expected2, byteArray2);
assertArrayEquals(expected3, byteArray3); assertArrayEquals(expected3, byteArray3);
>>>>>>> ef4ee45a18de65b0c81bbe8da16c0b063b2201a5
} }
@Test @Test
@ -234,4 +223,4 @@ public class StringTest {
assertEquals("200", String.valueOf(l)); assertEquals("200", String.valueOf(l));
} }
} }