geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r505413 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild: config/projects/Geronimo_CTS/report/ config/projects/Geronimo_CTS/report/model/ system/ system/template/
Date Fri, 09 Feb 2007 18:39:15 GMT
Author: jdillon
Date: Fri Feb  9 10:39:14 2007
New Revision: 505413

URL: http://svn.apache.org/viewvc?view=rev&rev=505413
Log:
A few hacks and debug muck, committing so latest flight can generate a report (even though
the jaxp bits are going to be off)

Modified:
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestResult.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/ClassModel.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/GroupModel.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/BuildHarness.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/template/Template.groovy

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy?view=diff&rev=505413&r1=505412&r2=505413
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy
Fri Feb  9 10:39:14 2007
@@ -187,6 +187,18 @@
             log.info 'Processing test results'
             scanner.each { file ->
                 def testCase = TestCase.fromFile(file)
+                
+                //
+                // HACK: Try to figure out stupid jaxp test case
+                //
+                
+                if (testCase.name == 'com.sun.ts.tests.jaxp.api.xml_schema.XmlSchemaRunner#Positive_from_servlet')
{
+                    println "Positive_from_servlet: $file"
+                }
+                if (testCase.name == 'com.sun.ts.tests.jaxp.api.xml_schema.XmlSchemaRunner#Negative_from_servlet')
{
+                    println "Positive_from_servlet: $file"
+                }
+                
                 iterModel << testCase
                 
                 // Render testcase detail

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestResult.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestResult.groovy?view=diff&rev=505413&r1=505412&r2=505413
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestResult.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestResult.groovy
Fri Feb  9 10:39:14 2007
@@ -52,7 +52,7 @@
         assert file
         
         file = new File("$file").canonicalFile
-        assert file.exists()
+        assert file.exists() : "Missing result file: $file"
         
         boolean debug = log.debugEnabled
         boolean trace = log.traceEnabled

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/ClassModel.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/ClassModel.groovy?view=diff&rev=505413&r1=505412&r2=505413
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/ClassModel.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/ClassModel.groovy
Fri Feb  9 10:39:14 2007
@@ -36,6 +36,18 @@
         super(name, 'name', TestCaseModel)
     }
     
+    //
+    // HACK: Try and detect duplicate test names
+    //
+    
+    def leftShift(gbuild.config.projects.Geronimo_CTS.report.TestCase testCase) {
+        if (children.containsKey(testCase.name)) {
+            println "ERROR: Duplicate test case name: ${testCase.name}"
+        }
+        
+        super.leftShift(testCase)
+    }
+    
     Collection getTests() {
         return children.values().sort()
     }

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/GroupModel.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/GroupModel.groovy?view=diff&rev=505413&r1=505412&r2=505413
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/GroupModel.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/GroupModel.groovy
Fri Feb  9 10:39:14 2007
@@ -91,7 +91,7 @@
         assert model
         
         // Make sure we don't clobber anything
-        assert !children[name]
+        assert !children.containsKey(name)
         
         children[name] = model
         

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/BuildHarness.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/BuildHarness.groovy?view=diff&rev=505413&r1=505412&r2=505413
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/BuildHarness.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/BuildHarness.groovy
Fri Feb  9 10:39:14 2007
@@ -66,7 +66,7 @@
             controller.dispatch(actionName)
         }
         catch (AssertionError e) {
-            fail e
+            fail e, true // HACK: Need to see where some asserts are failing
         }
         catch (ActionFailure e) {
             fail e

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/template/Template.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/template/Template.groovy?view=diff&rev=505413&r1=505412&r2=505413
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/template/Template.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/template/Template.groovy
Fri Feb  9 10:39:14 2007
@@ -67,8 +67,17 @@
         file.parentFile.mkdirs()
         assert file.parentFile.exists() : "Failed to create directory: ${file.parentFile}"
         
+        /*
+        FIXME: Need to see why this is happening...
+        
         // Fail if we are overriting something
-        assert !file.exists()
+        assert !file.exists() : "Attempting to overwrite: $file"
+        */
+        if (file.exists()) {
+            log.error "Overwriting: $file; backing up orig for debugging"
+            def ts = System.currentTimeMillis()
+            new AntBuilder().copy(file: file, tofile: "${file}.$ts")
+        }
         
         log.debug "Rendering to: $file"
         



Mime
View raw message