[seam-commits] Seam SVN: r13859 - branches/community/Seam_2_2/src/test/ftest.

[seam-commits at lists.jboss.org]

Author: plenyi at redhat.com
Date: 2010-10-14 08:04:04 -0400 (Thu, 14 Oct 2010)
New Revision: 13859

Modified:
   branches/community/Seam_2_2/src/test/ftest/build.xml
Log:
JBQA-3275 Fixed how the ftest-output xml files are located. More related minor improvements.

Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml	2010-10-14 12:00:58 UTC (rev 13858)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml	2010-10-14 12:04:04 UTC (rev 13859)
@@ -416,7 +416,7 @@
                         insert child '<exception class="java.lang.Error"><message><![CDATA[Deployment in error.] ]></message><full-stacktrace><![CDATA[ ] ]></full-stacktrace></exception>'
                */
                def xmlFile = new File("../../../test-output/testng-results.xml");
-               println "../../../test-output/testng-results.xml";
+               ant.echo 'Checking "../../../test-output/testng-results.xml"';
                assert xmlFile.exists() && xmlFile.isFile();
 
                def root = slurper.parse(xmlFile);
@@ -446,37 +446,42 @@
                def testOutDir = new File("../../../test-output");
                assert testOutDir.exists() && testOutDir.isDirectory();
                testOutDir.eachDir { dir ->
-                  if (dir.getName().endsWith("example")) {
-                     def exampleName;
-                     dir.eachFile { f ->
-                        if (f.getName().endsWith(container + ".xml")) {
-                           exampleName = f.getName().split("_" + container + ".*\\.xml")[0];
+                  ant.echo "Checking " + dir.getName();
+                  String exampleName;
+                  String xmlFilePath;
+                  String xmlFileEditPath;
+                  
+                  dir.eachFile { f ->
+                     if (f.isFile() && f.getName().matches(".*_" + container + ".*\\.xml")) {
+                        exampleName = f.getName().split("_" + container + ".*\\.xml")[0];
+                        xmlFilePath = f.getAbsolutePath();
+                        xmlFileEditPath = xmlFilePath.substring(0, xmlFilePath.length() - 4) + "-edit.xml";
+                        xmlFile = new File(xmlFilePath);
+                        ant.echo "DEBUG Parsing file " + xmlFile.getName();
+                        if (xmlFile.exists() && xmlFile.isFile()) {
+                           root = slurper.parse(xmlFile);
+                           def tsName = root.attributes().get("name");
+                           def tsTime = root.attributes().get("time");
+                           def tsTests = root.attributes().get("tests");
+                           serviceMethods = root.testcase.findAll { it. at name.toString().contains("@") }
+
+                           serviceMethods.each { it.replaceNode {} }
+                           root.testcase.skipped.replaceNode { node -> failure(message:'Test skipped.',type:'java.lang.Error.') }
+
+                           writer = new FileWriter(xmlFileEditPath);
+                           writer << "<" + "?xml version=\"1.0\" encoding=\"UTF-8\" ?" + ">";
+                           writer << '<testsuite name="' + tsName + '" failures="0" tests="' + tsTests + '" time="' + tsTime + '" errors="' + tsTests + '">';
+                           writer << builder.bind(root.getBody());
+                           writer << "</testsuite>";
+                           writer.close();
+                        
+                           ant.delete(file:xmlFilePath);
+                           ant.move(file:xmlFileEditPath,tofile:xmlFilePath);
                         }
+                        else {
+                           println dir.getName() + "does not contain any xml file with test results (Looking for " + xmlFilePath + "). Skipping this directory."
+                        }
                      }
-                     def xmlFilePath = "../../../test-output/" + dir.getName() + "/" + exampleName + "_" + container + ".xml";
-                     def xmlFileEditPath = "../../../test-output/" + dir.getName() + "/" + exampleName + "_" + container + "-edit.xml";
-                     xmlFile = new File(xmlFilePath);
-                     println xmlFilePath;
-                     assert xmlFile.exists() && xmlFile.isFile();
-                     
-                     root = slurper.parse(xmlFile);
-                     def tsName = root.attributes().get("name");
-                     def tsTime = root.attributes().get("time");
-                     def tsTests = root.attributes().get("tests");
-                     serviceMethods = root.testcase.findAll { it. at name.toString().contains("@") }
-
-                     serviceMethods.each { it.replaceNode {} }
-                     root.testcase.skipped.replaceNode { node -> failure(message:'Test skipped.',type:'java.lang.Error.') }
-
-                     writer = new FileWriter(xmlFileEditPath);
-                     writer << "<" + "?xml version=\"1.0\" encoding=\"UTF-8\" ?" + ">";
-                     writer << '<testsuite name="' + tsName + '" failures="0" tests="' + tsTests + '" time="' + tsTime + '" errors="' + tsTests + '">';
-                     writer << builder.bind(root.getBody());
-                     writer << "</testsuite>";
-                     writer.close();
-                     
-                     ant.delete(file:xmlFilePath);
-                     ant.move(file:xmlFileEditPath,tofile:xmlFilePath);
                   }
                }
             ]]>