From f5ef6126913903a96329c0b64dee07fc7d406fcb Mon Sep 17 00:00:00 2001
From: Jan Materne <jhm@apache.org>
Date: Sat, 6 Sep 2003 13:30:30 +0000
Subject: [PATCH] Test if <style> generates new if the XSL is new.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275192 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/style/build.xml    | 13 +++++
 .../apache/tools/ant/taskdefs/StyleTest.java  | 54 ++-----------------
 2 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/src/etc/testcases/taskdefs/style/build.xml b/src/etc/testcases/taskdefs/style/build.xml
index dde2b9b1d..dc4208511 100644
--- a/src/etc/testcases/taskdefs/style/build.xml
+++ b/src/etc/testcases/taskdefs/style/build.xml
@@ -42,4 +42,17 @@
       </style>
   </target>
 
+  <target name="testNewerStylesheet">
+      <antcall target="copyXsl"><param name="xsl.value" value="old-value"/></antcall>
+      <style in="data.xml" out="${out.dir}/out.xml" style="tmp.xsl"/>
+      <antcall target="copyXsl"><param name="xsl.value" value="new-value"/></antcall>
+      <style in="data.xml" out="${out.dir}/out.xml" style="tmp.xsl"/>
+      <delete file="tmp.xsl"/>
+  </target>
+  <target name="copyXsl" if="xsl.value">
+      <copy file="testNewerStylesheet.xsl" tofile="tmp.xsl" overwrite="true">
+          <filterchain><expandproperties/></filterchain>
+      </copy>
+  </target>
+
 </project>
\ No newline at end of file
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java b/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java
index ac850d4bc..796ec62c9 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java
@@ -114,57 +114,9 @@ public class StyleTest extends BuildFileTest {
     }
 
     public void testNewerStylesheet() throws Exception {
-        File xmlFile = new File("testNewerStylesheet.xml");
-        File xslFile = new File("testNewerStylesheet.xsl");
-        File outFile = new File("testNewerStylesheet.out");
-
-        // create the first version of xml and xsl
-        String xml = "<data/>";
-        StringBuffer xslHeader = new StringBuffer();
-        StringBuffer xslFooter = new StringBuffer();
-        xslHeader.append("<?xml version=\"1.0\"?>");
-        xslHeader.append("<xsl:stylesheet");
-        xslHeader.append("  version=\"1.0\"");
-        xslHeader.append("  xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">");
-        xslHeader.append("<xsl:template match=\"/\">");
-        xslFooter.append("</xsl:template>");
-        xslFooter.append("</xsl:stylesheet>");
-
-        FileWriter xmlWriter = new FileWriter(xmlFile);
-        xmlWriter.write(xml);
-        xmlWriter.close();
-
-        FileWriter xslWriter = new FileWriter(xslFile);
-        xslWriter.write(xslHeader.toString());
-        xslWriter.write("old-string");
-        xslWriter.write(xslFooter.toString());
-        xslWriter.close();
-
-        // make the first transformation
-        XSLTProcess xslt = new XSLTProcess();
-        xslt.setProject(getProject());
-        System.out.println("Project : " + getProject());
-        xslt.setBasedir(getProject().getBaseDir());
-        xslt.setStyle(xslFile.toString());
-        xslt.setOut(outFile);
-        xslt.setIn(xmlFile);
-        xslt.execute();
-
-        // modify the xsl
-        xslWriter = new FileWriter(xslFile);
-        xslWriter.write(xslHeader.toString());
-        xslWriter.write("new-string");
-        xslWriter.write(xslFooter.toString());
-        xslWriter.close();
-        xslt.perform();
-
-        // make the second transformation
-
-
-        // test for 2nd transformation
-        xmlFile.delete();
-        xslFile.delete();
-        outFile.delete();
+        expectFileContains("testNewerStylesheet",
+                           "out/out.xml",
+                           "new-value");
     }