diff options
Diffstat (limited to 'src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java')
-rw-r--r-- | src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java | 92 |
1 files changed, 44 insertions, 48 deletions
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java index 9915abc4..79e6ca45 100644 --- a/src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java +++ b/src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java @@ -1,17 +1,15 @@ /** - * Copyright (c) 2008, http://www.snakeyaml.org + * Copyright (c) 2008, SnakeYAML * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. */ package org.yaml.snakeyaml.issues.issue68; @@ -24,54 +22,52 @@ import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CodingErrorAction; +import java.nio.charset.StandardCharsets; import java.util.Map; - import junit.framework.TestCase; - import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.YamlDocument; public class NonAsciiCharacterTest extends TestCase { - @SuppressWarnings("unchecked") - public void testLoad() { - Yaml yaml = new Yaml(); - Map<String, Map<String, String>> obj = (Map<String, Map<String, String>>) yaml - .load("test.string: {en: И}"); - assertEquals(1, obj.size()); - assertEquals("Map: " + obj.toString(), "И", obj.get("test.string").get("en")); - } + @SuppressWarnings("unchecked") + public void testLoad() { + Yaml yaml = new Yaml(); + Map<String, Map<String, String>> obj = yaml.load("test.string: {en: И}"); + assertEquals(1, obj.size()); + assertEquals("Map: " + obj, "И", obj.get("test.string").get("en")); + } - public void testLoadFromFileWithWrongEncoding() { - try { - Yaml yaml = new Yaml(); - InputStream input = new FileInputStream("src/test/resources/issues/issue68.txt"); - CharsetDecoder decoder = Charset.forName("Cp1252").newDecoder(); - decoder.onUnmappableCharacter(CodingErrorAction.REPORT); - Object text = yaml.load(new InputStreamReader(input, decoder)); - input.close(); - fail("Invalid UTF-8 must not be accepted: " + text.toString()); - } catch (Exception e) { - assertTrue(e.getMessage().endsWith("Exception: Input length = 1")); - } + public void testLoadFromFileWithWrongEncoding() { + try { + Yaml yaml = new Yaml(); + InputStream input = new FileInputStream("src/test/resources/issues/issue68.txt"); + CharsetDecoder decoder = Charset.forName("Cp1252").newDecoder(); + decoder.onUnmappableCharacter(CodingErrorAction.REPORT); + Object text = yaml.load(new InputStreamReader(input, decoder)); + input.close(); + fail("Invalid UTF-8 must not be accepted: " + text.toString()); + } catch (Exception e) { + assertTrue(e.getMessage().endsWith("Exception: Input length = 1")); } + } - public void testLoadFromFile() throws UnsupportedEncodingException, FileNotFoundException { - Yaml yaml = new Yaml(); - InputStream input = new FileInputStream("src/test/resources/issues/issue68.txt"); - String text = (String) yaml.load(new InputStreamReader(input, "UTF-8")); - assertEquals("И жить торопится и чувствовать спешит...", text); - } + public void testLoadFromFile() throws UnsupportedEncodingException, FileNotFoundException { + Yaml yaml = new Yaml(); + InputStream input = new FileInputStream("src/test/resources/issues/issue68.txt"); + String text = yaml.load(new InputStreamReader(input, StandardCharsets.UTF_8)); + assertEquals("И жить торопится и чувствовать спешит...", text); + } - public void testLoadFromInputStream() throws IOException { - InputStream input; - input = YamlDocument.class.getClassLoader().getResourceAsStream("issues/issue68.txt"); - if (input == null) { - throw new RuntimeException("Can not find issues/issue68.txt"); - } - Yaml yaml = new Yaml(); - String text = (String) yaml.load(input);// UTF-8 by default - assertEquals("И жить торопится и чувствовать спешит...", text); - input.close(); + public void testLoadFromInputStream() throws IOException { + InputStream input; + input = YamlDocument.class.getClassLoader().getResourceAsStream("issues/issue68.txt"); + if (input == null) { + throw new RuntimeException("Can not find issues/issue68.txt"); } + Yaml yaml = new Yaml(); + String text = yaml.load(input);// UTF-8 by default + assertEquals("И жить торопится и чувствовать спешит...", text); + input.close(); + } } |