From c3fcab05f0c14ab82a88f1d7de6c8aad3fe339d1 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 15 Jan 2009 09:48:29 +0000
Subject: [PATCH] Enabled Jibx tests

---
 org.springframework.oxm/build.xml             | 22 ++++++++++++++++++-
 .../oxm/jibx/JibxMarshallerTest.java          |  2 --
 .../oxm/jibx/JibxUnmarshallerTest.java        |  1 -
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/org.springframework.oxm/build.xml b/org.springframework.oxm/build.xml
index c9239fb9d3..42b60a4968 100644
--- a/org.springframework.oxm/build.xml
+++ b/org.springframework.oxm/build.xml
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.oxm">
+<project name="org.springframework.oxm" xmlns:ivy="antlib:org.apache.ivy.ant">
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
+
+	<macrodef name="test-post-compile">
+		<attribute name="classpath.id"/>
+		<attribute name="input.dir"/>
+		<attribute name="output.dir"/>
+		<attribute name="resources.dir"/>
+		<sequential>
+			<ivy:cachepath resolveId="jibx.classpath" pathid="jibx.classpath" organisation="net.sourceforge.jibx"
+						   module="com.springsource.org.jibx.binding" revision="1.1.5"
+						   conf="runtime" type="jar" inline="true" log="download-only"/>
+			<taskdef name="jibx-bind" classname="org.jibx.binding.ant.CompileTask" classpathref="jibx.classpath"/>
+
+			<jibx-bind load="true" binding="${basedir}/src/test/resources/org/springframework/oxm/jibx/binding.xml">
+				<classpathset dir="@{output.dir}">
+					<include name="**/jibx/**/*"/>
+				</classpathset>
+			</jibx-bind>
+		</sequential>
+	</macrodef>
+
 </project>
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTest.java b/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTest.java
index 3d9ad5dd97..58ca7f5669 100644
--- a/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTest.java
+++ b/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTest.java
@@ -23,13 +23,11 @@ import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import org.custommonkey.xmlunit.XMLUnit;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.springframework.oxm.AbstractMarshallerTestCase;
 import org.springframework.oxm.Marshaller;
 
-@Ignore("Code generation not yet support by Spring Build")
 public class JibxMarshallerTest extends AbstractMarshallerTestCase {
 
 	@Override
diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTest.java b/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTest.java
index fcffe7f3ed..eea4f94b8c 100644
--- a/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTest.java
+++ b/org.springframework.oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTest.java
@@ -22,7 +22,6 @@ import org.junit.Ignore;
 import org.springframework.oxm.AbstractUnmarshallerTestCase;
 import org.springframework.oxm.Unmarshaller;
 
-@Ignore("Code generation not yet support by Spring Build")
 public class JibxUnmarshallerTest extends AbstractUnmarshallerTestCase {
 
 	@Override