cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r668607 - in /cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test: java/org/apache/cocoon/template/jxtg/ resources/org/apache/cocoon/template/jxtg/
Date Tue, 17 Jun 2008 10:30:32 GMT
Author: gkossakowski
Date: Tue Jun 17 03:30:32 2008
New Revision: 668607

URL: http://svn.apache.org/viewvc?rev=668607&view=rev
Log:
COCOON-2211: Renamed files for test-cases to more meaningful ones.
Fixed copy&paste problem in testPrefixMappingFailDueToInvalidPrefix procedure.

Added:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-failDueToEmptyName.xml
      - copied, changed from r668604, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail4.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-failDueToInvalidPrefix.xml
      - copied, changed from r668604, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail5.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-invalidNameSpecified.xml
      - copied, changed from r668604, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail2.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-missingNamespacePrefixSpecified.xml
      - copied, changed from r668604, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail3.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-noNameSpecified.xml
      - copied, changed from r668604, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail1.xml
Removed:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail1.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail2.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail3.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail4.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail5.xml
Modified:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java?rev=668607&r1=668606&r2=668607&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
(original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Tue Jun 17 03:30:32 2008
@@ -270,7 +270,7 @@
     }
 
     public void testPrefixMappingFailDueToNoNameSpecified() throws Exception {
-        String inputURI = docBase + "jxElement-fail1.xml";
+        String inputURI = docBase + "jxElement-noNameSpecified.xml";
         getNewObjectModel().markLocalContext();
         boolean error = false;
         
@@ -284,7 +284,7 @@
     }
     
     public void testPrefixMappingFailDueToInvalidNameSpecified() throws Exception {
-	String inputURI = docBase + "jxElement-fail2.xml";
+        String inputURI = docBase + "jxElement-invalidNameSpecified.xml";
         getNewObjectModel().markLocalContext();
         boolean error = false;
         
@@ -299,7 +299,7 @@
     }
     
     public void testPrefixMappingFailDueToMissingNamespaceSpecifedPrefix() throws Exception
{
-	String inputURI = docBase + "jxElement-fail3.xml";
+	String inputURI = docBase + "jxElement-missingNamespacePrefixSpecified.xml";
         getNewObjectModel().markLocalContext();
         boolean error = false;
         
@@ -314,7 +314,7 @@
     }    
     
     public void testPrefixMappingFailDueToEmptyName() throws Exception {
-	String inputURI = docBase + "jxElement-fail4.xml";
+	String inputURI = docBase + "jxElement-failDueToEmptyName.xml";
         getNewObjectModel().markLocalContext();
         boolean error = false;
         
@@ -329,17 +329,17 @@
     }      
     
     public void testPrefixMappingFailDueToInvalidPrefix() throws Exception {
-	String inputURI = docBase + "jxElement-fail4.xml";
+	String inputURI = docBase + "jxElement-failDueToInvalidPrefix.xml";
         getNewObjectModel().markLocalContext();
         boolean error = false;
         
         try {
             generate(JX, inputURI, EMPTY_PARAMS);
         } catch (SAXParseException e) {
-            if (e.getMessage().equals(Element.XML_ELEM_NAME_BLANK))
+            if (e.getMessage().equals(Element.XML_PREFIX_NAME_INVALID))
         	error = true;        
         }
-        assertTrue("should throw sax exception due empty name", error);      
+        assertTrue("should throw sax exception due invalid prefix", error);      
         getNewObjectModel().cleanupLocalContext();
     }     
     

Copied: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-failDueToEmptyName.xml
(from r668604, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail4.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-failDueToEmptyName.xml?p2=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-failDueToEmptyName.xml&p1=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail4.xml&r1=668604&r2=668607&rev=668607&view=diff
==============================================================================
    (empty)

Copied: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-failDueToInvalidPrefix.xml
(from r668604, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail5.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-failDueToInvalidPrefix.xml?p2=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-failDueToInvalidPrefix.xml&p1=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail5.xml&r1=668604&r2=668607&rev=668607&view=diff
==============================================================================
    (empty)

Copied: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-invalidNameSpecified.xml
(from r668604, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail2.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-invalidNameSpecified.xml?p2=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-invalidNameSpecified.xml&p1=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail2.xml&r1=668604&r2=668607&rev=668607&view=diff
==============================================================================
    (empty)

Copied: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-missingNamespacePrefixSpecified.xml
(from r668604, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail3.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-missingNamespacePrefixSpecified.xml?p2=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-missingNamespacePrefixSpecified.xml&p1=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail3.xml&r1=668604&r2=668607&rev=668607&view=diff
==============================================================================
    (empty)

Copied: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-noNameSpecified.xml
(from r668604, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail1.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-noNameSpecified.xml?p2=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-noNameSpecified.xml&p1=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/jxElement-fail1.xml&r1=668604&r2=668607&rev=668607&view=diff
==============================================================================
    (empty)



Mime
View raw message