aboutsummaryrefslogtreecommitdiff
path: root/velocity-engine-core/src/test
diff options
context:
space:
mode:
authorMichael Osipov <michaelo@apache.org>2019-02-16 22:41:31 +0000
committerMichael Osipov <michaelo@apache.org>2019-02-16 22:41:31 +0000
commit9c889cb2b54c002d7693097d7bc21684441e86bd (patch)
tree3d670f81845deca6681ffe8bb9dadad613d70f90 /velocity-engine-core/src/test
parent0ee78a14c767b84db6c8c6cb58385aef8d416d9c (diff)
downloadapache-velocity-engine-9c889cb2b54c002d7693097d7bc21684441e86bd.tar.gz
[VELOCITY-908] Initialization failure on Windows with Turkish locale
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1853730 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'velocity-engine-core/src/test')
-rw-r--r--velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java4
-rw-r--r--velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java3
2 files changed, 5 insertions, 2 deletions
diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java
index 573e76e3..eeb1a173 100644
--- a/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java
+++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java
@@ -25,6 +25,8 @@ import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
import org.apache.velocity.context.Context;
import org.apache.velocity.util.introspection.Info;
+import java.util.Locale;
+
/**
* This is a test set of event handlers, used to test event handler sequences.
*
@@ -42,7 +44,7 @@ public class Handler2
if (value == null)
return null;
else
- return value.toString().toUpperCase();
+ return value.toString().toUpperCase(Locale.ROOT);
}
/**
diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java
index 45d2a245..03c50224 100644
--- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java
+++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java
@@ -23,6 +23,7 @@ import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
/**
@@ -73,7 +74,7 @@ public class TestContext implements Context
}
else
{
- return key.toUpperCase();
+ return key.toUpperCase(Locale.ROOT);
}
}
}