dion        2003/01/16 20:53:15

  Modified:    jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml
                        transformExampleSAXOutputNestedTransforms.jelly
                        TestParser.java suite.jelly
  Log:
  Remove log taglib usage
  
  Revision  Changes    Path
  1.2       +1 -1      
jakarta-commons-sandbox/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleSAXOutputNestedTransforms.jelly
  
  Index: transformExampleSAXOutputNestedTransforms.jelly
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/transformExampleSAXOutputNestedTransforms.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- transformExampleSAXOutputNestedTransforms.jelly   15 Jan 2003 23:46:37 -0000     
 1.1
  +++ transformExampleSAXOutputNestedTransforms.jelly   17 Jan 2003 04:53:14 -0000     
 1.2
  @@ -1,5 +1,5 @@
   <?xml version="1.0"?>
  -<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:log="jelly:log">
  +<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml">
   
     <x:transform xslt="transformExample5.xsl" var="doc">
         <x:transform xslt="transformExample4.xsl">
  
  
  
  1.2       +10 -9     
jakarta-commons-sandbox/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestParser.java
  
  Index: TestParser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestParser.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestParser.java   16 Jan 2003 23:11:13 -0000      1.1
  +++ TestParser.java   17 Jan 2003 04:53:14 -0000      1.2
  @@ -70,6 +70,8 @@
   import junit.framework.TestSuite;
   import junit.textui.TestRunner;
   
  +import org.apache.commons.jelly.Script;
  +import org.apache.commons.jelly.Tag;
   import org.apache.commons.jelly.impl.ScriptBlock;
   import org.apache.commons.jelly.impl.TagScript;
   import org.apache.commons.jelly.parser.XMLParser;
  @@ -99,12 +101,11 @@
       }
   
       /**
  -     * FIXME: Move to XML
        * Tests that parsing an example script correctly creates the parent
        * relationships
  -
  +     */
       public void testParser() throws Exception {
  -        InputStream in = new 
FileInputStream("src/test/org/apache/commons/jelly/example2.jelly");
  +        InputStream in = new 
FileInputStream("src/test/org/apache/commons/jelly/tags/xml/example2.jelly");
           XMLParser parser = new XMLParser();
           Script script = parser.parse(in);
           script = script.compile();
  @@ -113,7 +114,7 @@
           
           assertTagsHaveParent( script, null );
       }
  -*/    
  +
       /**
        * Tests that the Tag in the TagScript has the given parent and then
        * recurse to check its children has the correct parent and so forth.
  
  
  
  1.2       +4 -5      
jakarta-commons-sandbox/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly
  
  Index: suite.jelly
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- suite.jelly       15 Jan 2003 23:46:38 -0000      1.1
  +++ suite.jelly       17 Jan 2003 04:53:14 -0000      1.2
  @@ -2,8 +2,7 @@
   <test:suite 
        xmlns:j="jelly:core" 
        xmlns:x="jelly:xml" 
  -     xmlns:test="jelly:junit" 
  -     xmlns:log="jelly:log">
  +     xmlns:test="jelly:junit">
   
        <test:case name="testUriParse">
                <x:parse var="doc" xml="dummy.xml"/>
  @@ -35,14 +34,14 @@
     
     <test:case name="testBadElementAndAttribute">
   
  -             <log:info>
  +             
                        <j:catch var="ex">
                                <x:element name="foo">
                                        some text
                                        <x:attribute name="x">1234</x:attribute>
                                </x:element>
                        </j:catch>      
  -             </log:info>     
  +                     
                
                <test:assert test="${ex != null}">
                        We should have created an exception as some text is output 
before the attributes
  @@ -67,7 +66,7 @@
                
                <test:assert test="${ex != null}">We should have created an 
exception</test:assert>
                
  -             <log:info>The exception was: ${ex.message}</log:info>
  +             The exception was: ${ex.message}
     </test:case>
   
        <!-- test the use of namespaces with XPath -->
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to