Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-3202: Fix tests failing with non-English locales

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/3202

Set the locale to en-US for tests that assert error messages
This commit is contained in:
Tim Feuerbach
2020-02-29 17:19:31 +01:00
committed by Artem Bilan
parent 8bc221b271
commit c6cf261e25
3 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChainElementsFailureTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,8 +20,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.util.Locale;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.config.PropertiesFactoryBean;
@@ -42,6 +45,19 @@ import org.springframework.core.io.InputStreamResource;
*/
public class ChainElementsFailureTests {
private Locale localeBeforeTest;
@Before
public void setUp() {
localeBeforeTest = Locale.getDefault();
Locale.setDefault(new Locale("en", "US"));
}
@After
public void tearDown() {
Locale.setDefault(localeBeforeTest);
}
@Test
public void chainServiceActivator() throws Exception {

18
spring-integration-file/src/test/java/org/springframework/integration/file/config/ChainElementsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,8 +20,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.util.Locale;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.config.PropertiesFactoryBean;
@@ -42,6 +45,19 @@ import org.springframework.core.io.InputStreamResource;
*/
public class ChainElementsTests {
private Locale localeBeforeTest;
@Before
public void setUp() {
localeBeforeTest = Locale.getDefault();
Locale.setDefault(new Locale("en", "US"));
}
@After
public void tearDown() {
Locale.setDefault(localeBeforeTest);
}
@Test
public void chainOutboundGateway() throws Exception {
try {

18
spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,10 +20,13 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import java.util.List;
import java.util.Locale;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.w3c.dom.Document;
@@ -58,6 +61,19 @@ import org.springframework.util.MultiValueMap;
@DirtiesContext
public class XmlPayloadValidatingFilterParserTests {
private Locale localeBeforeTest;
@Before
public void setUp() {
localeBeforeTest = Locale.getDefault();
Locale.setDefault(new Locale("en", "US"));
}
@After
public void tearDown() {
Locale.setDefault(localeBeforeTest);
}
public static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
static {