Author: chatellier Date: 2009-04-24 16:17:54 +0000 (Fri, 24 Apr 2009) New Revision: 1446 Added: lutinutil/trunk/src/test/java/org/codelutin/util/RecursivePropertiesTest.java lutinutil/trunk/src/test/resources/properties/ lutinutil/trunk/src/test/resources/properties/recursive.properties lutinutil/trunk/src/test/resources/properties/windows.properties Modified: lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties Log: Add test on recursive properties Modified: lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties =================================================================== --- lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties 2009-04-20 12:37:43 UTC (rev 1445) +++ lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties 2009-04-24 16:17:54 UTC (rev 1446) @@ -6,13 +6,13 @@ lutinutil.error.applicationconfig.save=Can't save config in file %s lutinutil.error.convert.file.to.url=Can't convert %s for reason %s lutinutil.error.convertor.noValue=No value specified for converter %s -lutinutil.error.get.url.from.zip=Error while reading %s : %s +lutinutil.error.get.url.from.zip=Error while reading %s \: %s lutinutil.error.i18n.unformated.message=Message can't be formatted\: '%s' with arguments %s lutinutil.error.i18n.unfound.country=could not find country from '%s', use default country '%s' lutinutil.error.i18n.unfound.language=could not find language from '%s', use default language '%s' lutinutil.error.i18n.untranslated.message=Message can't be translated\: '%s' lutinutil.error.no.convertor=no convertor found for type %2$s and objet '%1$s' -lutinutil.error.resource.not.found=Can't find resource : %s +lutinutil.error.resource.not.found=Can't find resource \: %s lutinutil.error.unfound.month=could not found month from '%s', use default month '%s' lutinutil.error.unknown.url.type=could not treate unknown type of url %1$s lutinutil.error.url.convertor=a problem occurs while converting value '%s' with url convertor %s for reason %s Modified: lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties =================================================================== --- lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties 2009-04-20 12:37:43 UTC (rev 1445) +++ lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties 2009-04-24 16:17:54 UTC (rev 1446) @@ -2,7 +2,7 @@ lutinutil.debug.objectutil.create=Essaye de cr\u00E9er %s avec %s lutinutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00EAtres %s lutinutil.debug.objectutil.invoke=Invocation de %s avec %s -lutinutil.error.add.url.in.classloader=Impossible d'ajouter une url dans le classloader %s pour la raison : %s +lutinutil.error.add.url.in.classloader=Impossible d'ajouter une url dans le classloader %s pour la raison \: %s lutinutil.error.applicationconfig.save=Impossible de sauvegarder le fichier de configuration dans %s lutinutil.error.convert.file.to.url=Le fichier '%1$s' n'a pas pu \u00EAtre converti en URL pour la raison suivante \: %2$S lutinutil.error.convertor.noValue=Aucune valeur \u00E0 convertir pour le convertisseur %s @@ -12,7 +12,7 @@ lutinutil.error.i18n.unfound.language=n'a pas pu trouver la langue \u00E0 partir de '%s', utilise la langue par d\u00E9faut '%s' lutinutil.error.i18n.untranslated.message=Le message suivant n'a pas pu \u00EAtre traduit \: '%s' lutinutil.error.no.convertor=Aucun convertisseur trouv\u00E9 pour le type %2$s et l''objet '%1$s' -lutinutil.error.resource.not.found=Impossible de trouver la ressource : %s +lutinutil.error.resource.not.found=Impossible de trouver la ressource \: %s lutinutil.error.unfound.month=n'a pas pu trouv\u00E9 le mois \u00E0 partir de '%s', utilise le mois par d\u00E9faut '%s' lutinutil.error.unknown.url.type=could not treate unknown type of url %1$s lutinutil.error.url.convertor=Un probl\u00E8me est apparu lors de la convertion en url de '%s' avec le convertisseur %s pour la raison suivante \: %s Added: lutinutil/trunk/src/test/java/org/codelutin/util/RecursivePropertiesTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/RecursivePropertiesTest.java (rev 0) +++ lutinutil/trunk/src/test/java/org/codelutin/util/RecursivePropertiesTest.java 2009-04-24 16:17:54 UTC (rev 1446) @@ -0,0 +1,65 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.codelutin.util; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; + +import org.junit.Assert; +import org.junit.Test; + +/** + * Test recursives properties class. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 24 avr. 2009 $ + * By : $Author: chatellier $ + */ +public class RecursivePropertiesTest { + + /** + * Test string by \\ in value. + * + * @throws IOException + */ + @Test + public void testWindowsFile() throws IOException { + RecursiveProperties props = new RecursiveProperties(); + props.load(new FileInputStream("src/test/resources/properties/windows.properties")); + + Assert.assertEquals("C:\\Documents and Settings\\guest\\.ssh\\id_rsa", props.getProperty("vcs.ssh.keyFile")); + } + + /** + * Test with recursive properties. + * + * @throws IOException + */ + @Test + public void testRecursive() throws IOException { + RecursiveProperties props = new RecursiveProperties(); + props.load(new FileInputStream("src/test/resources/properties/recursive.properties")); + + Assert.assertEquals("World", props.getProperty("username")); + Assert.assertEquals("Hello World !", props.getProperty("helloWorld")); + } +} Added: lutinutil/trunk/src/test/resources/properties/recursive.properties =================================================================== --- lutinutil/trunk/src/test/resources/properties/recursive.properties (rev 0) +++ lutinutil/trunk/src/test/resources/properties/recursive.properties 2009-04-24 16:17:54 UTC (rev 1446) @@ -0,0 +1,2 @@ +username=World +helloWorld=Hello ${username} ! \ No newline at end of file Added: lutinutil/trunk/src/test/resources/properties/windows.properties =================================================================== --- lutinutil/trunk/src/test/resources/properties/windows.properties (rev 0) +++ lutinutil/trunk/src/test/resources/properties/windows.properties 2009-04-24 16:17:54 UTC (rev 1446) @@ -0,0 +1,6 @@ +vcs.ssh.keyFile=C\:\\Documents and Settings\\guest\\.ssh\\id_rsa +compilation.directory=E\:\\isis-build +simulator.password=guest +locale=fr_FR +simulationShowOnlyError=true +configFileName=C\:\\Documents and Settings\\guest\\.isis-config-3 \ No newline at end of file