diff options
Diffstat (limited to 'spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java')
-rw-r--r-- | spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java index e094e342..ea125edc 100644 --- a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java +++ b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 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. @@ -38,6 +38,7 @@ import static org.springframework.core.env.AbstractEnvironment.*; * @author Chris Beams * @author Juergen Hoeller */ +@SuppressWarnings("deprecation") public class StandardEnvironmentTests { private static final String ALLOWED_PROPERTY_NAME = "theanswer"; @@ -51,7 +52,8 @@ public class StandardEnvironmentTests { private static final Object NON_STRING_PROPERTY_NAME = new Object(); private static final Object NON_STRING_PROPERTY_VALUE = new Object(); - private ConfigurableEnvironment environment = new StandardEnvironment(); + private final ConfigurableEnvironment environment = new StandardEnvironment(); + @Test public void merge() { @@ -129,42 +131,42 @@ public class StandardEnvironmentTests { assertThat(activeProfiles.length, is(2)); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void setActiveProfiles_withNullProfileArray() { - environment.setActiveProfiles((String[])null); + environment.setActiveProfiles((String[]) null); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void setActiveProfiles_withNullProfile() { - environment.setActiveProfiles((String)null); + environment.setActiveProfiles((String) null); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void setActiveProfiles_withEmptyProfile() { environment.setActiveProfiles(""); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void setActiveProfiles_withNotOperator() { environment.setActiveProfiles("p1", "!p2"); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void setDefaultProfiles_withNullProfileArray() { - environment.setDefaultProfiles((String[])null); + environment.setDefaultProfiles((String[]) null); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void setDefaultProfiles_withNullProfile() { - environment.setDefaultProfiles((String)null); + environment.setDefaultProfiles((String) null); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void setDefaultProfiles_withEmptyProfile() { environment.setDefaultProfiles(""); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void setDefaultProfiles_withNotOperator() { environment.setDefaultProfiles("d1", "!d2"); } @@ -204,7 +206,7 @@ public class StandardEnvironmentTests { System.getProperties().remove(DEFAULT_PROFILES_PROPERTY_NAME); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void defaultProfileWithCircularPlaceholder() { System.setProperty(DEFAULT_PROFILES_PROPERTY_NAME, "${spring.profiles.default}"); try { @@ -263,27 +265,26 @@ public class StandardEnvironmentTests { assertThat(Arrays.asList(environment.getDefaultProfiles()), hasItems("pd2", "pd3")); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void acceptsProfiles_withEmptyArgumentList() { environment.acceptsProfiles(); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void acceptsProfiles_withNullArgumentList() { - environment.acceptsProfiles((String[])null); + environment.acceptsProfiles((String[]) null); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void acceptsProfiles_withNullArgument() { - environment.acceptsProfiles((String)null); + environment.acceptsProfiles((String) null); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void acceptsProfiles_withEmptyArgument() { environment.acceptsProfiles(""); } - @Test public void acceptsProfiles_activeProfileSetProgrammatically() { assertThat(environment.acceptsProfiles("p1", "p2"), is(false)); @@ -321,7 +322,7 @@ public class StandardEnvironmentTests { assertThat(environment.acceptsProfiles("!p1"), is(false)); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void acceptsProfiles_withInvalidNotOperator() { environment.acceptsProfiles("p1", "!"); } @@ -488,6 +489,7 @@ public class StandardEnvironmentTests { getModifiableSystemEnvironment().remove(DISALLOWED_PROPERTY_NAME); } + @SuppressWarnings("unchecked") public static Map<String, String> getModifiableSystemEnvironment() { // for os x / linux |