svn commit: r1183594 - in /turbine/fulcrum/trunk/parser/src: java/org/apache/fulcrum/parser/DefaultParserService.java test/org/apache/fulcrum/parser/ParameterParserTest.java

[ludwig]

Author: ludwig
Date: Sat Oct 15 07:55:58 2011
New Revision: 1183594

URL: http://svn.apache.org/viewvc?rev=1183594&view=rev
Log:
Fixed incorrect configuration and added configuration tests.

Modified:
    
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParserService.java
    
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java

Modified: 
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParserService.java
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParserService.java?rev=1183594&r1=1183593&r2=1183594&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParserService.java
 (original)
+++ 
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParserService.java
 Sat Oct 15 07:55:58 2011
@@ -279,9 +279,8 @@ public class DefaultParserService
         parameterEncoding = conf.getChild(PARAMETER_ENCODING_KEY)
                             
.getValue(PARAMETER_ENCODING_DEFAULT).toLowerCase();
 
-        automaticUpload = conf.getAttributeAsBoolean(
-                            AUTOMATIC_KEY,
-                            AUTOMATIC_DEFAULT);
+        automaticUpload = 
conf.getChild(AUTOMATIC_KEY).getValueAsBoolean(AUTOMATIC_DEFAULT);
+                            
     }
 
     // ---------------- Avalon Lifecycle Methods ---------------------

Modified: 
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java?rev=1183594&r1=1183593&r2=1183594&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
 (original)
+++ 
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
 Sat Oct 15 07:55:58 2011
@@ -68,6 +68,14 @@ public class ParameterParserTest extends
     {
         assertTrue(parameterParser.getUrlFolding() == 
ParserService.URL_CASE_FOLDING_NONE);
     }
+    
+    public void testConfiguredAutomaticUpload() throws Exception {
+        assertTrue(parserService.getAutomaticUpload());
+    }
+    
+    public void testConfiguredParameterEncoding() throws Exception {
+        assertEquals("utf-8", parserService.getParameterEncoding());
+    }
 
     /**
      * Simple test to verify that URL Case Folding works properly