From deca69e3749367d73ab97c0b01002a247679fefe Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 15 Jun 2011 11:45:23 +0000
Subject: [PATCH] SPR-8453 - SpringOXM CastorMarshaller tests

---
 .../oxm/castor/CastorMarshallerTests.java     | 16 ----------------
 .../oxm/castor/CastorObject.java              | 19 ++++++++++++++++---
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java b/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
index 4311d63e74..ea3b9e3c8c 100644
--- a/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
+++ b/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
@@ -149,12 +149,6 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 		Assert.assertTrue("CastorMarshaller does not support Flight", marshaller.supports(Flight.class));
 	}
 
-	/**
-	 * Tests the marshal result when the {@link CastorMarshaller#setSuppressNamespaces(boolean)} is set to
-	 * <code>true</code>.
-	 *
-	 * @throws Exception if any error occurs during test
-	 */
 	@Test
 	public void testSuppressNamespacesTrue() throws Exception {
 		getCastorMarshaller().setSuppressNamespaces(true);
@@ -162,12 +156,6 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 		assertXMLEqual("Marshaller wrote invalid result", SUPPRESSED_NAMESPACE_EXPECTED_STRING, result);
 	}
 
-	/**
-	 * Tests the marshal result when the {@link CastorMarshaller#setSuppressNamespaces(boolean)} is set to
-	 * <code>false</code>.
-	 *
-	 * @throws Exception if any error occurs during test
-	 */
 	@Test
 	public void testSuppressNamespacesFalse() throws Exception {
 		getCastorMarshaller().setSuppressNamespaces(false);
@@ -176,7 +164,6 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 	}
 
 	@Test
-	@Ignore("Not working yet")
 	public void testSuppressXsiTypeTrue() throws Exception {
 		CastorObject castorObject = createCastorObject();
 
@@ -187,7 +174,6 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 	}
 
 	@Test
-	@Ignore("Not working yet")
 	public void testSuppressXsiTypeFalse() throws Exception {
 		CastorObject castorObject = createCastorObject();
 
@@ -249,7 +235,6 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 	}
 
 	@Test
-	@Ignore("Not working yet")
 	public void testUseXsiTypeAsRootTrue() throws Exception {
 		CastorObject castorObject = createCastorObject();
 
@@ -261,7 +246,6 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 	}
 
 	@Test
-	@Ignore("Not working yet")
 	public void testUseXsiTypeAsRootFalse() throws Exception {
 		CastorObject castorObject = createCastorObject();
 
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java b/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java
index cbadfb9ba3..be52bd791c 100644
--- a/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java
+++ b/org.springframework.oxm/src/test/java/org/springframework/oxm/castor/CastorObject.java
@@ -16,17 +16,30 @@
 
 package org.springframework.oxm.castor;
 
+/**
+ * Represents a POJO used by {@link CastorMarshallerTests} for testing the marshaller output.
+ *
+ * @author Jakub Narloch
+ */
 public class CastorObject {
 
 	private String name;
 
-	private int value;
+	private Integer value;
+
+	public String getName() {
+		return name;
+	}
 
 	public void setName(String name) {
 		this.name = name;
 	}
 
-	public void setValue(int value) {
+	public Integer getValue() {
+		return value;
+	}
+
+	public void setValue(Integer value) {
 		this.value = value;
 	}
-}
+}
\ No newline at end of file