minor test update
diff --git a/src/test/java/org/yaml/snakeyaml/composer/ComposerImplTest.java b/src/test/java/org/yaml/snakeyaml/composer/ComposerImplTest.java
index 8c5d231..4d3880a 100644
--- a/src/test/java/org/yaml/snakeyaml/composer/ComposerImplTest.java
+++ b/src/test/java/org/yaml/snakeyaml/composer/ComposerImplTest.java
@@ -3,34 +3,60 @@
*/
package org.yaml.snakeyaml.composer;
+import java.io.StringReader;
+
import junit.framework.TestCase;
+import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;
-import org.yaml.snakeyaml.parser.Parser;
-import org.yaml.snakeyaml.parser.ParserImpl;
-import org.yaml.snakeyaml.reader.Reader;
-import org.yaml.snakeyaml.resolver.Resolver;
+import org.yaml.snakeyaml.nodes.NodeId;
public class ComposerImplTest extends TestCase {
public void testGetNode() {
String data = "american:\n - Boston Red Sox";
- Node node = compose(data);
+ Yaml yaml = new Yaml();
+ Node node = yaml.compose(new StringReader(data));
assertNotNull(node);
assertTrue(node instanceof MappingNode);
String data2 = "---\namerican:\n- Boston Red Sox";
- Node node2 = compose(data2);
+ Node node2 = yaml.compose(new StringReader(data2));
assertNotNull(node2);
assertFalse(node.equals(node2));
}
- private Node compose(String data) {
- Reader reader = new Reader(data);
- Parser parser = new ParserImpl(reader);
- Resolver resolver = new Resolver();
- Composer composer = new Composer(parser, resolver);
- Node node = composer.getSingleNode();
- return node;
+ public void testComposeBean() {
+ String data = "!!org.yaml.snakeyaml.composer.ComposerImplTest$BeanToCompose {name: Bill, age: 18}";
+ Yaml yaml = new Yaml();
+ Node node = yaml.compose(new StringReader(data));
+ assertNotNull(node);
+ assertTrue(node instanceof MappingNode);
+ assertEquals(
+ "tag:yaml.org,2002:org.yaml.snakeyaml.composer.ComposerImplTest$BeanToCompose",
+ node.getTag());
+ assertEquals(NodeId.mapping, node.getNodeId());
+ assertEquals(Object.class, node.getType());
+ }
+
+ public static class BeanToCompose {
+ private String name;
+ private int age;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getAge() {
+ return age;
+ }
+
+ public void setAge(int age) {
+ this.age = age;
+ }
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/constructor/MockDate.java b/src/test/java/org/yaml/snakeyaml/constructor/MockDate.java
deleted file mode 100644
index c90576e..0000000
--- a/src/test/java/org/yaml/snakeyaml/constructor/MockDate.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * See LICENSE file in distribution for copyright and licensing information.
- */
-package org.yaml.snakeyaml.constructor;
-
-import java.util.Date;
-
-public class MockDate extends Date {
-
- private static final long serialVersionUID = 621384692653658062L;
-
- public MockDate(long date) {
- throw new RuntimeException("Test error.");
- }
-}
diff --git a/src/test/java/org/yaml/snakeyaml/constructor/MockDateBeanConstructorTest.java b/src/test/java/org/yaml/snakeyaml/constructor/MockDateBeanConstructorTest.java
index fe90345..bde9cfb 100644
--- a/src/test/java/org/yaml/snakeyaml/constructor/MockDateBeanConstructorTest.java
+++ b/src/test/java/org/yaml/snakeyaml/constructor/MockDateBeanConstructorTest.java
@@ -4,6 +4,7 @@
package org.yaml.snakeyaml.constructor;
import java.io.IOException;
+import java.util.Date;
import junit.framework.TestCase;
@@ -12,13 +13,43 @@
public class MockDateBeanConstructorTest extends TestCase {
public void testConstructor() throws IOException {
- String className = "!!" + this.getClass().getPackage().getName() + ".MockDate 2009-07-24";
+ String className = "!!org.yaml.snakeyaml.constructor.MockDateBeanConstructorTest$DateBean {number: 24, date: 2009-07-24}";
Yaml yaml = new Yaml();
try {
yaml.load(className);
fail("MockDate cannot be constructed.");
} catch (Exception e) {
+ e.printStackTrace();
assertTrue(e.getMessage(), e.getMessage().contains("MockDate"));
}
}
+
+ public static class DateBean {
+ private int number;
+ private MockDate date;
+
+ public int getNumber() {
+ return number;
+ }
+
+ public void setNumber(int number) {
+ this.number = number;
+ }
+
+ public MockDate getDate() {
+ return date;
+ }
+
+ public void setDate(MockDate date) {
+ this.date = date;
+ }
+ }
+
+ public static class MockDate extends Date {
+ private static final long serialVersionUID = 621384692653658062L;
+
+ public MockDate(long date) {
+ throw new RuntimeException("Test error.");
+ }
+ }
}
