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

Remove outdated abstractions/delegates from core/util

Browse Source 
Issue: SPR-15159
This commit is contained in:
Juergen Hoeller
2017-01-23 13:41:55 +01:00
parent 6fe7e56598
commit ed40b1c8ee
10 changed files with 63 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-core/src/test/java/org/springframework/core/ConstantsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2017 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.
@@ -16,11 +16,11 @@
package org.springframework.core;
import org.junit.Test;
import java.util.Locale;
import java.util.Set;
import org.junit.Test;
import static org.junit.Assert.*;
/**
@@ -45,7 +45,7 @@ public class ConstantsTests {
c.asNumber("bogus");
fail("Can't get bogus field");
}
catch (ConstantException expected) {
catch (Constants.ConstantException expected) {
}
assertTrue(c.asString("S1").equals(A.S1));
@@ -53,7 +53,7 @@ public class ConstantsTests {
c.asNumber("S1");
fail("Wrong type");
}
catch (ConstantException expected) {
catch (Constants.ConstantException expected) {
}
}
@@ -170,13 +170,13 @@ public class ConstantsTests {
c.toCode("bogus", "bogus");
fail("Should have thrown ConstantException");
}
catch (ConstantException expected) {
catch (Constants.ConstantException expected) {
}
try {
c.toCode("bogus", null);
fail("Should have thrown ConstantException");
}
catch (ConstantException expected) {
catch (Constants.ConstantException expected) {
}
assertEquals(c.toCodeForProperty(new Integer(1), "myProperty"), "MY_PROPERTY_NO");
@@ -185,7 +185,7 @@ public class ConstantsTests {
c.toCodeForProperty("bogus", "bogus");
fail("Should have thrown ConstantException");
}
catch (ConstantException expected) {
catch (Constants.ConstantException expected) {
}
assertEquals(c.toCodeForSuffix(new Integer(0), ""), "DOG");
@@ -206,13 +206,13 @@ public class ConstantsTests {
c.toCodeForSuffix("bogus", "bogus");
fail("Should have thrown ConstantException");
}
catch (ConstantException expected) {
catch (Constants.ConstantException expected) {
}
try {
c.toCodeForSuffix("bogus", null);
fail("Should have thrown ConstantException");
}
catch (ConstantException expected) {
catch (Constants.ConstantException expected) {
}
}

76
spring-core/src/test/java/org/springframework/core/ControlFlowTests.java
View File

@@ -1,76 +0,0 @@
/*
* Copyright 2002-2014 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.core;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Rod Johnson
* @author Sam Brannen
*/
public class ControlFlowTests {
@Test
public void underClassAndMethod() {
new One().test();
new Two().testing();
new Three().test();
}
static class One {
void test() {
ControlFlow cflow = ControlFlowFactory.createControlFlow();
assertTrue(cflow.under(One.class));
assertTrue(cflow.under(ControlFlowTests.class));
assertFalse(cflow.under(Two.class));
assertTrue(cflow.under(One.class, "test"));
assertFalse(cflow.under(One.class, "hashCode"));
}
}
static class Two {
void testing() {
ControlFlow cflow = ControlFlowFactory.createControlFlow();
assertTrue(cflow.under(Two.class));
assertTrue(cflow.under(ControlFlowTests.class));
assertFalse(cflow.under(One.class));
assertFalse(cflow.under(Two.class, "test"));
assertTrue(cflow.under(Two.class, "testing"));
}
}
static class Three {
void test() {
testing();
}
private void testing() {
ControlFlow cflow = ControlFlowFactory.createControlFlow();
assertTrue(cflow.under(Three.class));
assertTrue(cflow.under(ControlFlowTests.class));
assertFalse(cflow.under(One.class));
assertTrue(cflow.under(Three.class, "test"));
assertTrue(cflow.under(Three.class, "testing"));
}
}
}