root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revise system property replacement tests 

See gh-22959
This commit is contained in:
Juergen Hoeller 2019-05-20 22:19:03 +02:00
parent 515d627aec
commit 55e601c322
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
spring-core/src/test/java/org/springframework/core/io/ResourceEditorTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2010 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -34,7 +34,7 @@ import static org.junit.Assert.*;
public class ResourceEditorTests { public class ResourceEditorTests {
@Test @Test
public void sunnyDay() throws Exception { public void sunnyDay() {
PropertyEditor editor = new ResourceEditor(); PropertyEditor editor = new ResourceEditor();
editor.setAsText("classpath:org/springframework/core/io/ResourceEditorTests.class"); editor.setAsText("classpath:org/springframework/core/io/ResourceEditorTests.class");
Resource resource = (Resource) editor.getValue(); Resource resource = (Resource) editor.getValue();
@ -43,19 +43,19 @@ public class ResourceEditorTests {
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void ctorWithNullCtorArgs() throws Exception { public void ctorWithNullCtorArgs() {
new ResourceEditor(null, null); new ResourceEditor(null, null);
} }
@Test @Test
public void setAndGetAsTextWithNull() throws Exception { public void setAndGetAsTextWithNull() {
PropertyEditor editor = new ResourceEditor(); PropertyEditor editor = new ResourceEditor();
editor.setAsText(null); editor.setAsText(null);
assertEquals("", editor.getAsText()); assertEquals("", editor.getAsText());
} }
@Test @Test
public void setAndGetAsTextWithWhitespaceResource() throws Exception { public void setAndGetAsTextWithWhitespaceResource() {
PropertyEditor editor = new ResourceEditor(); PropertyEditor editor = new ResourceEditor();
editor.setAsText(" "); editor.setAsText(" ");
assertEquals("", editor.getAsText()); assertEquals("", editor.getAsText());
@ -66,18 +66,18 @@ public class ResourceEditorTests {
PropertyEditor editor = new ResourceEditor(); PropertyEditor editor = new ResourceEditor();
System.setProperty("test.prop", "foo"); System.setProperty("test.prop", "foo");
try { try {
editor.setAsText("${test.prop}-${bar}"); editor.setAsText("${test.prop}");
Resource resolved = (Resource) editor.getValue(); Resource resolved = (Resource) editor.getValue();
assertEquals("foo-${bar}", resolved.getFilename()); assertEquals("foo", resolved.getFilename());
} }
finally { finally {
System.getProperties().remove("test.prop"); System.getProperties().remove("test.prop");
} }
} }
@Test(expected = IllegalArgumentException.class) @Test
public void testStrictSystemPropertyReplacement() { public void testSystemPropertyReplacementWithUnresolvablePlaceholder() {
PropertyEditor editor = new ResourceEditor(new DefaultResourceLoader(), new StandardEnvironment(), false); PropertyEditor editor = new ResourceEditor();
System.setProperty("test.prop", "foo"); System.setProperty("test.prop", "foo");
try { try {
editor.setAsText("${test.prop}-${bar}"); editor.setAsText("${test.prop}-${bar}");
@ -89,4 +89,16 @@ public class ResourceEditorTests {
} }
} }
@Test(expected = IllegalArgumentException.class)
public void testStrictSystemPropertyReplacementWithUnresolvablePlaceholder() {
PropertyEditor editor = new ResourceEditor(new DefaultResourceLoader(), new StandardEnvironment(), false);
System.setProperty("test.prop", "foo");
try {
editor.setAsText("${test.prop}-${bar}");
}
finally {
System.getProperties().remove("test.prop");
}
}
} }

14
spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -32,7 +32,7 @@ import static org.junit.Assert.*;
public class ResourceArrayPropertyEditorTests { public class ResourceArrayPropertyEditorTests {
@Test @Test
public void testVanillaResource() throws Exception { public void testVanillaResource() {
PropertyEditor editor = new ResourceArrayPropertyEditor(); PropertyEditor editor = new ResourceArrayPropertyEditor();
editor.setAsText("classpath:org/springframework/core/io/support/ResourceArrayPropertyEditor.class"); editor.setAsText("classpath:org/springframework/core/io/support/ResourceArrayPropertyEditor.class");
Resource[] resources = (Resource[]) editor.getValue(); Resource[] resources = (Resource[]) editor.getValue();
@ -41,7 +41,7 @@ public class ResourceArrayPropertyEditorTests {
} }
@Test @Test
public void testPatternResource() throws Exception { public void testPatternResource() {
// N.B. this will sometimes fail if you use classpath: instead of classpath*:. // N.B. this will sometimes fail if you use classpath: instead of classpath*:.
// The result depends on the classpath - if test-classes are segregated from classes // The result depends on the classpath - if test-classes are segregated from classes
// and they come first on the classpath (like in Maven) then it breaks, if classes // and they come first on the classpath (like in Maven) then it breaks, if classes
@ -58,9 +58,9 @@ public class ResourceArrayPropertyEditorTests {
PropertyEditor editor = new ResourceArrayPropertyEditor(); PropertyEditor editor = new ResourceArrayPropertyEditor();
System.setProperty("test.prop", "foo"); System.setProperty("test.prop", "foo");
try { try {
editor.setAsText("${test.prop}-${bar}"); editor.setAsText("${test.prop}");
Resource[] resources = (Resource[]) editor.getValue(); Resource[] resources = (Resource[]) editor.getValue();
assertEquals("foo-${bar}", resources[0].getFilename()); assertEquals("foo", resources[0].getFilename());
} }
finally { finally {
System.getProperties().remove("test.prop"); System.getProperties().remove("test.prop");
@ -68,15 +68,13 @@ public class ResourceArrayPropertyEditorTests {
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testStrictSystemPropertyReplacement() { public void testStrictSystemPropertyReplacementWithUnresolvablePlaceholder() {
PropertyEditor editor = new ResourceArrayPropertyEditor( PropertyEditor editor = new ResourceArrayPropertyEditor(
new PathMatchingResourcePatternResolver(), new StandardEnvironment(), new PathMatchingResourcePatternResolver(), new StandardEnvironment(),
false); false);
System.setProperty("test.prop", "foo"); System.setProperty("test.prop", "foo");
try { try {
editor.setAsText("${test.prop}-${bar}"); editor.setAsText("${test.prop}-${bar}");
Resource[] resources = (Resource[]) editor.getValue();
assertEquals("foo-${bar}", resources[0].getFilename());
} }
finally { finally {
System.getProperties().remove("test.prop"); System.getProperties().remove("test.prop");