Skip to content

[GH-3202] Fix locale-dependent tests #3203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2020
Merged

[GH-3202] Fix locale-dependent tests #3203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion ...e/src/test/java/org/springframework/integration/config/xml/ChainElementsFailureTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -20,8 +20,11 @@
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;
Expand All @@ -42,6 +45,19 @@
*/
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 {

Expand Down
18 changes: 17 additions & 1 deletion ...on-file/src/test/java/org/springframework/integration/file/config/ChainElementsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -20,8 +20,11 @@
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;
Expand All @@ -42,6 +45,19 @@
*/
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 {
Expand Down
18 changes: 17 additions & 1 deletion ...ava/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -20,10 +20,13 @@
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;
Expand Down Expand Up @@ -58,6 +61,19 @@
@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 {
Expand Down