Fix system environment tests on all platforms

Issue: SPR-8245
This commit is contained in:
Chris Beams
2011-06-03 05:16:35 +00:00
parent a1b7af5c9c
commit 385d8e9482
2 changed files with 71 additions and 7 deletions

View File

@@ -39,7 +39,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.mock.env.MockPropertySource;
@@ -175,7 +174,6 @@ public class EnvironmentTests {
assertThat(environment.acceptsProfiles("p1"), is(true));
}
@Ignore // fails on windows
@Test
public void getSystemProperties_withAndWithoutSecurityManager() {
System.setProperty(ALLOWED_PROPERTY_NAME, ALLOWED_PROPERTY_VALUE);
@@ -293,6 +291,7 @@ public class EnvironmentTests {
@SuppressWarnings("unchecked")
private static Map<String, String> getModifiableSystemEnvironment() {
// for os x / linux
Class<?>[] classes = Collections.class.getDeclaredClasses();
Map<String, String> env = System.getenv();
for (Class<?> cl : classes) {
@@ -301,12 +300,45 @@ public class EnvironmentTests {
Field field = cl.getDeclaredField("m");
field.setAccessible(true);
Object obj = field.get(env);
return (Map<String, String>) obj;
if (obj != null && obj.getClass().getName().equals("java.lang.ProcessEnvironment$StringEnvironment")) {
return (Map<String, String>) obj;
}
} catch (Exception ex) {
throw new RuntimeException(ex);
}
}
}
// for windows
Class<?> processEnvironmentClass;
try {
processEnvironmentClass = Class.forName("java.lang.ProcessEnvironment");
} catch (Exception e) {
throw new RuntimeException(e);
}
try {
Field theCaseInsensitiveEnvironmentField = processEnvironmentClass.getDeclaredField("theCaseInsensitiveEnvironment");
theCaseInsensitiveEnvironmentField.setAccessible(true);
Object obj = theCaseInsensitiveEnvironmentField.get(null);
return (Map<String, String>) obj;
} catch (NoSuchFieldException e) {
// do nothing
} catch (Exception e) {
throw new RuntimeException(e);
}
try {
Field theEnvironmentField = processEnvironmentClass.getDeclaredField("theEnvironment");
theEnvironmentField.setAccessible(true);
Object obj = theEnvironmentField.get(null);
return (Map<String, String>) obj;
} catch (NoSuchFieldException e) {
// do nothing
} catch (Exception e) {
throw new RuntimeException(e);
}
throw new IllegalStateException();
}
}