Reformat code
diff --git a/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java
index dbe83ff..8ec45c4 100644
--- a/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java
+++ b/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java
@@ -282,18 +282,18 @@
int index = 0;
for (Node child : node.getValue()) {
// Handle multi-dimensional arrays...
- if ( child.getType() == Object.class ) {
+ if (child.getType() == Object.class) {
child.setType(componentType);
}
-
+
final Object value = constructObject(child);
if (componentType.isPrimitive()) {
// Null values are disallowed for primitives
- if ( value == null ) {
- throw new NullPointerException ( "Unable to construct element value for " + child );
+ if (value == null) {
+ throw new NullPointerException("Unable to construct element value for " + child);
}
-
+
// Primitive arrays require quite a lot of work.
if (byte.class.equals(componentType)) {
Array.setByte(array, index, ((Number) value).byteValue());
diff --git a/src/main/java/org/yaml/snakeyaml/constructor/Constructor.java b/src/main/java/org/yaml/snakeyaml/constructor/Constructor.java
index 560e483..71c2654 100644
--- a/src/main/java/org/yaml/snakeyaml/constructor/Constructor.java
+++ b/src/main/java/org/yaml/snakeyaml/constructor/Constructor.java
@@ -301,7 +301,7 @@
value = ((Double) value).floatValue();
}
}
-
+
property.set(object, value);
} catch (Exception e) {
throw new ConstructorException("Cannot create property=" + key
diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
index 4ea2e8b..dc734e8 100644
--- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
+++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
@@ -284,8 +284,10 @@
} catch (ParseException e) {
String lowerCaseValue = scalar.getValue().toLowerCase();
if (lowerCaseValue.contains("inf") || lowerCaseValue.contains("nan")) {
- // Non-finites such as (+/-)infinity and NaN are not parseable by NumberFormat when these `Double` values are dumped by snakeyaml.
- // Delegate to the `Tag.FLOAT` constructor when for this expected failure cause.
+ /* Non-finites such as (+/-)infinity and NaN are not parseable by NumberFormat
+ when these `Double` values are dumped by snakeyaml.
+ Delegate to the `Tag.FLOAT` constructor when for this expected failure cause.
+ */
return (Number) yamlConstructors.get(Tag.FLOAT).construct(node);
} else {
throw new IllegalArgumentException("Unable to parse as Number: "
diff --git a/src/main/java/org/yaml/snakeyaml/nodes/Node.java b/src/main/java/org/yaml/snakeyaml/nodes/Node.java
index c5e119f..ff056e9 100644
--- a/src/main/java/org/yaml/snakeyaml/nodes/Node.java
+++ b/src/main/java/org/yaml/snakeyaml/nodes/Node.java
@@ -56,7 +56,7 @@
* Tag of this node.
* <p>
* Every node has a tag assigned. The tag is either local or global.
- *
+ *
* @return Tag of this node.
*/
public Tag getTag() {
@@ -69,7 +69,7 @@
/**
* For error reporting.
- *
+ *
* @see "class variable 'id' in PyYAML"
* @return scalar, sequence, mapping
*/
@@ -122,7 +122,7 @@
* <p>
* Only relevant during loading.
* </p>
- *
+ *
* @return <code>true</code> if the node is self referenced.
*/
public boolean isTwoStepsConstruction() {
@@ -157,7 +157,7 @@
/**
* Indicates if the tag was added by
* {@link org.yaml.snakeyaml.resolver.Resolver}.
- *
+ *
* @return <code>true</code> if the tag of this node was resolved</code>
*/
public boolean isResolved() {
diff --git a/src/main/java/org/yaml/snakeyaml/nodes/Tag.java b/src/main/java/org/yaml/snakeyaml/nodes/Tag.java
index 893e88d..e856401 100644
--- a/src/main/java/org/yaml/snakeyaml/nodes/Tag.java
+++ b/src/main/java/org/yaml/snakeyaml/nodes/Tag.java
@@ -145,7 +145,7 @@
/**
* Java has more then 1 class compatible with a language-independent tag
* (!!int, !!float, !!timestamp etc)
- *
+ *
* @param clazz
* - Class to check compatibility
* @return true when the Class can be represented by this
@@ -162,7 +162,7 @@
/**
* Check whether this tag matches the global tag for the Class
- *
+ *
* @param clazz
* - Class to check
* @return true when the this tag can be used as a global tag for the Class
diff --git a/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java b/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java
index 5056e1e..3843016 100644
--- a/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java
+++ b/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java
@@ -96,7 +96,7 @@
return node;
}
}
-
+
// check defaults
if (multiRepresenters.containsKey(null)) {
Represent representer = multiRepresenters.get(null);
diff --git a/src/main/java/org/yaml/snakeyaml/representer/Representer.java b/src/main/java/org/yaml/snakeyaml/representer/Representer.java
index d3e12a2..0c85b3e 100644
--- a/src/main/java/org/yaml/snakeyaml/representer/Representer.java
+++ b/src/main/java/org/yaml/snakeyaml/representer/Representer.java
@@ -163,11 +163,10 @@
@SuppressWarnings("unchecked")
protected void checkGlobalTag(Property property, Node node, Object object) {
// Skip primitive arrays.
- if (object.getClass().isArray()
- && object.getClass().getComponentType().isPrimitive()) {
+ if (object.getClass().isArray() && object.getClass().getComponentType().isPrimitive()) {
return;
}
-
+
Class<?>[] arguments = property.getActualTypeArguments();
if (arguments != null) {
if (node.getNodeId() == NodeId.sequence) {
diff --git a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
index 0f30d3c..f98e9fb 100644
--- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
+++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
@@ -50,16 +50,16 @@
this.representers.put(Boolean.class, new RepresentBoolean());
this.representers.put(Character.class, new RepresentString());
this.representers.put(byte[].class, new RepresentByteArray());
-
+
Represent primitiveArray = new RepresentPrimitiveArray();
- representers.put(short[].class, primitiveArray);
- representers.put(int[].class, primitiveArray);
- representers.put(long[].class, primitiveArray);
- representers.put(float[].class, primitiveArray);
- representers.put(double[].class, primitiveArray);
- representers.put(char[].class, primitiveArray);
+ representers.put(short[].class, primitiveArray);
+ representers.put(int[].class, primitiveArray);
+ representers.put(long[].class, primitiveArray);
+ representers.put(float[].class, primitiveArray);
+ representers.put(double[].class, primitiveArray);
+ representers.put(char[].class, primitiveArray);
representers.put(boolean[].class, primitiveArray);
-
+
this.multiRepresenters.put(Number.class, new RepresentNumber());
this.multiRepresenters.put(List.class, new RepresentList());
this.multiRepresenters.put(Map.class, new RepresentMap());
@@ -245,8 +245,7 @@
return representSequence(Tag.SEQ, asBooleanList(data), null);
}
- throw new YAMLException("Unexpected primitive '"
- + type.getCanonicalName() + "'");
+ throw new YAMLException("Unexpected primitive '" + type.getCanonicalName() + "'");
}
private List<Byte> asByteList(Object in) {
@@ -317,8 +316,8 @@
protected class RepresentMap implements Represent {
@SuppressWarnings("unchecked")
public Node representData(Object data) {
- return representMapping(getTag(data.getClass(), Tag.MAP),
- (Map<Object, Object>) data, null);
+ return representMapping(getTag(data.getClass(), Tag.MAP), (Map<Object, Object>) data,
+ null);
}
}
diff --git a/src/main/java/org/yaml/snakeyaml/resolver/Resolver.java b/src/main/java/org/yaml/snakeyaml/resolver/Resolver.java
index 444733b..5b166cd 100644
--- a/src/main/java/org/yaml/snakeyaml/resolver/Resolver.java
+++ b/src/main/java/org/yaml/snakeyaml/resolver/Resolver.java
@@ -52,7 +52,7 @@
/**
* Create Resolver
- *
+ *
* @param respectDefaultImplicitScalars
* false to parse/dump scalars as plain Strings
* @deprecated override addImplicitResolvers instead
diff --git a/src/test/java/examples/SafeConstructorExampleTest.java b/src/test/java/examples/SafeConstructorExampleTest.java
index 29f6200..b28fac0 100644
--- a/src/test/java/examples/SafeConstructorExampleTest.java
+++ b/src/test/java/examples/SafeConstructorExampleTest.java
@@ -42,10 +42,9 @@
fail("Custom Java classes should not be created.");
} catch (Exception e) {
assertEquals(
- "could not determine a constructor for the tag !org.yaml.snakeyaml.constructor.Person\n" +
- " in 'string', line 2, column 3:\n" +
- " - !org.yaml.snakeyaml.constructor. ... \n" +
- " ^\n",
+ "could not determine a constructor for the tag !org.yaml.snakeyaml.constructor.Person\n"
+ + " in 'string', line 2, column 3:\n"
+ + " - !org.yaml.snakeyaml.constructor. ... \n" + " ^\n",
e.getMessage());
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/YamlComposeTest.java b/src/test/java/org/yaml/snakeyaml/YamlComposeTest.java
index 88bd70e..17a55d2 100644
--- a/src/test/java/org/yaml/snakeyaml/YamlComposeTest.java
+++ b/src/test/java/org/yaml/snakeyaml/YamlComposeTest.java
@@ -32,8 +32,8 @@
yaml.compose(new StringReader("abc: 56\n---\n123\n---\n456"));
fail("YAML contans more then one document.");
} catch (Exception e) {
- assertTrue("<<<" + e.getMessage() + ">>>", e.getMessage().startsWith(
- "expected a single document in the stream"));
+ assertTrue("<<<" + e.getMessage() + ">>>",
+ e.getMessage().startsWith("expected a single document in the stream"));
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/YamlTest.java b/src/test/java/org/yaml/snakeyaml/YamlTest.java
index 8b604d8..493bce9 100644
--- a/src/test/java/org/yaml/snakeyaml/YamlTest.java
+++ b/src/test/java/org/yaml/snakeyaml/YamlTest.java
@@ -50,15 +50,10 @@
loaded.next();
fail("Second document is invalid");
} catch (Exception e) {
- assertEquals(
- "while parsing a flow node\n" +
- " in 'reader', line 2, column 6:\n" +
- " --- [:]\n" +
- " ^\n" +
- "expected the node content, but found Value\n" +
- " in 'reader', line 2, column 6:\n" +
- " --- [:]\n" +
- " ^\n",
+ assertEquals("while parsing a flow node\n" + " in 'reader', line 2, column 6:\n"
+ + " --- [:]\n" + " ^\n"
+ + "expected the node content, but found Value\n"
+ + " in 'reader', line 2, column 6:\n" + " --- [:]\n" + " ^\n",
e.getMessage());
}
}
@@ -70,16 +65,10 @@
yaml.load(doc);
fail("It must be only one document.");
} catch (YAMLException e) {
- assertEquals(
- "expected a single document in the stream\n" +
- " in 'string', line 1, column 5:\n" +
- " --- a\n" +
- " ^\n" +
- "but found another document\n" +
- " in 'string', line 2, column 1:\n" +
- " --- b\n" +
- " ^\n",
- e.getMessage());
+ assertEquals("expected a single document in the stream\n"
+ + " in 'string', line 1, column 5:\n" + " --- a\n" + " ^\n"
+ + "but found another document\n" + " in 'string', line 2, column 1:\n"
+ + " --- b\n" + " ^\n", e.getMessage());
}
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/array/BooleanArr.java b/src/test/java/org/yaml/snakeyaml/array/BooleanArr.java
index 0016f1a..3a86666 100644
--- a/src/test/java/org/yaml/snakeyaml/array/BooleanArr.java
+++ b/src/test/java/org/yaml/snakeyaml/array/BooleanArr.java
@@ -18,23 +18,24 @@
import java.util.Arrays;
public class BooleanArr {
- private boolean[] bools;
-
- public BooleanArr () {}
-
- public BooleanArr ( boolean[] bools ) {
- this.bools = bools;
- }
-
- public String toString() {
- return Arrays.toString(bools);
- }
-
- public boolean[] getBools() {
- return bools;
- }
+ private boolean[] bools;
- public void setBools(boolean[] bools) {
- this.bools = bools;
- }
+ public BooleanArr() {
+ }
+
+ public BooleanArr(boolean[] bools) {
+ this.bools = bools;
+ }
+
+ public String toString() {
+ return Arrays.toString(bools);
+ }
+
+ public boolean[] getBools() {
+ return bools;
+ }
+
+ public void setBools(boolean[] bools) {
+ this.bools = bools;
+ }
}
diff --git a/src/test/java/org/yaml/snakeyaml/array/ByteArr.java b/src/test/java/org/yaml/snakeyaml/array/ByteArr.java
index 2884af1..7f8c7d0 100644
--- a/src/test/java/org/yaml/snakeyaml/array/ByteArr.java
+++ b/src/test/java/org/yaml/snakeyaml/array/ByteArr.java
@@ -19,23 +19,24 @@
public class ByteArr {
- private byte[] bytes;
-
- public ByteArr(){}
-
- public ByteArr ( byte[] bytes ) {
- this.bytes = bytes;
- }
-
- public String toString() {
- return Arrays.toString(bytes);
- }
+ private byte[] bytes;
- public byte[] getBytes() {
- return bytes;
- }
+ public ByteArr() {
+ }
- public void setBytes(byte[] bytes) {
- this.bytes = bytes;
- }
+ public ByteArr(byte[] bytes) {
+ this.bytes = bytes;
+ }
+
+ public String toString() {
+ return Arrays.toString(bytes);
+ }
+
+ public byte[] getBytes() {
+ return bytes;
+ }
+
+ public void setBytes(byte[] bytes) {
+ this.bytes = bytes;
+ }
}
diff --git a/src/test/java/org/yaml/snakeyaml/array/CharArr.java b/src/test/java/org/yaml/snakeyaml/array/CharArr.java
index b3f30cd..6cf9f79 100644
--- a/src/test/java/org/yaml/snakeyaml/array/CharArr.java
+++ b/src/test/java/org/yaml/snakeyaml/array/CharArr.java
@@ -18,23 +18,24 @@
import java.util.Arrays;
public class CharArr {
- private char[] chars;
-
- public CharArr () {}
-
- public CharArr ( char[] chars ) {
- this.chars = chars;
- }
-
- public String toString() {
- return Arrays.toString(chars);
- }
-
- public char[] getChars() {
- return chars;
- }
+ private char[] chars;
- public void setChars(char[] chars) {
- this.chars = chars;
- }
+ public CharArr() {
+ }
+
+ public CharArr(char[] chars) {
+ this.chars = chars;
+ }
+
+ public String toString() {
+ return Arrays.toString(chars);
+ }
+
+ public char[] getChars() {
+ return chars;
+ }
+
+ public void setChars(char[] chars) {
+ this.chars = chars;
+ }
}
diff --git a/src/test/java/org/yaml/snakeyaml/array/DoubleArr.java b/src/test/java/org/yaml/snakeyaml/array/DoubleArr.java
index 6c2f6fe..da6d790 100644
--- a/src/test/java/org/yaml/snakeyaml/array/DoubleArr.java
+++ b/src/test/java/org/yaml/snakeyaml/array/DoubleArr.java
@@ -18,23 +18,24 @@
import java.util.Arrays;
public class DoubleArr {
- private double[] doubles;
-
- public DoubleArr () {}
-
- public DoubleArr ( double[] doubles ) {
- this.doubles = doubles;
- }
-
- public String toString() {
- return Arrays.toString(doubles);
- }
+ private double[] doubles;
- public double[] getDoubles() {
- return doubles;
- }
+ public DoubleArr() {
+ }
- public void setDoubles(double[] doubles) {
- this.doubles = doubles;
- }
+ public DoubleArr(double[] doubles) {
+ this.doubles = doubles;
+ }
+
+ public String toString() {
+ return Arrays.toString(doubles);
+ }
+
+ public double[] getDoubles() {
+ return doubles;
+ }
+
+ public void setDoubles(double[] doubles) {
+ this.doubles = doubles;
+ }
}
diff --git a/src/test/java/org/yaml/snakeyaml/array/FloatArr.java b/src/test/java/org/yaml/snakeyaml/array/FloatArr.java
index 4c6e156..4dddcce 100644
--- a/src/test/java/org/yaml/snakeyaml/array/FloatArr.java
+++ b/src/test/java/org/yaml/snakeyaml/array/FloatArr.java
@@ -18,23 +18,24 @@
import java.util.Arrays;
public class FloatArr {
- private float[] floats;
-
- public FloatArr () {}
-
- public FloatArr ( float[] floats ) {
- this.floats = floats;
- }
+ private float[] floats;
- public String toString() {
- return Arrays.toString(floats);
- }
-
- public float[] getFloats() {
- return floats;
- }
+ public FloatArr() {
+ }
- public void setFloats(float[] floats) {
- this.floats = floats;
- }
+ public FloatArr(float[] floats) {
+ this.floats = floats;
+ }
+
+ public String toString() {
+ return Arrays.toString(floats);
+ }
+
+ public float[] getFloats() {
+ return floats;
+ }
+
+ public void setFloats(float[] floats) {
+ this.floats = floats;
+ }
}
diff --git a/src/test/java/org/yaml/snakeyaml/array/IntArr.java b/src/test/java/org/yaml/snakeyaml/array/IntArr.java
index 92295af..1d5cc77 100644
--- a/src/test/java/org/yaml/snakeyaml/array/IntArr.java
+++ b/src/test/java/org/yaml/snakeyaml/array/IntArr.java
@@ -18,23 +18,24 @@
import java.util.Arrays;
public class IntArr {
- private int[] ints;
-
- public IntArr () {}
-
- public IntArr ( int[] ints ) {
- this.ints = ints;
- }
+ private int[] ints;
- public String toString() {
- return Arrays.toString(ints);
- }
-
- public int[] getInts() {
- return ints;
- }
+ public IntArr() {
+ }
- public void setInts(int[] ints) {
- this.ints = ints;
- }
+ public IntArr(int[] ints) {
+ this.ints = ints;
+ }
+
+ public String toString() {
+ return Arrays.toString(ints);
+ }
+
+ public int[] getInts() {
+ return ints;
+ }
+
+ public void setInts(int[] ints) {
+ this.ints = ints;
+ }
}
diff --git a/src/test/java/org/yaml/snakeyaml/array/LongArr.java b/src/test/java/org/yaml/snakeyaml/array/LongArr.java
index 1589371..6cb51a8 100644
--- a/src/test/java/org/yaml/snakeyaml/array/LongArr.java
+++ b/src/test/java/org/yaml/snakeyaml/array/LongArr.java
@@ -18,23 +18,24 @@
import java.util.Arrays;
public class LongArr {
- private long[] longs;
+ private long[] longs;
- public LongArr () {}
-
- public LongArr ( long[] longs ) {
- this.longs = longs;
- }
-
- public String toString() {
- return Arrays.toString(longs);
- }
+ public LongArr() {
+ }
- public long[] getLongs() {
- return longs;
- }
+ public LongArr(long[] longs) {
+ this.longs = longs;
+ }
- public void setLongs(long[] longs) {
- this.longs = longs;
- }
+ public String toString() {
+ return Arrays.toString(longs);
+ }
+
+ public long[] getLongs() {
+ return longs;
+ }
+
+ public void setLongs(long[] longs) {
+ this.longs = longs;
+ }
}
diff --git a/src/test/java/org/yaml/snakeyaml/array/PrimitiveArrayTest.java b/src/test/java/org/yaml/snakeyaml/array/PrimitiveArrayTest.java
index d8803d1..73fbf5a 100644
--- a/src/test/java/org/yaml/snakeyaml/array/PrimitiveArrayTest.java
+++ b/src/test/java/org/yaml/snakeyaml/array/PrimitiveArrayTest.java
@@ -26,178 +26,180 @@
import org.yaml.snakeyaml.error.YAMLException;
public class PrimitiveArrayTest extends TestCase {
-
+
private final String pkg = "!!org.yaml.snakeyaml.array";
-
- private final byte[] bytes = new byte[]{1,2,3};
- private final short[] shorts = new short[]{300,301,302};
- private final int[] ints = new int[]{40000,40001,40002};
- private final long[] longs = new long[]{5000000000L,5000000001L};
- private final float[] floats = new float[]{0.1f,3.1415f};
- private final double[] doubles = new double[]{50.0001, 2150.0002};
- private final char[] chars = new char[]{'a', 'b', 'c', 'd', 'e'};
- private final boolean[] bools = new boolean[]{true, false};
- public void testValidConstructor () {
- String testInput =
- "- " + pkg + ".ByteArr [ " + Arrays.toString(bytes) + " ]\n" +
- "- " + pkg + ".ShortArr [ " + Arrays.toString(shorts) + " ]\n" +
- "- " + pkg + ".IntArr [ " + Arrays.toString(ints) + " ]\n" +
- "- " + pkg + ".LongArr [ " + Arrays.toString(longs) + " ]\n" +
- "- " + pkg + ".FloatArr [ " + Arrays.toString(floats) + " ]\n" +
- "- " + pkg + ".DoubleArr [ " + Arrays.toString(doubles) + " ]\n" +
- "- " + pkg + ".CharArr [ " + Arrays.toString(chars) + " ]\n" +
- "- " + pkg + ".BooleanArr [ " + Arrays.toString(bools) + " ]\n";
-
+ private final byte[] bytes = new byte[] { 1, 2, 3 };
+ private final short[] shorts = new short[] { 300, 301, 302 };
+ private final int[] ints = new int[] { 40000, 40001, 40002 };
+ private final long[] longs = new long[] { 5000000000L, 5000000001L };
+ private final float[] floats = new float[] { 0.1f, 3.1415f };
+ private final double[] doubles = new double[] { 50.0001, 2150.0002 };
+ private final char[] chars = new char[] { 'a', 'b', 'c', 'd', 'e' };
+ private final boolean[] bools = new boolean[] { true, false };
+
+ public void testValidConstructor() {
+ String testInput = "- " + pkg + ".ByteArr [ " + Arrays.toString(bytes) + " ]\n" + "- "
+ + pkg + ".ShortArr [ " + Arrays.toString(shorts) + " ]\n" + "- " + pkg
+ + ".IntArr [ " + Arrays.toString(ints) + " ]\n" + "- " + pkg + ".LongArr [ "
+ + Arrays.toString(longs) + " ]\n" + "- " + pkg + ".FloatArr [ "
+ + Arrays.toString(floats) + " ]\n" + "- " + pkg + ".DoubleArr [ "
+ + Arrays.toString(doubles) + " ]\n" + "- " + pkg + ".CharArr [ "
+ + Arrays.toString(chars) + " ]\n" + "- " + pkg + ".BooleanArr [ "
+ + Arrays.toString(bools) + " ]\n";
+
Yaml yaml = new Yaml();
- List<Object> wrappers = (List<Object>)yaml.load(testInput);
+ List<Object> wrappers = (List<Object>) yaml.load(testInput);
- Assert.assertArrayEquals ( bytes, ((ByteArr) wrappers.get(0)).getBytes() );
- Assert.assertArrayEquals ( shorts, ((ShortArr) wrappers.get(1)).getShorts() );
- Assert.assertArrayEquals ( ints, ((IntArr) wrappers.get(2)).getInts() );
- Assert.assertArrayEquals ( longs, ((LongArr) wrappers.get(3)).getLongs() );
- Assert.assertArrayEquals ( floats, ((FloatArr) wrappers.get(4)).getFloats(), 0.001f );
- Assert.assertArrayEquals ( doubles,((DoubleArr)wrappers.get(5)).getDoubles(), 0.001 );
- Assert.assertArrayEquals ( chars, ((CharArr) wrappers.get(6)).getChars() );
- assertArrayEquals ( bools, ((BooleanArr)wrappers.get(7)).getBools() );
+ Assert.assertArrayEquals(bytes, ((ByteArr) wrappers.get(0)).getBytes());
+ Assert.assertArrayEquals(shorts, ((ShortArr) wrappers.get(1)).getShorts());
+ Assert.assertArrayEquals(ints, ((IntArr) wrappers.get(2)).getInts());
+ Assert.assertArrayEquals(longs, ((LongArr) wrappers.get(3)).getLongs());
+ Assert.assertArrayEquals(floats, ((FloatArr) wrappers.get(4)).getFloats(), 0.001f);
+ Assert.assertArrayEquals(doubles, ((DoubleArr) wrappers.get(5)).getDoubles(), 0.001);
+ Assert.assertArrayEquals(chars, ((CharArr) wrappers.get(6)).getChars());
+ assertArrayEquals(bools, ((BooleanArr) wrappers.get(7)).getBools());
}
-
+
/*
- * For some reason, every other assertArrayEquals specialization is
- * provided by org.junit.Assert, but not this one.
+ * For some reason, every other assertArrayEquals specialization is provided
+ * by org.junit.Assert, but not this one.
*/
- private void assertArrayEquals ( boolean[] expected, boolean[] actuals ) {
- assertEquals ( "Arrays differ in length", expected.length, actuals.length );
- for ( int i = 0; i < expected.length; ++i ) {
- if ( expected[i] != actuals[i] ) {
- fail ( "Arrays first differ at " + i + "; expected " + expected[i] + " but got " + actuals[i] );
+ private void assertArrayEquals(boolean[] expected, boolean[] actuals) {
+ assertEquals("Arrays differ in length", expected.length, actuals.length);
+ for (int i = 0; i < expected.length; ++i) {
+ if (expected[i] != actuals[i]) {
+ fail("Arrays first differ at " + i + "; expected " + expected[i] + " but got "
+ + actuals[i]);
}
}
}
-
- private void tryInvalid ( String t, Class<?> expectedException ) {
+
+ private void tryInvalid(String t, Class<?> expectedException) {
Yaml yaml = new Yaml();
try {
Object loaded = yaml.load(t);
- fail ( "Expected " + expectedException.getCanonicalName() + " but loaded = \"" + loaded + "\"" );
- } catch ( YAMLException e ) {
- assertEquals ( expectedException, e.getCause().getClass() );
+ fail("Expected " + expectedException.getCanonicalName() + " but loaded = \"" + loaded
+ + "\"");
+ } catch (YAMLException e) {
+ assertEquals(expectedException, e.getCause().getClass());
}
}
-
+
public void testInvalidConstructors() {
- // Loading a character as any primitive other than 'char' is a NumberFormatException
- tryInvalid ( pkg + ".ByteArr [ [ 'a' ] ]", NumberFormatException.class );
- tryInvalid ( pkg + ".ShortArr [ [ 'a' ] ]", NumberFormatException.class );
- tryInvalid ( pkg + ".IntArr [ [ 'a' ] ]", NumberFormatException.class );
- tryInvalid ( pkg + ".LongArr [ [ 'a' ] ]", NumberFormatException.class );
- tryInvalid ( pkg + ".FloatArr [ [ 'a' ] ]", NumberFormatException.class );
- tryInvalid ( pkg + ".DoubleArr [ [ 'a' ] ]", NumberFormatException.class );
-
- // Exception: because of how boolean construction works, constructing a boolean from 'a'
+ // Loading a character as any primitive other than 'char' is a
+ // NumberFormatException
+ tryInvalid(pkg + ".ByteArr [ [ 'a' ] ]", NumberFormatException.class);
+ tryInvalid(pkg + ".ShortArr [ [ 'a' ] ]", NumberFormatException.class);
+ tryInvalid(pkg + ".IntArr [ [ 'a' ] ]", NumberFormatException.class);
+ tryInvalid(pkg + ".LongArr [ [ 'a' ] ]", NumberFormatException.class);
+ tryInvalid(pkg + ".FloatArr [ [ 'a' ] ]", NumberFormatException.class);
+ tryInvalid(pkg + ".DoubleArr [ [ 'a' ] ]", NumberFormatException.class);
+
+ // Exception: because of how boolean construction works, constructing a
+ // boolean from 'a'
// results in null.
- tryInvalid ( pkg + ".BooleanArr [ [ 'a' ] ]", NullPointerException.class );
-
+ tryInvalid(pkg + ".BooleanArr [ [ 'a' ] ]", NullPointerException.class);
+
// Loading a floating-point number as a character is a YAMLException
- tryInvalid ( pkg + ".CharArr [ [ 1.2 ] ]", YAMLException.class );
-
+ tryInvalid(pkg + ".CharArr [ [ 1.2 ] ]", YAMLException.class);
+
// Loading a String as a Character is a YAMLException
- tryInvalid ( pkg + ".CharArr [ [ 'abcd' ] ]", YAMLException.class );
-
+ tryInvalid(pkg + ".CharArr [ [ 'abcd' ] ]", YAMLException.class);
+
}
-
+
public void testTruncation() {
// Loading floating-point numbers as integer types is disallowed,
// because that's a number-format problem.
- tryInvalid ( pkg+".ByteArr [ [ 3.14 ] ]", NumberFormatException.class );
- tryInvalid ( pkg+".ShortArr [ [ 3.14 ] ]", NumberFormatException.class );
- tryInvalid ( pkg+".IntArr [ [ 3.14 ] ]", NumberFormatException.class );
- tryInvalid ( pkg+".LongArr [ [ 3.14 ] ]", NumberFormatException.class );
+ tryInvalid(pkg + ".ByteArr [ [ 3.14 ] ]", NumberFormatException.class);
+ tryInvalid(pkg + ".ShortArr [ [ 3.14 ] ]", NumberFormatException.class);
+ tryInvalid(pkg + ".IntArr [ [ 3.14 ] ]", NumberFormatException.class);
+ tryInvalid(pkg + ".LongArr [ [ 3.14 ] ]", NumberFormatException.class);
}
-
+
public void testPromotion() {
Yaml yaml = new Yaml();
-
+
// Loading integer numbers as floating-point types is allowed...
- Assert.assertArrayEquals (
- new float[]{3,5},
- ((FloatArr)yaml.load(pkg + ".FloatArr [ [ 3, 5 ] ] ")).getFloats(),
- 0.001f
- );
-
- Assert.assertArrayEquals (
- new double[]{3,5},
- ((DoubleArr)yaml.load(pkg + ".DoubleArr [ [ 3, 5 ] ] ")).getDoubles(),
- 0.001f
- );
+ Assert.assertArrayEquals(new float[] { 3, 5 },
+ ((FloatArr) yaml.load(pkg + ".FloatArr [ [ 3, 5 ] ] ")).getFloats(), 0.001f);
+
+ Assert.assertArrayEquals(new double[] { 3, 5 },
+ ((DoubleArr) yaml.load(pkg + ".DoubleArr [ [ 3, 5 ] ] ")).getDoubles(), 0.001f);
}
-
- public void testStringCharArray () {
+
+ public void testStringCharArray() {
Yaml yaml = new Yaml();
-
+
try {
yaml.load(pkg + ".CharArr [ [ abcd ] ]");
- fail ( "Expected exception." );
- } catch ( Exception e ) {
- assertEquals ( ConstructorException.class, e.getClass() );
- assertEquals ( "Invalid node Character: 'abcd'; length: 4", e.getCause().getMessage() );
+ fail("Expected exception.");
+ } catch (Exception e) {
+ assertEquals(ConstructorException.class, e.getClass());
+ assertEquals("Invalid node Character: 'abcd'; length: 4", e.getCause().getMessage());
}
}
-
- private static Object cycle ( Object in ) {
+
+ private static Object cycle(Object in) {
Yaml yaml = new Yaml();
String dumped = yaml.dump(in);
- //System.out.println ( dumped );
+ // System.out.println ( dumped );
return yaml.load(dumped);
}
-
+
/**
* All kinds of primitive arrays should be able to cycle from (Java array)
* to (YAML string) to (Java array) again, and they should be exactly the
- * same before and after.
+ * same before and after.
*/
public void testCycle() {
ByteArr byteArr = new ByteArr(bytes);
- Assert.assertArrayEquals ( byteArr.getBytes(), ((ByteArr)cycle(byteArr)).getBytes() );
-
+ Assert.assertArrayEquals(byteArr.getBytes(), ((ByteArr) cycle(byteArr)).getBytes());
+
ShortArr shortArr = new ShortArr(shorts);
- Assert.assertArrayEquals ( shortArr.getShorts(), ((ShortArr)cycle(shortArr)).getShorts() );
+ Assert.assertArrayEquals(shortArr.getShorts(), ((ShortArr) cycle(shortArr)).getShorts());
IntArr intArr = new IntArr(ints);
- Assert.assertArrayEquals ( intArr.getInts(), ((IntArr)cycle(intArr)).getInts() );
+ Assert.assertArrayEquals(intArr.getInts(), ((IntArr) cycle(intArr)).getInts());
LongArr longArr = new LongArr(longs);
- Assert.assertArrayEquals ( longArr.getLongs(), ((LongArr)cycle(longArr)).getLongs() );
+ Assert.assertArrayEquals(longArr.getLongs(), ((LongArr) cycle(longArr)).getLongs());
FloatArr floatArr = new FloatArr(floats);
- Assert.assertArrayEquals ( floatArr.getFloats(), ((FloatArr)cycle(floatArr)).getFloats(), 0.001f );
+ Assert.assertArrayEquals(floatArr.getFloats(), ((FloatArr) cycle(floatArr)).getFloats(),
+ 0.001f);
DoubleArr doubleArr = new DoubleArr(doubles);
- Assert.assertArrayEquals ( doubleArr.getDoubles(), ((DoubleArr)cycle(doubleArr)).getDoubles(), 0.001 );
+ Assert.assertArrayEquals(doubleArr.getDoubles(),
+ ((DoubleArr) cycle(doubleArr)).getDoubles(), 0.001);
CharArr charArr = new CharArr(chars);
- Assert.assertArrayEquals ( charArr.getChars(), ((CharArr)cycle(charArr)).getChars() );
+ Assert.assertArrayEquals(charArr.getChars(), ((CharArr) cycle(charArr)).getChars());
BooleanArr boolArr = new BooleanArr(bools);
- assertArrayEquals ( boolArr.getBools(), ((BooleanArr)cycle(boolArr)).getBools() );
+ assertArrayEquals(boolArr.getBools(), ((BooleanArr) cycle(boolArr)).getBools());
}
-
+
public void testMultiDimensional() {
Array2D two = new Array2D();
- two.setLongs(new long[][]{ {1,2,3}, {4,5,6} });
- assertTrue ( Arrays.deepEquals ( two.getLongs(), ((Array2D)cycle(two)).getLongs() ) );
-
+ two.setLongs(new long[][] { { 1, 2, 3 }, { 4, 5, 6 } });
+ assertTrue(Arrays.deepEquals(two.getLongs(), ((Array2D) cycle(two)).getLongs()));
+
Array3D three = new Array3D();
- three.setLongs(new long[][][]{ { {1,2,3,4}, {5,6,7,8} }, { {9,10,11,12}, {13,14,15,16} } });
- assertTrue ( Arrays.deepEquals ( three.getLongs(), ((Array3D)cycle(three)).getLongs() ) );
-
- // Object with an array of Objects which each have an array of primitives.
+ three.setLongs(new long[][][] { { { 1, 2, 3, 4 }, { 5, 6, 7, 8 } },
+ { { 9, 10, 11, 12 }, { 13, 14, 15, 16 } } });
+ assertTrue(Arrays.deepEquals(three.getLongs(), ((Array3D) cycle(three)).getLongs()));
+
+ // Object with an array of Objects which each have an array of
+ // primitives.
ArrayLongArr four = new ArrayLongArr();
- four.setContents ( new LongArr[] { new LongArr(new long[]{1,2,3,4}), new LongArr(new long[]{5,6,7,8}) } );
+ four.setContents(new LongArr[] { new LongArr(new long[] { 1, 2, 3, 4 }),
+ new LongArr(new long[] { 5, 6, 7, 8 }) });
Object result = cycle(four);
- assertEquals ( four, (ArrayLongArr)result );
+ assertEquals(four, (ArrayLongArr) result);
}
-
+
public static class Array2D {
private long[][] longs;
@@ -209,7 +211,7 @@
this.longs = longs;
}
}
-
+
public static class Array3D {
private long[][][] longs;
@@ -221,31 +223,33 @@
this.longs = longs;
}
}
-
+
public static class ArrayLongArr {
private LongArr[] contents;
- public LongArr[] getContents() {
- return contents;
- }
+ public LongArr[] getContents() {
+ return contents;
+ }
- public void setContents(LongArr[] contents) {
- this.contents = contents;
- }
-
- @Override
- public boolean equals(Object obj) {
- if ( ! ( obj instanceof ArrayLongArr ) ) return false;
-
- ArrayLongArr other = ((ArrayLongArr)obj);
- if ( contents.length != other.getContents().length ) return false;
- for ( int i = 0; i < contents.length; ++i ) {
- if ( ! Arrays.equals ( contents[i].getLongs(), other.getContents()[i].getLongs() ) ) {
- return false;
- }
- }
-
- return true;
- }
+ public void setContents(LongArr[] contents) {
+ this.contents = contents;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof ArrayLongArr))
+ return false;
+
+ ArrayLongArr other = ((ArrayLongArr) obj);
+ if (contents.length != other.getContents().length)
+ return false;
+ for (int i = 0; i < contents.length; ++i) {
+ if (!Arrays.equals(contents[i].getLongs(), other.getContents()[i].getLongs())) {
+ return false;
+ }
+ }
+
+ return true;
+ }
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/array/ShortArr.java b/src/test/java/org/yaml/snakeyaml/array/ShortArr.java
index cfc2953..d2746f5 100644
--- a/src/test/java/org/yaml/snakeyaml/array/ShortArr.java
+++ b/src/test/java/org/yaml/snakeyaml/array/ShortArr.java
@@ -18,23 +18,24 @@
import java.util.Arrays;
public class ShortArr {
- private short[] shorts;
-
- public ShortArr(){}
-
- public ShortArr ( short[] shorts ) {
- this.shorts = shorts;
- }
-
- public String toString() {
- return Arrays.toString(shorts);
- }
+ private short[] shorts;
- public short[] getShorts() {
- return shorts;
- }
+ public ShortArr() {
+ }
- public void setShorts(short[] shorts) {
- this.shorts = shorts;
- }
+ public ShortArr(short[] shorts) {
+ this.shorts = shorts;
+ }
+
+ public String toString() {
+ return Arrays.toString(shorts);
+ }
+
+ public short[] getShorts() {
+ return shorts;
+ }
+
+ public void setShorts(short[] shorts) {
+ this.shorts = shorts;
+ }
}
diff --git a/src/test/java/org/yaml/snakeyaml/constructor/ConstructorTest.java b/src/test/java/org/yaml/snakeyaml/constructor/ConstructorTest.java
index 6ba4974..1e788b3 100644
--- a/src/test/java/org/yaml/snakeyaml/constructor/ConstructorTest.java
+++ b/src/test/java/org/yaml/snakeyaml/constructor/ConstructorTest.java
@@ -102,15 +102,14 @@
// TODO improve the error message - the pointer should be at the
// property name, not value
assertEquals(
- "Cannot create property=wrongName for JavaBean=#<org.jvyaml.TestBean name=\"null\" age=0 born=\"null\">\n" +
- " in 'string', line 1, column 5:\n" +
- " --- !!org.yaml.snakeyaml.constructor ... \n" +
- " ^\n" +
- "Unable to find property 'wrongName' on class: org.yaml.snakeyaml.constructor.TestBean\n" +
- " in 'string', line 2, column 12:\n" +
- " wrongName: No one\n" +
- " ^\n",
- e.getMessage());
+ "Cannot create property=wrongName for JavaBean=#<org.jvyaml.TestBean name=\"null\" age=0 born=\"null\">\n"
+ + " in 'string', line 1, column 5:\n"
+ + " --- !!org.yaml.snakeyaml.constructor ... \n"
+ + " ^\n"
+ + "Unable to find property 'wrongName' on class: org.yaml.snakeyaml.constructor.TestBean\n"
+ + " in 'string', line 2, column 12:\n"
+ + " wrongName: No one\n"
+ + " ^\n", e.getMessage());
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/immutable/ShapeImmutableTest.java b/src/test/java/org/yaml/snakeyaml/immutable/ShapeImmutableTest.java
index d696f38..e1fb39e 100644
--- a/src/test/java/org/yaml/snakeyaml/immutable/ShapeImmutableTest.java
+++ b/src/test/java/org/yaml/snakeyaml/immutable/ShapeImmutableTest.java
@@ -80,10 +80,9 @@
fail("Constructor with String is required.");
} catch (Exception e) {
assertEquals(
- "Can't construct a java object for tag:yaml.org,2002:org.yaml.snakeyaml.immutable.Code4; exception=Can't construct a java object for scalar tag:yaml.org,2002:org.yaml.snakeyaml.immutable.Code4; No String constructor found. Exception=org.yaml.snakeyaml.immutable.Code4.<init>(java.lang.String)\n" +
- " in 'string', line 1, column 1:\n" +
- " !!org.yaml.snakeyaml.immutable.C ... \n" +
- " ^\n",
+ "Can't construct a java object for tag:yaml.org,2002:org.yaml.snakeyaml.immutable.Code4; exception=Can't construct a java object for scalar tag:yaml.org,2002:org.yaml.snakeyaml.immutable.Code4; No String constructor found. Exception=org.yaml.snakeyaml.immutable.Code4.<init>(java.lang.String)\n"
+ + " in 'string', line 1, column 1:\n"
+ + " !!org.yaml.snakeyaml.immutable.C ... \n" + " ^\n",
e.getMessage());
}
}
@@ -109,10 +108,9 @@
fail("Two arguments required.");
} catch (Exception e) {
assertEquals(
- "Can't construct a java object for tag:yaml.org,2002:org.yaml.snakeyaml.immutable.Point; exception=No suitable constructor with 1 arguments found for class org.yaml.snakeyaml.immutable.Point\n" +
- " in 'string', line 1, column 1:\n" +
- " !!org.yaml.snakeyaml.immutable.Point\n" +
- " ^\n",
+ "Can't construct a java object for tag:yaml.org,2002:org.yaml.snakeyaml.immutable.Point; exception=No suitable constructor with 1 arguments found for class org.yaml.snakeyaml.immutable.Point\n"
+ + " in 'string', line 1, column 1:\n"
+ + " !!org.yaml.snakeyaml.immutable.Point\n" + " ^\n",
e.getMessage());
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue145/LineNumberInExceptionTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue145/LineNumberInExceptionTest.java
index 00ddcf5..7ce0338 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue145/LineNumberInExceptionTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue145/LineNumberInExceptionTest.java
@@ -29,10 +29,9 @@
} catch (Exception e) {
assertTrue(e.toString().contains("line 2, column 1"));
assertEquals(
- "Can't construct a java object for tag:yaml.org,2002:org.yaml.snakeyaml.issues.issue145.AbstractThing; exception=java.lang.InstantiationException\n" +
- " in 'string', line 2, column 1:\n" +
- " !!org.yaml.snakeyaml.issues.issu ... \n" +
- " ^\n",
+ "Can't construct a java object for tag:yaml.org,2002:org.yaml.snakeyaml.issues.issue145.AbstractThing; exception=java.lang.InstantiationException\n"
+ + " in 'string', line 2, column 1:\n"
+ + " !!org.yaml.snakeyaml.issues.issu ... \n" + " ^\n",
e.getMessage());
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue177/PointBeanTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue177/PointBeanTest.java
index e69cf06..67df93e 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue177/PointBeanTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue177/PointBeanTest.java
@@ -29,22 +29,15 @@
yaml.load(input);
fail();
} catch (Exception e) {
- assertEquals("Cannot create property=points for JavaBean=All Points\n" +
- " in 'string', line 1, column 1:\n" +
- " !!org.yaml.snakeyaml.issues.issu ... \n" +
- " ^\n" +
- "Cannot create property=x for JavaBean=PointBean\n" +
- " in 'string', line 7, column 5:\n" +
- " x: a\n" +
- " ^\n" +
- "For input string: \"a\"\n" +
- " in 'string', line 7, column 8:\n" +
- " x: a\n" +
- " ^\n" +
- "\n" +
- " in 'string', line 3, column 3:\n" +
- " pt1:\n" +
- " ^\n", e.getMessage());
+ assertEquals("Cannot create property=points for JavaBean=All Points\n"
+ + " in 'string', line 1, column 1:\n"
+ + " !!org.yaml.snakeyaml.issues.issu ... \n" + " ^\n"
+ + "Cannot create property=x for JavaBean=PointBean\n"
+ + " in 'string', line 7, column 5:\n" + " x: a\n" + " ^\n"
+ + "For input string: \"a\"\n" + " in 'string', line 7, column 8:\n"
+ + " x: a\n" + " ^\n" + "\n"
+ + " in 'string', line 3, column 3:\n" + " pt1:\n" + " ^\n",
+ e.getMessage());
}
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue183/NumberBeanTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue183/NumberBeanTest.java
index 0fe4708..f140130 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue183/NumberBeanTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue183/NumberBeanTest.java
@@ -72,7 +72,6 @@
assertEquals(Double.NEGATIVE_INFINITY, loaded.number.doubleValue());
}
-
public void testNumberAsFloatNaN() throws Exception {
NumberBean number = new NumberBean();
number.number = Float.NaN;
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue188/ErrorMessageTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue188/ErrorMessageTest.java
index 50fb5dd..19cc8d7 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue188/ErrorMessageTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue188/ErrorMessageTest.java
@@ -25,8 +25,7 @@
try {
Yaml yaml = new Yaml();
- String doc = "templates:\n" + " master:\n"
- + " type: Compute : invalid123";
+ String doc = "templates:\n" + " master:\n" + " type: Compute : invalid123";
yaml.load(doc);
fail();
} catch (Exception e) {
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue192/EqualsSignTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue192/EqualsSignTest.java
index 16cfca6..255d919 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue192/EqualsSignTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue192/EqualsSignTest.java
@@ -13,6 +13,3 @@
new Yaml().load("=");
}
}
-
-
-
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue193/TestYaml.java b/src/test/java/org/yaml/snakeyaml/issues/issue193/TestYaml.java
index 89e4b09..cd3c33f 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue193/TestYaml.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue193/TestYaml.java
@@ -19,7 +19,6 @@
return id;
}
-
public void setId(Long id) {
this.id = id;
}
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.java
index 29b9a43..dd58c0e 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.java
@@ -50,15 +50,14 @@
fail("Illegal hex characters in escape (%) pattern must not be accepted.");
} catch (Exception e) {
assertEquals(
- "while scanning a tag\n" +
- " in 'string', line 1, column 1:\n" +
- " !!org.yaml.snakeyaml.issues.issu ... \n" +
- " ^\n" +
- "expected URI escape sequence of 2 hexadecimal numbers, but found W(87) and Z(90)\n" +
- " in 'string', line 1, column 71:\n" +
- " ... nAsciiCharsInClassNameTest$Acad%WZ%A9mico {id: 3, name: Foo bar}\n" +
- " ^\n",
- e.getMessage());
+ "while scanning a tag\n"
+ + " in 'string', line 1, column 1:\n"
+ + " !!org.yaml.snakeyaml.issues.issu ... \n"
+ + " ^\n"
+ + "expected URI escape sequence of 2 hexadecimal numbers, but found W(87) and Z(90)\n"
+ + " in 'string', line 1, column 71:\n"
+ + " ... nAsciiCharsInClassNameTest$Acad%WZ%A9mico {id: 3, name: Foo bar}\n"
+ + " ^\n", e.getMessage());
}
}
@@ -71,15 +70,14 @@
fail("Illegal hex characters in escape (%) pattern must not be accepted.");
} catch (ScannerException e) {
assertEquals(
- "while scanning a tag\n" +
- " in 'string', line 1, column 1:\n" +
- " !!org.yaml.snakeyaml.issues.issu ... \n" +
- " ^\n" +
- "expected URI escape sequence of 2 hexadecimal numbers, but found 9(57) and %(37)\n" +
- " in 'string', line 1, column 71:\n" +
- " ... nAsciiCharsInClassNameTest$Acad%9%A9mico {id: 3, name: Foo bar}\n" +
- " ^\n",
- e.getMessage());
+ "while scanning a tag\n"
+ + " in 'string', line 1, column 1:\n"
+ + " !!org.yaml.snakeyaml.issues.issu ... \n"
+ + " ^\n"
+ + "expected URI escape sequence of 2 hexadecimal numbers, but found 9(57) and %(37)\n"
+ + " in 'string', line 1, column 71:\n"
+ + " ... nAsciiCharsInClassNameTest$Acad%9%A9mico {id: 3, name: Foo bar}\n"
+ + " ^\n", e.getMessage());
assertEquals(Util.getLocalResource("issues/issue67-error1.txt"), e.toString());
}
}
@@ -92,16 +90,12 @@
yaml.load(PREFIX + "Acad%C0mico {id: 3, name: Foo bar}");
fail("Illegal UTF-8 must not be accepted.");
} catch (ScannerException e) {
- assertEquals(
- "while scanning a tag\n" +
- " in 'string', line 1, column 1:\n" +
- " !!org.yaml.snakeyaml.issues.issu ... \n" +
- " ^\n" +
- "expected URI in UTF-8: Input length = 1\n" +
- " in 'string', line 1, column 70:\n" +
- " ... onAsciiCharsInClassNameTest$Acad%C0mico {id: 3, name: Foo bar}\n" +
- " ^\n",
- e.getMessage());
+ assertEquals("while scanning a tag\n" + " in 'string', line 1, column 1:\n"
+ + " !!org.yaml.snakeyaml.issues.issu ... \n" + " ^\n"
+ + "expected URI in UTF-8: Input length = 1\n"
+ + " in 'string', line 1, column 70:\n"
+ + " ... onAsciiCharsInClassNameTest$Acad%C0mico {id: 3, name: Foo bar}\n"
+ + " ^\n", e.getMessage());
assertEquals(Util.getLocalResource("issues/issue67-error2.txt"), e.toString());
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/javabeans/ConstructEmptyBeanTest.java b/src/test/java/org/yaml/snakeyaml/javabeans/ConstructEmptyBeanTest.java
index 70dab93..654ca24 100644
--- a/src/test/java/org/yaml/snakeyaml/javabeans/ConstructEmptyBeanTest.java
+++ b/src/test/java/org/yaml/snakeyaml/javabeans/ConstructEmptyBeanTest.java
@@ -98,16 +98,9 @@
beanLoader.loadAs("{", EmptyBean.class);
fail("Invalid document provided.");
} catch (Exception e) {
- assertEquals(
- "while parsing a flow node\n" +
- " in 'string', line 1, column 2:\n" +
- " {\n" +
- " ^\n" +
- "expected the node content, but found StreamEnd\n" +
- " in 'string', line 1, column 2:\n" +
- " {\n" +
- " ^\n",
- e.getMessage());
+ assertEquals("while parsing a flow node\n" + " in 'string', line 1, column 2:\n"
+ + " {\n" + " ^\n" + "expected the node content, but found StreamEnd\n"
+ + " in 'string', line 1, column 2:\n" + " {\n" + " ^\n", e.getMessage());
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/partialconstruct/FragmentComposer.java b/src/test/java/org/yaml/snakeyaml/partialconstruct/FragmentComposer.java
index fb2334c..9447654 100644
--- a/src/test/java/org/yaml/snakeyaml/partialconstruct/FragmentComposer.java
+++ b/src/test/java/org/yaml/snakeyaml/partialconstruct/FragmentComposer.java
@@ -47,7 +47,6 @@
}
}
}
- throw new RuntimeException("Did not find key \"" + nodeName
- + "\" in document-level map");
+ throw new RuntimeException("Did not find key \"" + nodeName + "\" in document-level map");
}
}
\ No newline at end of file
diff --git a/src/test/java/org/yaml/snakeyaml/resolver/RagelMachine.java b/src/test/java/org/yaml/snakeyaml/resolver/RagelMachine.java
index b1ad126..bec805f 100644
--- a/src/test/java/org/yaml/snakeyaml/resolver/RagelMachine.java
+++ b/src/test/java/org/yaml/snakeyaml/resolver/RagelMachine.java
@@ -271,43 +271,43 @@
while (__nacts-- > 0) {
switch (_snakeyaml_actions[__acts++]) {
case 0:
- // line 14 "RagelMachine.rl"
+ // line 14 "RagelMachine.rl"
{
tag = "tag:yaml.org,2002:bool";
}
break;
case 1:
- // line 15 "RagelMachine.rl"
+ // line 15 "RagelMachine.rl"
{
tag = "tag:yaml.org,2002:merge";
}
break;
case 2:
- // line 16 "RagelMachine.rl"
+ // line 16 "RagelMachine.rl"
{
tag = "tag:yaml.org,2002:null";
}
break;
case 3:
- // line 17 "RagelMachine.rl"
+ // line 17 "RagelMachine.rl"
{
tag = "tag:yaml.org,2002:value";
}
break;
case 4:
- // line 18 "RagelMachine.rl"
+ // line 18 "RagelMachine.rl"
{
tag = "tag:yaml.org,2002:int";
}
break;
case 5:
- // line 19 "RagelMachine.rl"
+ // line 19 "RagelMachine.rl"
{
tag = "tag:yaml.org,2002:float";
}
break;
case 6:
- // line 20 "RagelMachine.rl"
+ // line 20 "RagelMachine.rl"
{
tag = "tag:yaml.org,2002:timestamp";
}
diff --git a/src/test/java/org/yaml/snakeyaml/scanner/ScannerImplTest.java b/src/test/java/org/yaml/snakeyaml/scanner/ScannerImplTest.java
index a810809..3d17643 100644
--- a/src/test/java/org/yaml/snakeyaml/scanner/ScannerImplTest.java
+++ b/src/test/java/org/yaml/snakeyaml/scanner/ScannerImplTest.java
@@ -61,11 +61,9 @@
fail("TAB cannot start a token.");
} catch (Exception e) {
assertEquals(
- "while scanning for the next token\n" +
- "found character \t '\\t(TAB)' that cannot start any token. (Do not use \\t(TAB) for indentation)\n" +
- " in 'string', line 1, column 1:\n" +
- " \t data: 1\n" +
- " ^\n",
+ "while scanning for the next token\n"
+ + "found character \t '\\t(TAB)' that cannot start any token. (Do not use \\t(TAB) for indentation)\n"
+ + " in 'string', line 1, column 1:\n" + " \t data: 1\n" + " ^\n",
e.getMessage());
}
}
