Index: maven-commandline-plugin/src/test/org/codelutin/option/def/DefinitionParserTest.java
diff -u maven-commandline-plugin/src/test/org/codelutin/option/def/DefinitionParserTest.java:1.1 maven-commandline-plugin/src/test/org/codelutin/option/def/DefinitionParserTest.java:1.2
--- maven-commandline-plugin/src/test/org/codelutin/option/def/DefinitionParserTest.java:1.1	Sun Mar 23 00:23:00 2008
+++ maven-commandline-plugin/src/test/org/codelutin/option/def/DefinitionParserTest.java	Sun Mar 23 23:49:44 2008
@@ -14,10 +14,9 @@
 
 import junit.framework.TestCase;
 import org.codelutin.i18n.I18n;
-import org.codelutin.option.def.ParserUtilForTest;
-import org.codelutin.option.def.DefinitionParserFromProperties;
 
 import java.io.File;
+import java.util.Collections;
 
 /**
  * DefinitionParser Tester.
@@ -47,7 +46,7 @@
 
     public void testNoOptions() throws Exception {
         file = ParserUtilForTest.initFileMock("", "option", "testNoOptions.properties");
-        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file);
+        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file, Collections.<String, String>emptyMap());
         assertTrue(parser.getOptions().length == 0);
     }
 
@@ -125,33 +124,33 @@
 
         optionName = "testArgumentConstantCardinalite00005";
         file = ParserUtilForTest.initFileMock(optionName, "option", "-testArgumentConstantCardinalite00005 <constant>");
-        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file);
+        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file, Collections.<String, String>emptyMap());
         ParserUtilForTest.assertError(parser, 1, 0);
 
         optionName = "testArgumentConstantCardinalite00015";
         file = ParserUtilForTest.initFileMock(optionName, "option", "-testArgumentConstantCardinalite00015 [constant]");
-        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file);
+        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file, Collections.<String, String>emptyMap());
         ParserUtilForTest.assertError(parser, 1, 0);
 
         optionName = "testArgumentValuedCardinalite00003";
         file = ParserUtilForTest.initFileMock(optionName, "option", "-testArgumentValuedCardinalite00003 <string:String+>");
-        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file);
+        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file, Collections.<String, String>emptyMap());
         ParserUtilForTest.assertError(parser, 1, 0);
 
         optionName = "testArgumentValuedCardinalite00004";
         file = ParserUtilForTest.initFileMock(optionName, "option", "-testArgumentValuedCardinalite00004 <string:String{1,*}>");
-        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file);
+        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file, Collections.<String, String>emptyMap());
         ParserUtilForTest.assertError(parser, 1, 0);
 
         optionName = "testArgumentValuedCardinalite00010";
         file = ParserUtilForTest.initFileMock(optionName, "option", "-testArgumentValuedCardinalite00010 [string:String{0,5}]");
-        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file);
+        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file, Collections.<String, String>emptyMap());
         ParserUtilForTest.assertError(parser, 1, 0);
 
         optionName = "testArgumentValuedCardinalite00011";
 
         file = ParserUtilForTest.initFileMock(optionName, "option", "-testArgumentValuedCardinalite00011 [string:String*]");
-        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file);
+        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file, Collections.<String, String>emptyMap());
         ParserUtilForTest.assertError(parser, 1, 0);
     }
 

Index: maven-commandline-plugin/src/test/org/codelutin/option/def/PropertiesLoaderTest.java
diff -u maven-commandline-plugin/src/test/org/codelutin/option/def/PropertiesLoaderTest.java:1.1 maven-commandline-plugin/src/test/org/codelutin/option/def/PropertiesLoaderTest.java:1.2
--- maven-commandline-plugin/src/test/org/codelutin/option/def/PropertiesLoaderTest.java:1.1	Sun Mar 23 00:23:01 2008
+++ maven-commandline-plugin/src/test/org/codelutin/option/def/PropertiesLoaderTest.java	Sun Mar 23 23:49:44 2008
@@ -27,6 +27,8 @@
 import java.net.URL;
 import java.util.List;
 import java.util.Properties;
+import java.util.Map;
+import java.util.HashMap;
 
 /** @author chemit */
 public class PropertiesLoaderTest extends TestCase {
@@ -46,7 +48,11 @@
     }
 
     public void testConfigCategory() throws Exception {
-        ConfigLoader configLoader = new ConfigLoader();
+        Map<String, String> injects =new HashMap<String, String>();
+
+        injects.put(MandatoryConfigProperty.encoding.name(),"UTF-8");
+        
+        ConfigLoader configLoader = new ConfigLoader(injects);
 
         File f;
         URL resource = getClass().getResource("/PropertiesLoaderTest.properties");
@@ -77,6 +83,10 @@
             }
             currentSize = currentSize - result2.size() * 2;
         }
+        // we have 2 mandatories value,
+        int nbMandatories = MandatoryConfigProperty.values().length-2;
+        currentSize+= nbMandatories*2;
+        
         assertEquals(currentSize, p.size());
 
         OptionLoader optionLoader = new OptionLoader(configLoader.getCategoriesStr());

Index: maven-commandline-plugin/src/test/org/codelutin/option/def/DefinitionParserBadOptionTest.java
diff -u maven-commandline-plugin/src/test/org/codelutin/option/def/DefinitionParserBadOptionTest.java:1.1 maven-commandline-plugin/src/test/org/codelutin/option/def/DefinitionParserBadOptionTest.java:1.2
--- maven-commandline-plugin/src/test/org/codelutin/option/def/DefinitionParserBadOptionTest.java:1.1	Sun Mar 23 00:23:00 2008
+++ maven-commandline-plugin/src/test/org/codelutin/option/def/DefinitionParserBadOptionTest.java	Sun Mar 23 23:49:44 2008
@@ -13,11 +13,9 @@
 package org.codelutin.option.def;
 
 import junit.framework.TestCase;
-import org.codelutin.option.def.ParserUtilForTest;
-import org.codelutin.option.def.DefinitionParserFromProperties;
 
 import java.io.File;
-import java.io.IOException;
+import java.util.Collections;
 
 /**
  * DefinitionParser Tester.
@@ -194,9 +192,9 @@
 
     }
 
-    private void initAndParse(String... defs) throws IOException, InstantiationException, IllegalAccessException {
+    private void initAndParse(String... defs) throws Exception {
         key = getName() + System.currentTimeMillis();
         file = ParserUtilForTest.initFileMock(key, "option", defs);
-        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file);
+        parser = DefinitionParser.doParse(DefinitionParserFromProperties.class, file, Collections.<String, String>emptyMap());
     }
 }
\ No newline at end of file