diff --git a/build.gradle b/build.gradle index 19d2a211603..b04396bdc2a 100644 --- a/build.gradle +++ b/build.gradle @@ -111,7 +111,7 @@ configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm", } } -configure(subprojects - project(":spring-build-junit")) { subproject -> +configure(subprojects) { subproject -> apply plugin: "merge" apply from: "${gradleScriptDir}/publish-maven.gradle" @@ -160,15 +160,11 @@ configure(subprojects - project(":spring-build-junit")) { subproject -> } } -configure(allprojects - project(":spring-build-junit")) { +configure(allprojects) { dependencies { - testCompile(project(":spring-build-junit")) - } - - eclipse.classpath.file.whenMerged { classpath -> - classpath.entries.find{it.path == "/spring-build-junit"}.exported = false + testCompile("junit:junit:${junitVersion}") + testCompile("org.hamcrest:hamcrest-all:1.3") } - test.systemProperties.put("testGroups", properties.get("testGroups")) } @@ -184,23 +180,6 @@ project("spring-build-src") { configurations.archives.artifacts.clear() } -project("spring-build-junit") { - description = "Build-time JUnit dependencies and utilities" - - // NOTE: This is an internal project and is not published. - - dependencies { - compile("commons-logging:commons-logging:1.1.1") - compile("junit:junit:${junitVersion}") - compile("org.hamcrest:hamcrest-all:1.3") - compile("org.easymock:easymock:${easymockVersion}") - } - - // Don't actually generate any artifacts - configurations.archives.artifacts.clear() -} - - project("spring-core") { description = "Spring Core" @@ -549,7 +528,6 @@ project("spring-orm") { testCompile("org.eclipse.persistence:org.eclipse.persistence.asm:1.0.1") testCompile("org.eclipse.persistence:org.eclipse.persistence.antlr:1.0.1") testCompile("hsqldb:hsqldb:${hsqldbVersion}") - testCompile(project(":spring-web").sourceSets.test.output) compile(project(":spring-core")) compile(project(":spring-beans")) optional(project(":spring-aop")) @@ -799,6 +777,7 @@ configure(rootProject) { dependencies { // for integration tests testCompile(project(":spring-core")) + testCompile(project(":spring-core").sourceSets.test.output) testCompile(project(":spring-beans")) testCompile(project(":spring-aop")) testCompile(project(":spring-expression")) diff --git a/settings.gradle b/settings.gradle index 7d37e04fbb6..8c99e5a179b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,7 +22,6 @@ include "spring-web" include "spring-webmvc" include "spring-webmvc-portlet" include "spring-webmvc-tiles3" -include "spring-build-junit" // Exposes gradle buildSrc for IDE support include "buildSrc" diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java index c5ac12d129e..9732cfa4d98 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java @@ -19,8 +19,8 @@ package org.springframework.aop.target.dynamic; import static org.junit.Assert.*; import org.junit.Test; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; /** * @author Rob Harrop diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index 9ea8c569e7e..29e282c0a27 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -49,8 +49,8 @@ import org.springframework.beans.propertyeditors.CustomNumberEditor; import org.springframework.beans.propertyeditors.StringArrayPropertyEditor; import org.springframework.beans.propertyeditors.StringTrimmerEditor; import org.springframework.beans.support.DerivedFromProtectedBaseBean; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.core.convert.ConversionFailedException; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index d3710f0c188..0e474fadaed 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -72,8 +72,8 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.ConstructorDependenciesBean; import org.springframework.beans.factory.xml.DependenciesBean; import org.springframework.beans.propertyeditors.CustomNumberEditor; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.core.MethodParameter; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java index 4d2a5690cb3..dfe6d48aa70 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java @@ -56,8 +56,8 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.StaticListableBeanFactory; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.io.FileSystemResourceLoader; diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java index 2dfa414c65c..e26835163f3 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java @@ -51,8 +51,8 @@ import org.springframework.beans.factory.config.MethodInvokingFactoryBean; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.GenericApplicationContext; diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java index 71542305057..d35b5396fd3 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java @@ -31,8 +31,8 @@ import org.springframework.beans.factory.annotation.Required; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.context.support.GenericApplicationContext; import org.springframework.util.StopWatch; diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java index b49857d8cbb..3384916c081 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java @@ -38,8 +38,8 @@ import org.springframework.beans.factory.support.AutowireCandidateQualifier; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.context.annotation.AnnotationConfigUtils; import org.springframework.context.support.GenericApplicationContext; import org.springframework.util.SerializationTestUtils; diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java index d4be14d47b6..60f96bdb175 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java @@ -22,8 +22,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Before; import org.junit.Test; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index fadd6933a78..01dd03c7703 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -35,8 +35,6 @@ import java.util.UUID; import org.junit.Test; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; import org.springframework.core.convert.ConversionFailedException; import org.springframework.core.convert.ConverterNotFoundException; import org.springframework.core.convert.TypeDescriptor; @@ -46,6 +44,8 @@ import org.springframework.core.convert.converter.ConverterFactory; import org.springframework.core.convert.converter.GenericConverter; import org.springframework.core.io.DescriptiveResource; import org.springframework.core.io.Resource; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.util.StopWatch; import org.springframework.util.StringUtils; diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java b/spring-core/src/test/java/org/springframework/tests/Assume.java similarity index 91% rename from spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java rename to spring-core/src/test/java/org/springframework/tests/Assume.java index 7b916d0b59c..801cd93ad79 100644 --- a/spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java +++ b/spring-core/src/test/java/org/springframework/tests/Assume.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.build.junit; +package org.springframework.tests; import static org.junit.Assume.assumeFalse; @@ -24,8 +24,9 @@ import org.apache.commons.logging.Log; import org.junit.internal.AssumptionViolatedException; /** - * Provides utility methods that allow JUnit tests to {@link Assume} certain conditions - * hold {@code true}. If the assumption fails, it means the test should be skipped. + * Provides utility methods that allow JUnit tests to {@link org.junit.Assume} certain + * conditions hold {@code true}. If the assumption fails, it means the test should be + * skipped. * *

For example, if a set of tests require at least JDK 1.7 it can use * {@code Assume#atLeast(JdkVersion.JAVA_17)} as shown below: diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java b/spring-core/src/test/java/org/springframework/tests/JavaVersion.java similarity index 95% rename from spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java rename to spring-core/src/test/java/org/springframework/tests/JavaVersion.java index db9fee370f0..b36319b2c4e 100644 --- a/spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java +++ b/spring-core/src/test/java/org/springframework/tests/JavaVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.build.junit; +package org.springframework.tests; /** * Enumeration of known JDK versions. diff --git a/spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java b/spring-core/src/test/java/org/springframework/tests/JavaVersionTests.java similarity index 90% rename from spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java rename to spring-core/src/test/java/org/springframework/tests/JavaVersionTests.java index 1600d4ca195..82b51e0014a 100644 --- a/spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java +++ b/spring-core/src/test/java/org/springframework/tests/JavaVersionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.build.junit; +package org.springframework.tests; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.*; @@ -26,7 +26,7 @@ import org.junit.Test; * * @author Phillip Webb */ -public class JavaVersionTest { +public class JavaVersionTests { @Test public void runningVersion() { diff --git a/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java b/spring-core/src/test/java/org/springframework/tests/Matchers.java similarity index 97% rename from spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java rename to spring-core/src/test/java/org/springframework/tests/Matchers.java index 7bb3744d60a..826bd1c7324 100644 --- a/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java +++ b/spring-core/src/test/java/org/springframework/tests/Matchers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.build.test.hamcrest; +package org.springframework.tests; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; diff --git a/spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java b/spring-core/src/test/java/org/springframework/tests/MockitoUtils.java similarity index 97% rename from spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java rename to spring-core/src/test/java/org/springframework/tests/MockitoUtils.java index 63d45249872..0fb20f30103 100644 --- a/spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java +++ b/spring-core/src/test/java/org/springframework/tests/MockitoUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.build.test.mockito; +package org.springframework.tests; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java b/spring-core/src/test/java/org/springframework/tests/TestGroup.java similarity index 94% rename from spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java rename to spring-core/src/test/java/org/springframework/tests/TestGroup.java index 3be8b83514b..638c5b861b5 100644 --- a/spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java +++ b/spring-core/src/test/java/org/springframework/tests/TestGroup.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.build.junit; +package org.springframework.tests; import java.util.Collections; import java.util.EnumSet; diff --git a/spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java b/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java similarity index 94% rename from spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java rename to spring-core/src/test/java/org/springframework/tests/TestGroupTests.java index 2b30f299310..2b4860fd728 100644 --- a/spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java +++ b/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.build.junit; +package org.springframework.tests; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; @@ -32,7 +32,7 @@ import org.junit.rules.ExpectedException; * * @author Phillip Webb */ -public class TestGroupTest { +public class TestGroupTests { @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/spring-core/src/test/java/org/springframework/tests/package-info.java b/spring-core/src/test/java/org/springframework/tests/package-info.java new file mode 100644 index 00000000000..545c413c984 --- /dev/null +++ b/spring-core/src/test/java/org/springframework/tests/package-info.java @@ -0,0 +1,22 @@ +/* + * Copyright 2002-2013 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. + */ + +/** + * Shared utilities that are used internally throughout the test suite but are not + * published. This package should not be confused with {@code org.springframework.test} + * which contains published code from the 'spring-test' module. + */ +package org.springframework.tests; diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java index fab4424ebe6..0c3b9f0e49d 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java +++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java @@ -31,10 +31,10 @@ import org.junit.Before; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.build.test.mockito.MockitoUtils; -import org.springframework.build.test.mockito.MockitoUtils.InvocationArgumentsAdapter; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; +import org.springframework.tests.MockitoUtils; +import org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java index 7262d63b6d1..740f33d4125 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java @@ -20,8 +20,8 @@ import static org.junit.Assert.fail; import org.junit.Test; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index e338ef8805a..3c4e1bc73ae 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.springframework.build.test.hamcrest.Matchers.exceptionCause; +import static org.springframework.tests.Matchers.exceptionCause; import java.sql.CallableStatement; import java.sql.Connection; diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java index f858444dbbb..9779c29d65d 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java @@ -22,7 +22,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.springframework.build.test.hamcrest.Matchers.exceptionCause; +import static org.springframework.tests.Matchers.exceptionCause; import java.sql.CallableStatement; import java.sql.Connection; diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java index cba2d487f23..ada52ec33c2 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java @@ -19,9 +19,9 @@ package org.springframework.web.bind; import static org.junit.Assert.*; import org.junit.Test; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; import org.springframework.mock.web.test.MockHttpServletRequest; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.util.StopWatch; /** diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java index c903e01a663..8092d835b32 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java @@ -19,8 +19,8 @@ package org.springframework.web.portlet.bind; import junit.framework.TestCase; import org.junit.Test; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.mock.web.portlet.MockPortletRequest; import org.springframework.util.StopWatch; diff --git a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java index b2fbd959d26..fae32ac8f52 100644 --- a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java +++ b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java @@ -23,14 +23,14 @@ import org.junit.Test; import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.BeanCreationException; -import org.springframework.build.junit.Assume; -import org.springframework.build.junit.TestGroup; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor; import org.springframework.dao.support.PersistenceExceptionTranslator; import org.springframework.stereotype.Repository; +import org.springframework.tests.Assume; +import org.springframework.tests.TestGroup; import org.springframework.transaction.CallCountingTransactionManager; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement;