svn commit: r659684 - in /incubator/tuscany/java/sca/vtest/java-api: annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java processcomments.rb

[kw...@apache.org]

Author: kwilliams
Date: Fri May 23 14:59:36 2008
New Revision: 659684

URL: http://svn.apache.org/viewvc?rev=659684&view=rev
Log:
Updates to comment processor

Modified:
    incubator/tuscany/java/sca/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
    incubator/tuscany/java/sca/vtest/java-api/processcomments.rb

Modified: incubator/tuscany/java/sca/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java?rev=659684&r1=659683&r2=659684&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java (original)
+++ incubator/tuscany/java/sca/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java Fri May 23 14:59:36 2008
@@ -266,8 +266,7 @@
      * un-annotated protected which should not be injected via protected setter<br>
      */
     @Test
-    @Ignore
-    // JIRA-2289 - p23 failed
+    @Ignore("JIRA-2289 - p23 failed")
     public void atProperty7() throws Exception {
         Assert.assertNull(anotherAService.getP22());
         Assert.assertNull(anotherAService.getP23());

Modified: incubator/tuscany/java/sca/vtest/java-api/processcomments.rb
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/processcomments.rb?rev=659684&r1=659683&r2=659684&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/processcomments.rb (original)
+++ incubator/tuscany/java/sca/vtest/java-api/processcomments.rb Fri May 23 14:59:36 2008
@@ -64,17 +64,39 @@
     lts[1..lts.length]
   end
   
+  def ignore_line
+    @text[/^\s*@Ignore.*/]
+  end
+  
+  def jira
+    result = ignore_line
+    result = result[/\d{4,5}/] 
+    result ?  "T-" + result : "x"
+  end
+  
+  def ignore_string
+    ignore_line ?  jira : ""
+  end
+  
   def package_name
     @parent.package_name
   end
   
+  def testcase_name
+    @parent.testcase_name
+  end
+  
   def long_name
-    self.package_name + "." + self.name
+    self.package_name + "." + testcase_name + "." + self.name
   end
   
   def to_s
     long_name  + "\n" + "Lines tested: " + lines_tested_string + "\n\n"
   end
+  
+  def to_wiki_s
+    lines_tested_string + "|" + long_name + "|" + ignore_string + "\n"
+  end
 end
 
 class TestCase
@@ -118,22 +140,38 @@
 $num_files_processed = $num_test_methods = 0
 $testcases = Array.new
 
-puts "Scanning test files for " + Dir.pwd
+
 Dir["**/*TestCase.java"].each do |filename|
   process_file(filename)
    $num_files_processed += 1
 end
 
-puts "Total files processed = #{$num_files_processed}"
-puts "Number of test cases = #{$testcases.length}"
-puts "Number of test methods = #{$num_test_methods}"
-
 all_test_methods = Array.new
 $testcases.each do |tc| 
   tc.test_methods.each {|m| all_test_methods<<m}
 end
-  
-all_test_methods.sort.each {|tm| puts tm}
+
+#Regular screen dump
+#puts "Scanned test files for " + Dir.pwd
+#puts "Total files processed = #{$num_files_processed}"
+#puts "Number of test cases = #{$testcases.length}"
+#puts "Number of test methods = #{$num_test_methods}"
+#all_test_methods.sort.each {|tm| puts tm}
+
+
+#wiki output
+puts "1 Comment Processor Output"
+puts "1.1 " + Dir.pwd + " Specification"
+puts "1.1 Test case files scanned " + Date.today.to_s
+puts "* Total files processed = #{$num_files_processed}"
+puts "* Number of test cases = #{$testcases.length}"
+puts "* Number of test methods = #{$num_test_methods}"
+
+puts "{table}"
+puts "Lines Tested| package/testcase/method |ignored"
+all_test_methods.sort.each {|tm| puts tm.to_wiki_s}
+puts "{table}"
+