Author: dkulp
Date: Fri Jul 8 20:06:55 2011
New Revision: 1144473
URL: http://svn.apache.org/viewvc?rev=1144473&view=rev
Log:
Merged revisions 1132961 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1132961 | cschneider | 2011-06-07 07:51:21 -0400 (Tue, 07 Jun 2011) | 1 line
CAMEL-4066 Setting default locale to US to avoid test failure in non English
locales
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:06:55 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1096736,1097761,1097909,1097912,1097978,1098032,1098628,1098630,1099228,1099417,1100975,1102162,1102177,1102181,1104076,1124497,1127744,1127988,1128315,1128970,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1096736,1097761,1097909,1097912,1097978,1098032,1098628,1098630,1099228,1099417,1100975,1102162,1102177,1102181,1104076,1124497,1127744,1127988,1128315,1128970,1131411,1132961,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.7.x/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java?rev=1144473&r1=1144472&r2=1144473&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
Fri Jul 8 20:06:55 2011
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.bean.validator;
+import java.util.Locale;
import java.util.Set;
import javax.validation.ConstraintViolation;
@@ -24,12 +25,26 @@ import org.apache.camel.CamelExecutionEx
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
/**
* @version
*/
public class BeanValidatorRouteTest extends CamelTestSupport {
+ private Locale origLocale;
+
+ @Before
+ public void setLanguage() {
+ origLocale = Locale.getDefault();
+ Locale.setDefault(Locale.US);
+ }
+
+ @After
+ public void restoreLanguage() {
+ Locale.setDefault(origLocale);
+ }
@Test
public void validateShouldSuccessWithImpliciteDefaultGroup() throws
Exception {
