You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2015/05/31 14:41:48 UTC
svn commit: r1682727 - in /jspwiki/trunk: ChangeLog
jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java
Author: metskem
Date: Sun May 31 12:41:48 2015
New Revision: 1682727
URL: http://svn.apache.org/r1682727
Log:
2015-05-31 Harry Metske (metskem@apache.org)
* 2.10.2-svn-16
* Fixed JSPWIKI-882 test-failure when using existing localized locale in OutComeTest (thanks to Marco Roeland)
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1682727&r1=1682726&r2=1682727&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sun May 31 12:41:48 2015
@@ -1,3 +1,9 @@
+2015-05-31 Harry Metske (metskem@apache.org)
+
+ * 2.10.2-svn-16
+
+ * Fixed JSPWIKI-882 test-failure when using existing localized locale in OutComeTest (thanks to Marco Roeland)
+
2015-04-18 Harry Metske (metskem@apache.org)
* 2.10.2-svn-15
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1682727&r1=1682726&r2=1682727&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sun May 31 12:41:48 2015
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "15";
+ public static final String BUILD = "16";
/**
* This is the generic version string you should use when printing out the version. It is of
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java?rev=1682727&r1=1682726&r2=1682727&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java Sun May 31 12:41:48 2015
@@ -58,20 +58,20 @@ public class OutcomeTest extends TestCas
WikiEngine engine = new TestEngine(props);
InternationalizationManager i18n = engine.getInternationalizationManager();
String core = "templates.default";
- Locale english = Locale.ENGLISH;
+ Locale rootLocale = Locale.ROOT;
Outcome o;
o = Outcome.DECISION_APPROVE;
- assertEquals("Approve", i18n.get(core, english, o.getMessageKey()));
+ assertEquals("Approve", i18n.get(core, rootLocale, o.getMessageKey()));
o = Outcome.DECISION_DENY;
- assertEquals("Deny", i18n.get(core, english, o.getMessageKey()));
+ assertEquals("Deny", i18n.get(core, rootLocale, o.getMessageKey()));
o = Outcome.DECISION_HOLD;
- assertEquals("Hold", i18n.get(core, english, o.getMessageKey()));
+ assertEquals("Hold", i18n.get(core, rootLocale, o.getMessageKey()));
o = Outcome.DECISION_REASSIGN;
- assertEquals("Reassign", i18n.get(core, english, o.getMessageKey()));
+ assertEquals("Reassign", i18n.get(core, rootLocale, o.getMessageKey()));
}
public void testIsCompletion()