svn commit: r446931 - in /shale/framework/trunk/shale-clay: pom.xml src/test/java/org/apache/shale/clay/config/CommentTestCase.java

[gv...@apache.org]

Author: gvanmatre
Date: Sat Sep 16 12:59:17 2006
New Revision: 446931

URL: http://svn.apache.org/viewvc?view=rev&rev=446931
Log:
Added the myfaces dependency back into the clay pom in test scope and removed the commented out tests.

Modified:
    shale/framework/trunk/shale-clay/pom.xml
    shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java

Modified: shale/framework/trunk/shale-clay/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/pom.xml?view=diff&rev=446931&r1=446930&r2=446931
==============================================================================
--- shale/framework/trunk/shale-clay/pom.xml (original)
+++ shale/framework/trunk/shale-clay/pom.xml Sat Sep 16 12:59:17 2006
@@ -73,6 +73,13 @@
         </dependency>
 
         <dependency>
+            <groupId>myfaces</groupId>
+            <artifactId>myfaces-impl</artifactId>
+            <version>1.1.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.shale</groupId>
             <artifactId>shale-core</artifactId>
             <version>${version}</version>

Modified: shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java?view=diff&rev=446931&r1=446930&r2=446931
==============================================================================
--- shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java (original)
+++ shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java Sat Sep 16 12:59:17 2006
@@ -90,7 +90,7 @@
     }
 
     //Tests the processing of a comment in a HTML template
-/*    public void testComment() throws Exception{ // FIXME - fails at line 124
+    public void testComment() throws Exception{
         
         //done by the startup context listener
         loadConfigFiles(null, null);
@@ -132,10 +132,10 @@
         
         writer.close();
         
-    } */
+    } 
     
     //Tests the handling of a comment in a nested template.
-/*    public void testNested() throws Exception {  // FIXME - fails at line 168
+    public void testNested() throws Exception {
         loadConfigFiles(null, null);
         
         Clay clay = (Clay) application.createComponent("org.apache.shale.clay.component.Clay");    
@@ -175,7 +175,7 @@
         assertEquals("<!-- <span jsfid=\"outputText\"/> -->", buff.toString());
       
         writer.close();
-    } */
+    }
     
     //Recursively traverse the parsed HTML document tree returning 
     //the first comment node.
@@ -211,8 +211,5 @@
         return buff;
     }
     
-    public void testDummy() {
-        ; // Dummy test method to avoid JUnit complaints about no tests
-    }
 
 }