svn commit: r585159 - /tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java

[apetrelli]

Author: apetrelli
Date: Tue Oct 16 07:46:04 2007
New Revision: 585159

URL: http://svn.apache.org/viewvc?rev=585159&view=rev
Log:
TILES-224
Fixed style of the code of the test case that tests XML validation.

Modified:
    
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java

Modified: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?rev=585159&r1=585158&r2=585159&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
 Tue Oct 16 07:46:04 2007
@@ -198,16 +198,9 @@
      * configuration file with invalid XML.
      */
     public void testValidatingParameter() {
-        /*
-         * For some reason this test doesn't work.  It throws a 
SAXParseException
-         * but then the test failes saying "Should've thrown an exception.
-         *
-         * I don't know why DigesterDefinitionsReader doesn't catch the
-         * SAXParseException or how it makes it to the "fail" statement below.
-         */
         try {
             DefinitionsReader reader = new DigesterDefinitionsReader();
-            Map params = new HashMap();
+            Map<String, String> params = new HashMap<String, String>();
             
params.put(DigesterDefinitionsReader.PARSER_VALIDATE_PARAMETER_NAME,
                     "true");
             reader.init(params);
@@ -217,10 +210,13 @@
             assertNotNull("Config file not found", configFile);
 
             InputStream source = configFile.openStream();
-            Map definitions = reader.read(source);
+            reader.read(source);
             fail("Should've thrown an exception.");
         } catch (DefinitionsFactoryException e) {
             // correct.
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Exception caught, it is OK", e);
+            }
         } catch (Exception e) {
             fail("Exception reading configuration." + e);
         }