dist/domderrien-0.8.6-javadoc.jar
dist/domderrien-0.8.6-src.jar
dist/domderrien-0.8.6.ear
dist/domderrien-0.8.6.jar
dist/domderrien-0.8.6.war
@@ -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.5" />
+ <property name="dd2tu.release" description="Planned release of this build" value="0.8.6" />
<property name="dd2tu.languageListFilename" value="domderrien-languages" />
@@ -402,6 +402,13 @@
>
<classpath refid="java.compile.classpath" />
</javac>
+ <copy todir="${temp.dir}/resources" overwrite="yes">
+ <fileset dir="src/resources">
+ <include name="**/*.x*" />
+ <include name="**/*.properties" />
+ </fileset>
+ <filterchain refid="genericFilterChain" />
+ </copy>
</target>
<target name="step-tmx-convert">
@@ -462,22 +469,21 @@
<target name="step-package-jar">
<delete file="dist/domderrien-${dd2tu.release}.jar" />
- <copy todir="${temp.dir}/resources" overwrite="yes">
- <fileset dir="src/resources">
- <include name="**/*.x*" />
- <include name="**/*.properties" />
- </fileset>
- <filterchain refid="genericFilterChain" />
- </copy>
<jar destfile="dist/domderrien-${dd2tu.release}.jar">
<fileset dir="bin/classes">
<exclude name="**/Test*.class" />
<!--exclude name="**/Mock*.class" /-->
</fileset>
- <fileset dir="${temp.dir}/resources" />
+ <fileset dir="${temp.dir}/resources">
+ <include name="**/*.x*" />
+ <include name="**/*.properties" />
+ <!-- To avoid conflicts with host application own file !-->
+ <exclude name="**/domderrien-i18n.properties" />
+ </fileset>
<fileset dir="src/resources">
<exclude name="**/*.x*" />
<exclude name="**/*.properties" />
+ <!-- TMX file are included as examples -->
</fileset>
<manifest>
<attribute name="Implementation-Title" value="domderrien 2tiers utils ${dd2tu.release}" />
@@ -726,6 +732,7 @@
<mkdir dir="docs/test-reports/jscoverage-html/js" />
<delete dir="docs/test-reports/jscoverage-html/temp" failonerror="yes" />
<exec dir="docs/test-reports/jscoverage-html" executable="${temp.dir}/jscoverage.exe">
+ <!-- Check documentation on http://siliconforks.com/jscoverage/manual.html -->
<arg value="--verbose" />
<!-- do not use no-instrument switch from jscoverage because it will always copy the files -->
<!--arg value="- -exclude=dojo/util" /-->
build/build.xml
@@ -621,11 +621,11 @@ public class TMXConverter {
}
if (saveToJS) {
- // js.append("'" + id + "':\"").append(text.replaceAll("(\\{[\\d]+\\})", "%$1")).append("\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ // js.append("'" + id + "':\"").append(text.replaceAll("(\\{[\\d]+\\})", "\\$$1")).append("\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
String updatedText = text;
if (text.indexOf('{') != -1) {
// Use the replacement with regular expression only if needed
- updatedText = bracesPattern.matcher(text).replaceAll("%$1"); //$NON-NLS-1$
+ updatedText = bracesPattern.matcher(text).replaceAll("\\$$1"); //$NON-NLS-1$
}
jsOS.write((JS_LINE_START + id + JS_LINE_MIDDLE + updatedText + JS_LINE_END + NL).getBytes()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
src/Java/domderrien/build/TMXConverter.java
@@ -6,9 +6,22 @@
*/
var module = dojo.provide("domderrien.i18n.LabelExtractor");
+ dojo.require("dojo.string");
+
var _dictionnary = null;
- module.init = function(namespace, filename, locale) {
+ /**
+ * Initialize the library for the specified resource bundle
+ *
+ * @param {String} namespace JavaScript path containing a <code>nls</code>
+ * folder with the localized resource bundles
+ * @param {String} filename Base name of the resource bundles, with one
+ * JavaScript file in <code>nls\<iso></code> folder
+ * @param {String} locale ISO code of the locale, used to load the right
+ * resource bundles (dojo implements a fallback mechanism
+ * if the corresponding localized bundle cannot be loaded)
+ */
+ module.init = function(/*String*/ namespace, /*String*/ filename, /*String*/ locale) {
// Dojo uses dash-separated (e.g en-US not en_US) and uses lower case names (e.g en-us not en_US)
locale = (locale || dojo.locale).replace('_','-').toLowerCase();
@@ -17,13 +30,13 @@
// Notes:
// - Cannot use the notation <dojo>.<requireLocalization> because dojo parser
// will try to load the bundle when this file is interpreted, instead of
- // waiting for a call which meaningful <namespace> and <filename> values
+ // waiting for a call with meaningful <namespace> and <filename> values
dojo["requireLocalization"](namespace, filename, locale); // Blocking call getting the file per XHR or <iframe/>
_dictionary = dojo.i18n.getLocalization(namespace, filename, locale);
}
catch(ex) {
- alert("Deployment issue:" +
+ module._reportError("Deployment issue:" +
"\nCannot get localized bundle " + namespace + "." + filename + " for the locale " + locale +
"\nMessage: " + ex
);
@@ -32,15 +45,35 @@
return module;
};
- module.get = function(key, args) {
+ /**
+ * Return the message associated to the given identifier.
+ *
+ * @param {String} key Identifier used to retrieve the localized label.
+ * @param {String} args Array of parameters, each one used to replace a
+ * pattern made of a number between curly braces.
+ * @return A localized label associated to the given identifier. If no
+ * association is found, the message identifier is returned.
+ */
+ module.get = function(/*String*/ key, /*Array*/ args) {
if (_dictionary == null) {
return key;
}
var message = _dictionary[key] || key;
if (args != null) {
- dojo.string.substituteParams(message, args);
+ // dojo.string.substituteParams(message, args);
+ message = dojo.string.substitute(message, args);
}
return message;
};
+ // Just provided to be able to control the environment during the unit tests
+ module._resetDictionary = function(message) {
+ _dictionary = null;
+ };
+
+ // Just provided to be able to control the error reporting during the unit tests
+ module._reportError = function(message) {
+ alert(message);
+ };
+
})(); // End of the function limiting the scope of the private variables
src/WebContent/js/domderrien/i18n/LabelExtractor.js
@@ -1,3 +1,4 @@
({bundle_language:"English",
unit_test_sample:"N/A",
-x_timeStamp:"20090926.1005"})
+unit_test_sample_with_parameters:"whatever you want ${0}, and even more ${1}",
+x_timeStamp:"20091006.1732"})
src/WebContent/js/domderrien/i18n/nls/domderrien-labels.js
@@ -1,3 +1,4 @@
({bundle_language:"English",
unit_test_sample:"N/A",
-x_timeStamp:"20090926.1005"})
+unit_test_sample_with_parameters:"whatever you want ${0}, and even more ${1}",
+x_timeStamp:"20091006.1732"})
src/WebContent/js/domderrien/i18n/nls/en/domderrien-labels.js
@@ -1,3 +1,4 @@
({bundle_language:"Français Canadien",
unit_test_sample:"N/A",
-x_timeStamp:"20090928.1216"})
\ No newline at end of file
+unit_test_sample_with_parameters:"tout ce que vous voulez ${0}, et même plus ${1}",
+x_timeStamp:"20091006.1735"})
\ No newline at end of file
src/WebContent/js/domderrien/i18n/nls/fr-ca/domderrien-labels.js
@@ -1,3 +1,4 @@
({bundle_language:"Français",
unit_test_sample:"N/A",
-x_timeStamp:"20090926.1005"})
+unit_test_sample_with_parameters:"tout ce que vous voulez ${0}, et même plus ${1}",
+x_timeStamp:"20091006.1733"})
src/WebContent/js/domderrien/i18n/nls/fr/domderrien-labels.js
@@ -19,14 +19,14 @@
if (typeof character == 'number') {
return true;
}
- if (typeof character != 'string') {
- return false;
- }
- if (1 < character.length) {
- return false;
+ if (typeof character == 'string' || character instanceof String) {
+ if (1 < character.length) {
+ return false;
+ }
+ var charCode = character.charCodeAt(0);
+ return (48 <= charCode && charCode <= 57);
}
- var charCode = character.charCodeAt(0);
- return (48 <= charCode && charCode <= 57);
+ return false;
};
/** Helper returning <code>true</code> if the given character is a valid hexadecimal digit, <code>false</code> otherwise.
@@ -36,11 +36,17 @@
* @static
*/
module.isHexaDigit = function(character) {
- if (character == null || 1 < character.length) {
+ if (character == null) {
return false;
}
- var charCode = character.charCodeAt(0);
- return (48 <= charCode && charCode <= 57) || (65 <= charCode && charCode <= 70) || (97 <= charCode && charCode <= 102);
+ if (typeof character == 'string' || character instanceof String) {
+ if (1 < character.length) {
+ return false;
+ }
+ var charCode = character.charCodeAt(0);
+ return (48 <= charCode && charCode <= 57) || (65 <= charCode && charCode <= 70) || (97 <= charCode && charCode <= 102);
+ }
+ return false;
};
/** Helper returning <code>true</code> if the given character is a non-alphanumeric character, <code>false</code> otherwise.
@@ -50,15 +56,21 @@
* @static
*/
module.isNonAlpha = function(character) {
- if (character == null || 1 < character.length) {
+ if (character == null) {
return true;
}
- var charCode = character.charCodeAt(0);
- if (charCode < 48) return true; // Before '0'
- if (122 < charCode) return true; // After 'z'
- if (57 < charCode && charCode < 65) return true; // Between '9' and 'A'
- if (90 < charCode && charCode < 97) return true; // Between 'Z' and 'a'
- return false;
+ if (typeof character == 'string' || character instanceof String) {
+ if (1 < character.length) {
+ return true;
+ }
+ var charCode = character.charCodeAt(0);
+ if (charCode < 48) return true; // Before '0'
+ if (122 < charCode) return true; // After 'z'
+ if (57 < charCode && charCode < 65) return true; // Between '9' and 'A'
+ if (90 < charCode && charCode < 97) return true; // Between 'Z' and 'a'
+ return false;
+ }
+ return true;
};
/** Transcript the given number in its hexadecimal string representation
src/WebContent/js/domderrien/utils/StringUtils.js
@@ -72,5 +72,14 @@
<seg>N/A</seg>
</tuv>
</tu>
+
+ <tu tuid="unit_test_sample_with_parameters" datatype="Text">
+ <prop type="x-tier">dojotk</prop>
+ <prop type="x-tier">javarb</prop>
+ <note>test</note>
+ <tuv xml:lang="en">
+ <seg>whatever you want {0}, and even more {1}</seg>
+ </tuv>
+ </tu>
</body>
</tmx>
\ No newline at end of file
src/resources/domderrien-labels.tmx
@@ -18,5 +18,13 @@
<seg>N/A</seg>
</tuv>
</tu>
+ <tu tuid="unit_test_sample_with_parameters" datatype="Text">
+ <prop type="x-tier">dojotk</prop>
+ <prop type="x-tier">javarb</prop>
+ <note>test</note>
+ <tuv xml:lang="fr">
+ <seg>tout ce que vous voulez {0}, et même plus {1}</seg>
+ </tuv>
+ </tu>
</body>
</tmx>
\ No newline at end of file
src/resources/domderrien-labels_fr.tmx
@@ -18,5 +18,13 @@
<seg>N/A</seg>
</tuv>
</tu>
+ <tu tuid="unit_test_sample_with_parameters" datatype="Text">
+ <prop type="x-tier">dojotk</prop>
+ <prop type="x-tier">javarb</prop>
+ <note>test</note>
+ <tuv xml:lang="fr">
+ <seg>tout ce que vous voulez {0}, et même plus {1}</seg>
+ </tuv>
+ </tu>
</body>
</tmx>
\ No newline at end of file
src/resources/domderrien-labels_fr_CA.tmx
@@ -6,10 +6,15 @@
//
function exposeTestFunctionNames() {
return [
+ "testExtractorInitI",
"testExtractorGetI",
"testExtractorGetII",
"testExtractorGetIII",
- "testExtractorGetIV"
+ "testExtractorGetIV",
+ "testStupidMethodI",
+ "testGetterI",
+ "testGetterII",
+ "testGetterIII"
];
}
@@ -23,7 +28,7 @@ function jscoverageRunner() {
// JSUnit framework function
function setUp() {
- // NOP
+ domderrien.i18n.LabelExtractor._resetDictionary();
}
// JSUnit framework function
@@ -32,23 +37,69 @@ function tearDown() {
}
////////////// Required header - end////////////////////////////////
+function testExtractorInitI() {
+ var reportedError = null;
+ var initialErrorReporter = domderrien.i18n.LabelExtractor._reportError;
+ domderrien.i18n.LabelExtractor._reportError = function(message) { reportedError = message; };
+
+ domderrien.i18n.LabelExtractor.init("anywhere", "anyfile", "uu_UU"); // Unsupported locale
+
+ assertNotNull(reportedError);
+
+ domderrien.i18n.LabelExtractor._reportError = initialErrorReporter;
+}
+
function testExtractorGetI() {
var lblExtr = domderrien.i18n.LabelExtractor.init("domderrien.i18n", "domderrien-labels", "uu_UU"); // Unsupported locale
assertEquals("English", lblExtr.get("bundle_language"));
assertEquals("N/A", lblExtr.get("unit_test_sample"));
}
+
function testExtractorGetII() {
var lblExtr = domderrien.i18n.LabelExtractor.init("domderrien.i18n", "domderrien-labels", "fr"); // Supported locale
assertEquals("Français", lblExtr.get("bundle_language"));
assertEquals("N/A", lblExtr.get("unit_test_sample"));
}
+
function testExtractorGetIII() {
var lblExtr = domderrien.i18n.LabelExtractor.init("domderrien.i18n", "domderrien-labels", "fr_CA"); // Supported locale
assertEquals("Français Canadien", lblExtr.get("bundle_language"));
assertEquals("N/A", lblExtr.get("unit_test_sample"));
}
+
function testExtractorGetIV() {
var lblExtr = domderrien.i18n.LabelExtractor.init("domderrien.i18n", "domderrien-labels", "fr_BE"); // Unsupported locale
assertEquals("Français", lblExtr.get("bundle_language"));
assertEquals("N/A", lblExtr.get("unit_test_sample"));
}
+
+function testStupidMethodI() {
+ var nativeAlert = alert;
+ var reportedError = null;
+ alert = function(message) { reportedError = message; };
+
+ domderrien.i18n.LabelExtractor._reportError("what?");
+
+ assertNotNull(reportedError);
+ assertEquals("what?", reportedError);
+
+ window.alert = nativeAlert;
+}
+
+function testGetterI() {
+ // No dictionary
+ assertEquals("key-test", domderrien.i18n.LabelExtractor.get("key-test"));
+}
+
+function testGetterII() {
+ // Unknown key
+ domderrien.i18n.LabelExtractor.init("domderrien.i18n", "domderrien-labels", "en");
+ assertEquals("key-test", domderrien.i18n.LabelExtractor.get("key-test"));
+}
+
+function testGetterIII() {
+ domderrien.i18n.LabelExtractor.init("domderrien.i18n", "domderrien-labels", "en");
+ var label = domderrien.i18n.LabelExtractor.get("unit_test_sample_with_parameters", ["one", "two"]);
+ assertTrue(label.indexOf("one") != -1);
+ assertTrue(label.indexOf("two") != -1);
+}
test/WebContent/js/domderrien/i18n/TestLabelExtractor.js
@@ -8,7 +8,26 @@ function exposeTestFunctionNames() {
return [
"testIsDigitI",
"testIsDigitII",
- "testIsDigitIII"
+ "testIsDigitIII",
+ "testIsDigitIV",
+ "testIsDigitV",
+ "testIsHexaDigitI",
+ "testIsHexaDigitII",
+ "testIsHexaDigitIII",
+ "testIsHexaDigitIV",
+ "testIsNonAlphaI",
+ "testIsNonAlphaII",
+ "testIsNonAlphaIII",
+ "testIsNonAlphaIV",
+ "testConvertToHexaI",
+ "testConvertToHexaII",
+ "testConvertToHexaIII",
+ "testStartsWithI",
+ "testStartsWithII",
+ "testStartsWithIII",
+ "testStartsWithIV",
+ "testStartsWithV",
+ "testStartsWithVI"
];
}
@@ -31,6 +50,10 @@ function tearDown() {
}
////////////// Required header - end////////////////////////////////
function testIsDigitI() {
+ assertFalse(domderrien.utils.StringUtils.isDigit(null));
+}
+
+function testIsDigitII() {
var samples = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
var idx = samples.length;
while (0 < idx) {
@@ -39,7 +62,7 @@ function testIsDigitI() {
}
}
-function testIsDigitII() {
+function testIsDigitIII() {
var samples = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
var idx = samples.length;
while (0 < idx) {
@@ -48,7 +71,7 @@ function testIsDigitII() {
}
}
-function testIsDigitIII() {
+function testIsDigitIV() {
var samples = ["a", "Z", "�", "%", true, [0, 1, 2, 3], {1: 1, 2: 2}];
var idx = samples.length;
while (0 < idx) {
@@ -56,3 +79,113 @@ function testIsDigitIII() {
assertFalse(domderrien.utils.StringUtils.isDigit(samples[idx]));
}
}
+
+function testIsDigitV() {
+ assertFalse(domderrien.utils.StringUtils.isDigit("more than one character"));
+}
+
+function testIsHexaDigitI() {
+ assertFalse(domderrien.utils.StringUtils.isHexaDigit(null));
+}
+
+function testIsHexaDigitII() {
+ assertFalse(domderrien.utils.StringUtils.isHexaDigit("more that one character"));
+}
+
+function testIsHexaDigitIII() {
+ var samples = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "A", "B", "C", "D", "E", "F"];
+ var idx = samples.length;
+ while (0 < idx) {
+ -- idx;
+ assertTrue(domderrien.utils.StringUtils.isHexaDigit(samples[idx]));
+ }
+}
+
+function testIsHexaDigitIV() {
+ var samples = ["g", "Z", "�", "%", true, [0, 1, 2, 3], {1: 1, 2: 2}];
+ var idx = samples.length;
+ while (0 < idx) {
+ -- idx;
+ assertFalse(domderrien.utils.StringUtils.isHexaDigit(samples[idx]));
+ }
+}
+
+function testIsNonAlphaI() {
+ assertTrue(domderrien.utils.StringUtils.isNonAlpha(null));
+}
+
+function testIsNonAlphaII() {
+ assertTrue(domderrien.utils.StringUtils.isNonAlpha("more that one character"));
+}
+
+function testIsNonAlphaIII() {
+ var samples = [".", " ", "�", "%", true, [0, 1, 2, 3], {1: 1, 2: 2}];
+ var idx = samples.length;
+ while (0 < idx) {
+ -- idx;
+ assertTrue(domderrien.utils.StringUtils.isNonAlpha(samples[idx]));
+ }
+}
+
+function testIsNonAlphaIV() {
+ var samples = ["a", "b", "c", "h", "u", "z", "A", "B", "C", "H", "U", "Z"];
+ var idx = samples.length;
+ while (0 < idx) {
+ -- idx;
+ assertFalse(domderrien.utils.StringUtils.isNonAlpha(samples[idx]));
+ }
+}
+
+function testConvertToHexaI() {
+ assertEquals("", domderrien.utils.StringUtils.convertToHexa("any string"));
+}
+
+function testConvertToHexaII() {
+ var samples = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+ var expected = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
+ var idx = samples.length;
+ while (0 < idx) {
+ -- idx;
+ assertEquals(expected[idx], domderrien.utils.StringUtils.convertToHexa(samples[idx]));
+ }
+}
+
+function testConvertToHexaIII() {
+ var samples = [10, 11, 12, 13, 14, 15, 16, 32, 139, 65535];
+ var expected = ["a", "b", "c", "d", "e", "f", "10", "20", "8b", "ffff"];
+ var idx = samples.length;
+ while (0 < idx) {
+ -- idx;
+ assertEquals(expected[idx], domderrien.utils.StringUtils.convertToHexa(samples[idx]));
+ }
+}
+
+function testStartsWithI() {
+ // Nothing to compare
+ assertFalse(domderrien.utils.StringUtils.startsWith(null, null, false));
+}
+
+function testStartsWithII() {
+ // Nothing looked for
+ assertTrue(domderrien.utils.StringUtils.startsWith("test", null, false));
+}
+
+function testStartsWithIII() {
+ // Same start, same case
+ assertTrue(domderrien.utils.StringUtils.startsWith("test", "te", false));
+}
+
+function testStartsWithIV() {
+ // Same start, mixed case
+ assertFalse(domderrien.utils.StringUtils.startsWith("test", "tE", false));
+}
+
+function testStartsWithV() {
+ // Same start, mixed case
+ assertTrue(domderrien.utils.StringUtils.startsWith("test", "tE", true));
+}
+
+function testStartsWithVI() {
+ // Longer pattern
+ assertFalse(domderrien.utils.StringUtils.startsWith("te", "test", false));
+}
test/WebContent/js/domderrien/utils/TestStringUtils.js
6f653ffc99a13d4da4bda462e6aaaf8cc1549152
unknown
dominique.derrien@gmail.com
http://github.com/DomDerrien/two-tiers-utils/commit/67a0770dea9b9c536aee5a99cc269e5c8eeda02f
67a0770dea9b9c536aee5a99cc269e5c8eeda02f
2009-10-06T14:39:40-07:00
2009-10-06T14:39:40-07:00
add more unit tests JavaScript-side, fix the TMXConverter and the LabelExtractor for dojo.string.substitute()
5ef981e14d2eb68daf7927afb315097e42843876
unknown
dominique.derrien@gmail.com