deps/lib/cobertura/jakarta-oro-license.txt deps/lib/cobertura/log4j-license.txt deps/lib/junit/junit-4.7-src.jar deps/lib/junit/junit-4.7.jar deps/lib/junit/junit-dep-4.7.jar dist/domderrien-0.8.5-javadoc.jar dist/domderrien-0.8.5-src.jar dist/domderrien-0.8.5.ear dist/domderrien-0.8.5.jar dist/domderrien-0.8.5.war src/Java/domderrien/i18n/ResourceNameDefinitions.java test/Java/domderrien/i18n/TestDateUtils.java test/Java/domderrien/i18n/TestLabelExtractor.java test/Java/domderrien/i18n/TestLocaleController.java test/Java/domderrien/i18n/TestResourceNameDefinitions.java test/Java/domderrien/jsontools/TestGenericJsonArray.java test/Java/domderrien/jsontools/TestGenericJsonObject.java test/Java/domderrien/jsontools/TestJsonDelimiters.java test/Java/domderrien/jsontools/TestJsonException.java test/Java/domderrien/jsontools/TestJsonParser.java test/Java/domderrien/jsontools/TestJsonSerializer.java test/Java/domderrien/jsontools/TestJsonUtils.java @@ -6,7 +6,7 @@ <classpathentry kind="lib" path="deps/lib/xml/xalan-2.7.0.jar"/> <classpathentry kind="lib" path="deps/lib/xml/xercesImpl-2.4.0.jar"/> <classpathentry kind="lib" path="deps/lib/xml/xml-apis-1.3.02.jar"/> - <classpathentry kind="lib" path="deps/lib/junit/junit-4.5.jar"/> + <classpathentry kind="lib" path="deps/lib/junit/junit-4.7.jar" sourcepath="deps/lib/junit/junit-4.7-src.jar"/> <classpathentry kind="lib" path="deps/lib/j2ee/servlet-api.jar"/> <classpathentry kind="output" path="bin/classes"/> </classpath> .classpath @@ -16,7 +16,7 @@ description="Temporary directory location. To reduce effects Eclipse automatic parsing, should be located outside the project structure." value="${basedir}${file.separator}bin${file.separator}temp" /> - <property name="dd2tu.release" description="Planned release of this build" value="0.8.2" /> + <property name="dd2tu.release" description="Planned release of this build" value="0.8.5" /> <property name="dd2tu.languageListFilename" value="domderrien-languages" /> @@ -146,7 +146,6 @@ --> <path id="tmxconverter.classpath"> - <pathelement path="bin/classes" />  <pathelement path="bin/classes" />  @@ -168,34 +167,29 @@ <path id="java.compile.classpath"> <fileset refid="runtime.deps" /> - <filelist dir="deps/lib/xml"> - <file name="xalan-2.7.0.jar" /> - <file name="xercesImpl-2.4.0.jar" /> - <file name="xml-apis-1.3.02.jar" /> - </filelist> - <filelist dir="deps/lib/junit"> - <file name="junit-4.5.jar" /> - </filelist> - <filelist dir="deps/lib/j2ee"> - <file name="servlet-api.jar" /> + <filelist dir="deps/lib"> + <file name="xml/xalan-2.7.0.jar" /> + <file name="xml/xercesImpl-2.4.0.jar" /> + <file name="xml/xml-apis-1.3.02.jar" /> + <file name="junit/junit-4.7.jar" /> + <file name="junit/junit-dep-4.7.jar" /> + <file name="j2ee/servlet-api.jar" /> </filelist> </path> <path id="cobertura.classpath"> - <filelist dir="deps/lib/junit"> - <file name="junit-4.5.jar" /> - </filelist> - <filelist dir="deps/lib/cobertura"> - <file name="cobertura.jar" /> - <file name="asm-3.0.jar" /> - <file name="asm-tree-3.0.jar" /> - <file name="jakarta-oro-2.0.8.jar" /> - <file name="log4j-1.2.9.jar" /> - </filelist> - <filelist dir="deps/lib/xml"> - <file name="xalan-2.7.0.jar" /> - <file name="xercesImpl-2.4.0.jar" /> - <file name="xml-apis-1.3.02.jar" /> + <filelist dir="deps/lib"> + <file name="junit/junit-4.7.jar" /> + <file name="junit/junit-dep-4.7.jar" /> + <file name="xml/xalan-2.7.0.jar" /> + <file name="xml/xercesImpl-2.4.0.jar" /> + <file name="xml/xml-apis-1.3.02.jar" /> + <file name="j2ee/servlet-api.jar" /> + <file name="cobertura/cobertura.jar" /> + <file name="cobertura/asm-3.0.jar" /> + <file name="cobertura/asm-tree-3.0.jar" /> + <file name="cobertura/jakarta-oro-2.0.8.jar" /> + <file name="cobertura/log4j-1.2.9.jar" /> </filelist> </path> @@ -360,18 +354,39 @@ <target name="step-compile"> <delete dir="bin/classes" /> <mkdir dir="bin/classes" /> - <javac destdir="bin/classes" deprecation="true" debug="true" optimize="false" excludes="" source="1.5" target="jsr14" srcdir="src/Java"> +  + <javac + destdir="bin/classes" + deprecation="false" + debug="true" + optimize="false" + excludes="" + srcdir="src/java" + > <classpath refid="java.compile.classpath" /> </javac> - <javac destdir="bin/classes" deprecation="false" debug="true" optimize="false" excludes="" source="1.5" target="jsr14" srcdir="test/Java"> + <javac + destdir="bin/classes" + deprecation="false" + debug="true" + optimize="false" + excludes="" + srcdir="test/java" + > <classpath refid="java.compile.classpath" /> </javac> </target> <target name="step-tmx-convert"> + <mkdir dir="${temp.dir}/resources" /> <mkdir dir="src/WebContent/js/domderrien/i18n/nls" /> <java classname="domderrien.build.TMXConverter" fork="true"> <classpath refid="tmxconverter.classpath" /> + <classpath location="${temp.dir}/resources" /> <jvmarg value="-Dfile.encoding=UTF-8" /> <arg value="-tmxFilenameBase" /> <arg value="${dd2tu.localizedLabelBaseFilename}" /> @@ -380,14 +395,14 @@ <arg value="-jsDestPath" /> <arg value="${basedir}\src\WebContent\js\domderrien\i18n\nls" /> <arg value="-javaDestPath" /> - <arg value="${temp.dir}" /> + <arg value="${temp.dir}/resources" /> <arg value="-languageFilenameBase" /> <arg value="${dd2tu.languageListFilename}" /> <arg value="-buildStamp" /> <arg value="${dd2tu.stageId}" /> </java> - <native2ascii src="${temp.dir}" dest="bin/classes" encoding="UTF8" includes="*.properties-utf8" ext=".properties" /> - <copy file="bin/classes/${dd2tu.localizedLabelBaseFilename}.properties" tofile="bin/classes/${dd2tu.localizedLabelBaseFilename}_en.properties" /> + <native2ascii src="${temp.dir}/resources" dest="${temp.dir}/resources" encoding="UTF8" includes="*.properties-utf8" ext=".properties" /> +  <mkdir dir="src/WebContent/js/domderrien/i18n/nls/en" /> <copy file="src/WebContent/js/domderrien/i18n/nls/${dd2tu.localizedLabelBaseFilename}.js" todir="src/WebContent/js/domderrien/i18n/nls/en" /> </target> @@ -551,7 +566,13 @@ <target name="step-cobertura-instrument">  + <delete file="cobertura.ser"/> <delete dir="bin/instrumented" /> + <delete verbose="true" failonerror="false"> + <fileset dir="bin/classes"> + <include name="*.properties" /> + </fileset> + </delete>  <cobertura-instrument todir="bin/instrumented"> @@ -571,12 +592,21 @@ <mkdir dir="docs/test-reports" /> <mkdir dir="docs/test-reports/junit-xml" /> <mkdir dir="docs/test-reports/junit-html" /> - <junit dir="${basedir}" failureProperty="junit.test.failed" fork="yes" printSummary="yes" haltonerror="true" haltonfailure="true" timeout="10000" maxmemory="512M"> + <junit + dir="${basedir}" + failureProperty="junit.test.failed" + fork="yes" + printSummary="yes" + haltonerror="true" + haltonfailure="true" + timeout="10000" + maxmemory="512M" + > <classpath location="bin/instrumented" /> -  <classpath location="bin/classes" /> +  <classpath refid="cobertura.classpath" /> - <classpath location="src/resources" /> + <classpath location="${temp.dir}/resources" /> <formatter type="xml" /> <formatter usefile="false" type="plain" /> build/build.xml deps/lib/cobertura/cobertura.jar @@ -9,8 +9,15 @@ public class LabelExtractor { static public final String ERROR_MESSAGE_PREFIX = "errMsg_"; + public enum ResourceFileId { + master, + second, + third, + fourth + } + /** - * Return the message associated to the given error code. + * Return the message associated to the given error code, extracted from the master resource file. * * @param errorCode Error code * @param locale Optional locale instance, use to determine in which @@ -21,7 +28,23 @@ public class LabelExtractor * association is found, the message identifier is returned. */ public static String get(int errorCode, Locale locale) { - return get(errorCode, null, locale); + return get(ResourceFileId.master, errorCode, locale); + } + + /** + * Return the message associated to the given error code, extracted from the identifier resource file. + * + * @param errorCode Error code + * @param resId Identifier of the resource file where the localized data should be extracted from + * @param locale Optional locale instance, use to determine in which + * resource files the label should be found. If the + * reference is <code>null</code>, the root resource + * bundle is used (written in English). + * @return A localized label associated to the given error code. If no + * association is found, the message identifier is returned. + */ + public static String get(ResourceFileId resId, int errorCode, Locale locale) { + return get(ResourceFileId.master, errorCode, null, locale); } /** @@ -38,8 +61,26 @@ public class LabelExtractor * association is found, the message identifier is returned. */ public static String get(int errorCode, Object[] parameters, Locale locale) { + return get(ResourceFileId.master, errorCode, parameters, locale); + } + + /** + * Return the message associated to the given error code. + * + * @param errorCode Error code + * @param resId Identifier of the resource file where the localized data should be extracted from + * @param parameters Array of parameters, each one used to replace a + * pattern made of a number between curly braces. + * @param locale Optional locale instance, use to determine in which + * resource files the label should be found. If the + * reference is <code>null</code>, the root resource + * bundle is used (written in English). + * @return A localized label associated to the given error code. If no + * association is found, the message identifier is returned. + */ + public static String get(ResourceFileId resId, int errorCode, Object[] parameters, Locale locale) { String prefix = ERROR_MESSAGE_PREFIX; - String label = get(prefix + errorCode, parameters, locale); + String label = get(resId, prefix + errorCode, parameters, locale); if (label.startsWith(prefix)) { return String.valueOf(errorCode); } @@ -58,7 +99,23 @@ public class LabelExtractor * association is found, the message identifier is returned. */ public static String get(String messageId, Locale locale) { - return get(messageId, null, locale); + return get(ResourceFileId.master, messageId, locale); + } + + /** + * Return the message associated to the given identifier. + * + * @param messageId Identifier used to retrieve the localized label. + * @param resId Identifier of the resource file where the localized data should be extracted from + * @param locale Optional locale instance, use to determine in which + * resource files the label should be found. If the + * reference is <code>null</code>, the root resource + * bundle is used (written in English). + * @return A localized label associated to the given error code. If no + * association is found, the message identifier is returned. + */ + public static String get(ResourceFileId resId, String messageId, Locale locale) { + return get(resId, messageId, null, locale); } /** @@ -75,10 +132,28 @@ public class LabelExtractor * association is found, the message identifier is returned. */ public static String get(String messageId, Object[] parameters, Locale locale) { + return get(ResourceFileId.master, messageId, parameters, locale); + } + + /** + * Return the message associated to the given identifier. + * + * @param messageId Identifier used to retrieve the localized label. + * @param resId Identifier of the resource file where the localized data should be extracted from + * @param parameters Array of parameters, each one used to replace a + * pattern made of a number between curly braces. + * @param locale Optional locale instance, use to determine in which + * resource files the label should be found. If the + * reference is <code>null</code>, the root resource + * bundle is used (written in English). + * @return A localized label associated to the given error code. If no + * association is found, the message identifier is returned. + */ + public static String get(ResourceFileId resId, String messageId, Object[] parameters, Locale locale) { String label = messageId; if (messageId != null && 0 < messageId.length()) { try { - ResourceBundle labels = getResourceBundle(locale); + ResourceBundle labels = getResourceBundle(resId, locale); label = labels.getString(messageId); } catch (MissingResourceException ex) { @@ -114,13 +189,17 @@ public class LabelExtractor /*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/ - protected static HashMap<String, ResourceBundle> resourceBundles = new HashMap<String, ResourceBundle>(); + protected static HashMap<String, ResourceBundle> masterResourceBundleSet = new HashMap<String, ResourceBundle>(); + protected static HashMap<String, ResourceBundle> secondResourceBundleSet = new HashMap<String, ResourceBundle>(); + protected static HashMap<String, ResourceBundle> thirdResourceBundleSet = new HashMap<String, ResourceBundle>(); + protected static HashMap<String, ResourceBundle> fourthResourceBundleSet = new HashMap<String, ResourceBundle>(); /** * Provides a reset mechanism for the unit test suite + * @param resId Identifier of the resource file set to manipulate */ - protected static void resetResourceBundleList() { - resourceBundles.clear(); + protected static void resetResourceBundleList(ResourceFileId resId) { + masterResourceBundleSet.clear(); } /** @@ -138,13 +217,15 @@ public class LabelExtractor /** * Protected setter made available for the unit testing + * + * @param resId Identifier of the resource file set to manipulate * @param rb Mock resource bundle * @param locale Locale associated to the mock resource bundle */ - protected static ResourceBundle setResourceBundle(ResourceBundle rb, Locale locale) { + protected static ResourceBundle setResourceBundle(ResourceFileId resId, ResourceBundle rb, Locale locale) { String rbId = getResourceBundleId(locale); - ResourceBundle previousRB = resourceBundles.get(rbId); - resourceBundles.put(rbId, rb); + ResourceBundle previousRB = masterResourceBundleSet.get(rbId); + masterResourceBundleSet.put(rbId, rb); return previousRB; } @@ -152,18 +233,27 @@ public class LabelExtractor * Retrieve the application resource bundle with the list of supported languages. * Specified protected only to ease the unit testing (IOP). * + * @param resId Identifier of the resource file where the localized data should be extracted from * @param locale locale to use when getting the resource bundle + * * @return The already resolved/set resource bundle or the one expected at runtime * @throws MissingResourceException */ - protected static ResourceBundle getResourceBundle(Locale locale) throws MissingResourceException { + protected static ResourceBundle getResourceBundle(ResourceFileId resId, Locale locale) throws MissingResourceException { String rbId = getResourceBundleId(locale); - ResourceBundle rb = (ResourceBundle) resourceBundles.get(rbId); + ResourceBundle rb = (ResourceBundle) masterResourceBundleSet.get(rbId); + if (ResourceFileId.second.equals(resId)) { rb = (ResourceBundle) secondResourceBundleSet.get(rbId); } + else if (ResourceFileId.third.equals(resId)) { rb = (ResourceBundle) thirdResourceBundleSet.get(rbId); } + else if (ResourceFileId.fourth.equals(resId)) { rb = (ResourceBundle) fourthResourceBundleSet.get(rbId); } if (rb == null) { // Get the resource bundle filename from the application settings and return the identified file - ResourceBundle applicationSettings = ResourceBundle.getBundle("domderrien-i18n", locale); //$NON-NLS-1$ - rb = ResourceBundle.getBundle(applicationSettings.getString("localizedLabelFilename"), locale); - resourceBundles.put(rbId, rb); + ResourceBundle applicationSettings = ResourceBundle.getBundle(ResourceNameDefinitions.CONFIG_PROPERTIES_FILENAME, locale); + String keyForLookup = ResourceNameDefinitions.MASTER_TMX_FILENAME_KEY; + if (ResourceFileId.second.equals(resId)) { keyForLookup = ResourceNameDefinitions.SECOND_TMX_FILENAME_KEY; } + else if (ResourceFileId.third.equals(resId)) { keyForLookup = ResourceNameDefinitions.THIRD_TMX_FILENAME_KEY; } + else if (ResourceFileId.fourth.equals(resId)) { keyForLookup = ResourceNameDefinitions.FOURTH_TMX_FILENAME_KEY; } + rb = ResourceBundle.getBundle(applicationSettings.getString(keyForLookup), locale); + masterResourceBundleSet.put(rbId, rb); } return rb; } src/Java/domderrien/i18n/LabelExtractor.java @@ -50,8 +50,8 @@ public class LocaleController return languageListRB; } // Get the resource bundle filename from the application settings and return the identified file - ResourceBundle applicationSettings = ResourceBundle.getBundle("domderrien-i18n", DEFAULT_LOCALE); //$NON-NLS-1$ - return ResourceBundle.getBundle(applicationSettings.getString("languageListFilename"), DEFAULT_LOCALE); //$NON-NLS-1$ + ResourceBundle applicationSettings = ResourceBundle.getBundle(ResourceNameDefinitions.CONFIG_PROPERTIES_FILENAME, DEFAULT_LOCALE); + return ResourceBundle.getBundle(applicationSettings.getString(ResourceNameDefinitions.LANGUAGE_LIST_FILENAME_KEY), DEFAULT_LOCALE); } src/Java/domderrien/i18n/LocaleController.java @@ -76,10 +76,16 @@ public class JsonException extends Exception implements JsonObject { put("exceptionMessage", super.getMessage()); } + /** Accessor to ease the behavior injection for the unit tests + * @throws IOException If the buffer creation fails*/ + protected OutputStream getOutputStream() throws IOException { + return new ByteArrayOutputStream(); + } + @Override public String toString() { try { - OutputStream fakeOutput = new ByteArrayOutputStream(); + OutputStream fakeOutput = getOutputStream(); toStream(fakeOutput, true); return fakeOutput.toString(); } src/Java/domderrien/jsontools/JsonException.java @@ -235,8 +235,11 @@ public class JsonParser { protected Object parseValue() throws JsonException { Object obj = null; switch(stream.peek(true)) { - case JsonDelimiters.QUOTE: - case JsonDelimiters.DOUBLE_QUOTES: + case JsonDelimiters.QUOTE: // Same as JsonDelimiters.DOUBLE_QUOTES: + obj = parseString(); + s_logger.finest("String extracted: " + obj); + break; + case JsonDelimiters.DOUBLE_QUOTES: // same as JsonDelimiters.QUOTE: obj = parseString(); s_logger.finest("String extracted: " + obj); break; @@ -248,8 +251,11 @@ public class JsonParser { obj = parseJsonArray(); s_logger.finest("<GenericJsonArray> extracted"); break; - case JsonDelimiters.TRUE_LABEL_FIRST_CHAR: - case JsonDelimiters.FALSE_LABEL_FIRST_CHAR: + case JsonDelimiters.TRUE_LABEL_FIRST_CHAR: // Same as FALSE_LABEL_FIRST_CHAR + obj = parseBoolean(); + s_logger.finest("Boolean extracted: " + obj); + break; + case JsonDelimiters.FALSE_LABEL_FIRST_CHAR: // Same as TRUE_LABEL_FIRST_CHAR obj = parseBoolean(); s_logger.finest("Boolean extracted: " + obj); break; @@ -268,6 +274,7 @@ public class JsonParser { default: // assume it's a number obj = parseNumber(); s_logger.finest("Number extracted: " + obj); + break; } return obj; } @@ -280,7 +287,7 @@ public class JsonParser { char c = stream.get(false); if(c==JsonDelimiters.BACK_SLASH) { char next = stream.get(false); - char unescaped; + char unescaped = JsonDelimiters.SPACE; switch(next) { case JsonDelimiters.QUOTE: unescaped=JsonDelimiters.QUOTE; break; case JsonDelimiters.DOUBLE_QUOTES: unescaped=JsonDelimiters.DOUBLE_QUOTES; break; @@ -293,9 +300,11 @@ public class JsonParser { case JsonDelimiters.TABULATION_ID: unescaped=JsonDelimiters.TABULATION; break; case JsonDelimiters.UNICODE_ID: //TODO // (for now, fall through to an error) + reportError("Unescaping unicode sequence not yet supported."); + // break; Not needed because reportError() throws an exception default: - unescaped = JsonDelimiters.END_OF_STRING; //makes javac happy reportError("After " + JsonDelimiters.BACK_SLASH + ", unexpected character " + next + "(" + ((int) next) + ")"); + // break; Not needed because reportError() throws an exception } str.append(unescaped); } else { src/Java/domderrien/jsontools/JsonParser.java @@ -7,7 +7,7 @@ public class MockOutputStream extends OutputStream { private StringBuilder stream = new StringBuilder(); public MockOutputStream() { - this(0); + this(-1); // Default: no limit } private int limit; @@ -38,7 +38,7 @@ public class MockOutputStream extends OutputStream { @Override public void write(int b) throws IOException { - if (index < limit) { + if (limit == -1 || index < limit) { stream.append((char) b); ++ index; } src/Java/domderrien/mocks/MockOutputStream.java @@ -1,3 +1,3 @@ ({bundle_language:"English", unit_test_sample:"N/A", -x_timeStamp:"20090923.1435"}) \ No newline at end of file +x_timeStamp:"20090926.1005"}) src/WebContent/js/domderrien/i18n/nls/domderrien-labels.js @@ -1,3 +1,3 @@ ({bundle_language:"English", unit_test_sample:"N/A", -x_timeStamp:"20090923.1435"}) \ No newline at end of file +x_timeStamp:"20090926.1005"}) src/WebContent/js/domderrien/i18n/nls/en/domderrien-labels.js @@ -1,3 +1,3 @@ ({bundle_language:"Français Canadien", unit_test_sample:"N/A", -x_timeStamp:"20090923.1435"}) \ No newline at end of file +x_timeStamp:"20090928.1216"}) \ No newline at end of file src/WebContent/js/domderrien/i18n/nls/fr-ca/domderrien-labels.js @@ -1,3 +1,3 @@ ({bundle_language:"Français", unit_test_sample:"N/A", -x_timeStamp:"20090923.1435"}) \ No newline at end of file +x_timeStamp:"20090926.1005"}) src/WebContent/js/domderrien/i18n/nls/fr/domderrien-labels.js @@ -1,3 +1,21 @@ # Settings related to the localized resource bundles -languageListFilename=@dd2tu.languageListFilename@ -localizedLabelBaseFilename=@dd2tu.localizedLabelBaseFilename@ \ No newline at end of file + +# Name of the Java Properties file containing the list of supported languages +# - This file contains one entry per supported language +# - The keys are ISO language codes (like 'en', 'fr_CA', etc.) +# - The values are the localized language names (like 'English', 'Français canadien', etc.) +# +language-list-filename=@dd2tu.languageListFilename@ + +# Name of the default resource filename base +# - Can be 'ui-catalog' used to access 'ui-catalog_fr_CA.properties' and 'fr-ca/ui-catalog.js' +# - This base is used to generically to access translated resource accross different programming languages +# - Used specifically by the LabelExtractor classes (Java, JavaScript, and Python) as the default name for the localized resources +# +master-tmx-filename=@dd2tu.localizedLabelBaseFilename@ + +2nd-tmx-filename=@dd2tu.localizedLabelBaseFilename@ + +3rd-tmx-filename=@dd2tu.localizedLabelBaseFilename@ + +4th-tmx-filename=@dd2tu.localizedLabelBaseFilename@ src/resources/domderrien-i18n.properties @@ -1,5 +1,7 @@ package domderrien.build; +import static org.junit.Assert.*; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -18,15 +20,15 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import junit.framework.TestCase; - +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.EntityResolver; import org.xml.sax.SAXException; -public class TestTMXConverter extends TestCase { +public class TestTMXConverter { class MockOutputStream extends OutputStream { StringBuffer stream = new StringBuffer(); @@ -42,6 +44,14 @@ public class TestTMXConverter extends TestCase { } } + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + @Test public void testMain() { // Cannot be unit tested because it will @@ -52,7 +62,7 @@ public class TestTMXConverter extends TestCase { @Test public void testStopProcess() { // Just verify the correct call - // Note that the entire method paths can't be coverted + // Note that the entire method paths can't be converted // because of the call to "System.exit(1)" TMXConverter converter = new TMXConverter(false); converter.stopProcess(); @@ -78,16 +88,12 @@ public class TestTMXConverter extends TestCase { converter.displayUsage(); } - @Test + @Test(expected = NullPointerException.class) public void testSetContextI() { - try - { - // Exception expected because the <code>null</code> value is not checked - TMXConverter converter = new TMXConverter(false); - converter.setContext(null); - fail("NullPointerException should have been thrown"); - } - catch (NullPointerException ex) { } // Expected exception + // Exception expected because the <code>null</code> value is not checked + TMXConverter converter = new TMXConverter(false); + converter.setContext(null); + fail("NullPointerException should have been thrown"); } @Test @@ -358,19 +364,22 @@ public class TestTMXConverter extends TestCase { assertFalse(converter.getProcessStopped()); } - @Test - public void testGetDocumentedLanguages() + @Test(expected = MissingResourceException.class) + public void testGetDocumentedLanguagesI() { TMXConverter converter = new TMXConverter(false); converter.setLanguageFilenameBase("nop"); - try - { - converter.getDocumentedLanguages(); - fail("Exception expected"); - } - catch(MissingResourceException ex) { - // Expected exception - } + converter.getDocumentedLanguages(); + fail("Exception expected"); + } + + @Test + public void testGetDocumentedLanguagesII() + { + TMXConverter converter = new TMXConverter(false); + converter.setLanguageFilenameBase("domderrien-languages"); + ResourceBundle rb = converter.getDocumentedLanguages(); + assertEquals(rb, converter.getDocumentedLanguages()); } @Test @@ -860,41 +869,27 @@ public class TestTMXConverter extends TestCase { assertTrue(converter.getProcessStopped()); } - @Test - public void testGetInputStream() + @Test(expected = FileNotFoundException.class) + public void testGetInputStream() throws FileNotFoundException { TMXConverter converter = new TMXConverter(false); - try - { - // Delete the file to force the exception throwing - (new File(System.getProperty("user.dir") + File.separator + "nop")).delete(); - converter.getInputStream(System.getProperty("user.dir") + File.separator + "nop"); - fail("FileNotFoundException expected"); - } - catch (FileNotFoundException e) - { - // Expected exception - } + // Delete the file to force the exception throwing + (new File(System.getProperty("user.dir") + File.separator + "nop")).delete(); + converter.getInputStream(System.getProperty("user.dir") + File.separator + "nop"); + fail("FileNotFoundException expected"); } @Test - public void testGetOutputStream() + public void testGetOutputStream() throws FileNotFoundException { TMXConverter converter = new TMXConverter(false); - try - { - // Delete the file after creation - converter.getOutputStream(System.getProperty("user.dir") + File.separator + "nop"); - (new File(System.getProperty("user.dir") + File.separator + "nop")).delete(); - } - catch (FileNotFoundException e) - { - fail("FileNotFoundException expected"); - } + // Delete the file after creation + converter.getOutputStream(System.getProperty("user.dir") + File.separator + "nop"); + (new File(System.getProperty("user.dir") + File.separator + "nop")).delete(); } @Test - public void testConvertI() + public void testConvertI() throws IOException { // Verify the process of the base file TMXConverter converter = new TMXConverter(false) { @@ -933,19 +928,11 @@ public class TestTMXConverter extends TestCase { }; converter.setTMXFilenameBase("nop"); - - try - { - converter.convert("nop"); - } - catch(IOException ex) - { - fail("No exception expected in this test case"); - } + converter.convert("nop"); } @Test - public void testConvertII() + public void testConvertII() throws IOException { // Verify the process of a correctly localized file TMXConverter converter = new TMXConverter(false) { @@ -999,19 +986,11 @@ public class TestTMXConverter extends TestCase { }; converter.setTMXFilenameBase("nop"); - - try - { - converter.convert("nop_fr"); - } - catch(IOException ex) - { - fail("No exception expected in this test case"); - } + converter.convert("nop_fr"); } - @Test - public void testConvertIII() + @Test(expected = IOException.class) + public void testConvertIII() throws IOException { // Verify the exception handling when a subfolder related to a new locale cannot be created TMXConverter converter = new TMXConverter(false) { @@ -1065,20 +1044,11 @@ public class TestTMXConverter extends TestCase { }; converter.setTMXFilenameBase("nop"); - - try - { - converter.convert("nop_fr"); - fail("No exception expected in this test case"); - } - catch(IOException ex) - { - // Expected exception because the nested folder cannot be created - } + converter.convert("nop_fr"); } @Test - public void testConvertIV() + public void testConvertIV() throws IOException { // Verify the process of a correctly localized file TMXConverter converter = new TMXConverter(false) { @@ -1128,19 +1098,11 @@ public class TestTMXConverter extends TestCase { }; converter.setTMXFilenameBase("nop"); - - try - { - converter.convert("nop_fr"); - } - catch(IOException ex) - { - fail("No exception expected in this test case"); - } + converter.convert("nop_fr"); } @Test - public void testConvertV() + public void testConvertV() throws IOException { // Verify the process of a incorrectly localized file TMXConverter converter = new TMXConverter(false) { @@ -1194,36 +1156,16 @@ public class TestTMXConverter extends TestCase { }; converter.setTMXFilenameBase("nop"); - - try - { - converter.convert("nopfr"); - } - catch(IOException ex) - { - fail("No exception expected in this test case"); - } + converter.convert("nopfr"); } @Test - public void testGetEntityResolver() + public void testGetEntityResolver() throws SAXException, IOException { // Normal call TMXConverter converter = new TMXConverter(false); EntityResolver resolver = converter.getEntityResolver(); - try - { - resolver.resolveEntity("nop", "nop"); - } - catch (SAXException e) - { - fail("No expected exception"); - } - catch (IOException e) - { - fail("No expected exception"); - } - + resolver.resolveEntity("nop", "nop"); assertFalse(converter.getProcessStopped()); } @@ -1560,6 +1502,7 @@ public class TestTMXConverter extends TestCase { "</tu>" + "<tu tuid='2'>" + "<prop type='x-tier'>" + TMXConverter.DOJO_TK + "</prop>" + + "<prop type='x-tier'>" + TMXConverter.DOJO_TK + "</prop>" + "<tuv>" + "<seg>two</seg>" + "</tuv>" + @@ -1608,11 +1551,12 @@ public class TestTMXConverter extends TestCase { "</tu>" + "<tu tuid='2'>" + "<prop type='x-tier'>" + TMXConverter.JAVA_RB + "</prop>" + + "<prop type='x-tier'>" + TMXConverter.JAVA_RB + "</prop>" + "<tuv>" + "<seg>two</seg>" + "</tuv>" + "</tu>" + - "</body></tmx>"; + "</body></tmx>"; InputStream tmxIS = new InputStream() { int idx = 0; @Override @@ -1889,7 +1833,7 @@ public class TestTMXConverter extends TestCase { } @Test - public void testSaveSupportedLanguagesI() + public void testSaveSupportedLanguagesI() throws IOException { // Verify the process of the output stream TMXConverter converter = new TMXConverter(false) { @@ -1913,14 +1857,7 @@ public class TestTMXConverter extends TestCase { } }; - try - { - converter.saveSupportedLanguages(); - } - catch(IOException ex) - { - fail("No exception expected in this test case"); - } + converter.saveSupportedLanguages(); } @Test @@ -1998,13 +1935,25 @@ public class TestTMXConverter extends TestCase { assertTrue(stream.getStream().indexOf("en=English") != -1); assertTrue(stream.getStream().indexOf("pl=Polski") != -1); } - /* - public void testSaveSupportedLanguages() { - fail("Not yet implemented"); - } - public void testSaveSupportedLanguagesOutputStream() { - fail("Not yet implemented"); + @Test + public void testSaveSupportedLanguagesIV() throws IOException + { + // Verify the saving of the existing language definitions + Map<String, String> foundLanguages = new HashMap<String, String>(); + foundLanguages.put("de", "Deutsch"); + + TMXConverter converter = new TMXConverter(false) { + @Override + protected ResourceBundle getDocumentedLanguages() { + throw new MissingResourceException("Done in purpose", null, null); + } + }; + converter.setLanguageMap(foundLanguages); + MockOutputStream stream = new MockOutputStream(); + + converter.saveSupportedLanguages(stream); + System.out.println("stream: " + stream.getStream()); + assertTrue(stream.getStream().indexOf("de=Deutsch") != -1); } - */ } test/Java/domderrien/build/TestTMXConverter.java deps/lib/junit/junit-4.5.jar test/Java/domderrien/i18n/TTestDateUtils.java test/Java/domderrien/i18n/TTestLabelExtractor.java test/Java/domderrien/i18n/TTestLocaleController.java test/Java/domderrien/jsontools/TTestGenericJsonArray.java test/Java/domderrien/jsontools/TTestGenericJsonObject.java test/Java/domderrien/jsontools/TTestJsonDelimiters.java test/Java/domderrien/jsontools/TTestJsonException.java test/Java/domderrien/jsontools/TTestJsonParser.java test/Java/domderrien/jsontools/TTestJsonSerializer.java c571029ffa93056b6f256198af83dd15b34999d8 Dom Derrien dominique.derrien@gmail.com http://github.com/DomDerrien/two-tiers-utils/commit/14a8ec9a7a736941e3bc03ba8ef422073a5d085a 14a8ec9a7a736941e3bc03ba8ef422073a5d085a

2009-09-28T09:18:41-07:00

Provide support for loading localized data from many TMX derived files 8500ec31db9fd2866343eb0aa545495c8af8419a Dom Derrien dominique.derrien@gmail.com