From 11209e514bf823eb4038ba1fde3bb3f801fb0b11 Mon Sep 17 00:00:00 2001 From: Christian Kaltepoth Date: Thu, 28 May 2015 17:38:33 +0200 Subject: [PATCH] junit.framework.* -> org.junit.* --- .../org/ocpsoft/urlbuilder/AddressBuilderEncodingTest.java | 2 +- .../rewrite/annotation/visit/AnnotationConfigurationTest.java | 2 +- .../ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java | 2 +- .../org/ocpsoft/rewrite/servlet/event/SubflowTaskTest.java | 2 +- .../test/java/org/ocpsoft/rewrite/util/CompositeMapTest.java | 2 +- api/src/test/java/org/ocpsoft/rewrite/util/MapsTest.java | 2 +- .../ocpsoft/rewrite/annotation/action/RequestActionTest.java | 2 +- .../rewrite/annotation/convert/CustomConverterTest.java | 2 +- .../ocpsoft/rewrite/annotation/forward/SimpleForwardTest.java | 2 +- .../annotation/issue135/NoClassLevelAnnotationTest.java | 2 +- .../org/ocpsoft/rewrite/annotation/join/JoinParameterTest.java | 2 +- .../org/ocpsoft/rewrite/annotation/join/SimpleJoinTest.java | 2 +- .../rewrite/annotation/validate/CustomValidatorTest.java | 2 +- .../java/org/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java | 2 +- .../rewrite/servlet/config/EncodeQueryConfigurationTest.java | 2 +- .../java/org/ocpsoft/rewrite/servlet/config/JaasRolesTest.java | 2 +- .../rewrite/servlet/config/JoinBindingConfigurationTest.java | 2 +- .../rewrite/servlet/config/JoinOtherwiseConfigurationTest.java | 2 +- .../rewrite/servlet/config/JoinOutboundConfigurationTest.java | 2 +- .../servlet/config/JoinRequestBindingConfigurationTest.java | 2 +- .../org/ocpsoft/rewrite/servlet/config/RequestBindingTest.java | 2 +- .../servlet/config/ResourceReadParamsInConditionTest.java | 2 +- .../java/org/ocpsoft/rewrite/servlet/config/ResourceTest.java | 2 +- .../org/ocpsoft/rewrite/servlet/config/SchemeChangeTest.java | 2 +- .../servlet/config/ServletMappingConfigurationTest.java | 2 +- .../rewrite/config/tuckey/TuckeyConfigurationProviderTest.java | 2 +- .../ocpsoft/rewrite/convert/DefaultConverterProviderTest.java | 2 +- .../ocpsoft/rewrite/convert/DefaultValidatorProviderTest.java | 2 +- .../ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java | 3 +-- .../ocpsoft/rewrite/cdi/resolver/CdiBeanNameResolverTest.java | 2 +- .../java/org/ocpsoft/rewrite/faces/DeferredOperationTest.java | 2 +- .../java/org/ocpsoft/rewrite/faces/PhaseOperationTest.java | 2 +- .../rewrite/faces/resolver/FacesBeanNameResolverTest.java | 2 +- .../rewrite/gwt/config/HistoryRewriteConfigurationTest.java | 2 +- .../java/org/ocpsoft/rewrite/spring/SpringFeaturesTest.java | 2 +- .../rewrite/spring/resolver/SpringBeanNameResolverTest.java | 2 +- .../rewrite/transform/markup/HtmlDocumentBuilderTest.java | 2 +- 37 files changed, 37 insertions(+), 38 deletions(-) diff --git a/addressbuilder/src/test/java/org/ocpsoft/urlbuilder/AddressBuilderEncodingTest.java b/addressbuilder/src/test/java/org/ocpsoft/urlbuilder/AddressBuilderEncodingTest.java index fdfdb81b6..7d9a34dd8 100644 --- a/addressbuilder/src/test/java/org/ocpsoft/urlbuilder/AddressBuilderEncodingTest.java +++ b/addressbuilder/src/test/java/org/ocpsoft/urlbuilder/AddressBuilderEncodingTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.urlbuilder; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/annotations-impl/src/test/java/org/ocpsoft/rewrite/annotation/visit/AnnotationConfigurationTest.java b/annotations-impl/src/test/java/org/ocpsoft/rewrite/annotation/visit/AnnotationConfigurationTest.java index 48698225f..bb030d18b 100644 --- a/annotations-impl/src/test/java/org/ocpsoft/rewrite/annotation/visit/AnnotationConfigurationTest.java +++ b/annotations-impl/src/test/java/org/ocpsoft/rewrite/annotation/visit/AnnotationConfigurationTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.annotation.visit; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java b/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java index 609a7f966..a7932e2b0 100644 --- a/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java +++ b/api-servlet/src/test/java/org/ocpsoft/rewrite/servlet/util/QueryStringBuilderTest.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/api-tests/src/test/java/org/ocpsoft/rewrite/servlet/event/SubflowTaskTest.java b/api-tests/src/test/java/org/ocpsoft/rewrite/servlet/event/SubflowTaskTest.java index e8e7a20d0..4d9f71747 100644 --- a/api-tests/src/test/java/org/ocpsoft/rewrite/servlet/event/SubflowTaskTest.java +++ b/api-tests/src/test/java/org/ocpsoft/rewrite/servlet/event/SubflowTaskTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.servlet.event; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/api/src/test/java/org/ocpsoft/rewrite/util/CompositeMapTest.java b/api/src/test/java/org/ocpsoft/rewrite/util/CompositeMapTest.java index 25b809543..f47bdfb0c 100644 --- a/api/src/test/java/org/ocpsoft/rewrite/util/CompositeMapTest.java +++ b/api/src/test/java/org/ocpsoft/rewrite/util/CompositeMapTest.java @@ -19,7 +19,7 @@ import java.util.Map.Entry; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/api/src/test/java/org/ocpsoft/rewrite/util/MapsTest.java b/api/src/test/java/org/ocpsoft/rewrite/util/MapsTest.java index aa697c8b8..d45ddfcb8 100644 --- a/api/src/test/java/org/ocpsoft/rewrite/util/MapsTest.java +++ b/api/src/test/java/org/ocpsoft/rewrite/util/MapsTest.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/action/RequestActionTest.java b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/action/RequestActionTest.java index 94e26dc13..d1c4e81bb 100644 --- a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/action/RequestActionTest.java +++ b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/action/RequestActionTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.annotation.action; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import org.apache.http.client.methods.HttpGet; diff --git a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/convert/CustomConverterTest.java b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/convert/CustomConverterTest.java index 73709568e..806006d6d 100644 --- a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/convert/CustomConverterTest.java +++ b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/convert/CustomConverterTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.annotation.convert; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import org.apache.http.client.methods.HttpGet; diff --git a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/forward/SimpleForwardTest.java b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/forward/SimpleForwardTest.java index 89381fa31..65f1dcc28 100644 --- a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/forward/SimpleForwardTest.java +++ b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/forward/SimpleForwardTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.annotation.forward; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import org.apache.http.client.methods.HttpGet; diff --git a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/issue135/NoClassLevelAnnotationTest.java b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/issue135/NoClassLevelAnnotationTest.java index 99e7b80cf..8d57d283e 100644 --- a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/issue135/NoClassLevelAnnotationTest.java +++ b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/issue135/NoClassLevelAnnotationTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.annotation.issue135; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import org.apache.http.client.methods.HttpGet; diff --git a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/join/JoinParameterTest.java b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/join/JoinParameterTest.java index 5309efbd6..2b3c93620 100644 --- a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/join/JoinParameterTest.java +++ b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/join/JoinParameterTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.annotation.join; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import org.apache.http.client.methods.HttpGet; diff --git a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/join/SimpleJoinTest.java b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/join/SimpleJoinTest.java index 96f5ac609..6fe54d0ee 100644 --- a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/join/SimpleJoinTest.java +++ b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/join/SimpleJoinTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.annotation.join; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import org.apache.http.client.methods.HttpGet; diff --git a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/validate/CustomValidatorTest.java b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/validate/CustomValidatorTest.java index 67701d04b..313104c50 100644 --- a/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/validate/CustomValidatorTest.java +++ b/config-annotations/src/test/java/org/ocpsoft/rewrite/annotation/validate/CustomValidatorTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.annotation.validate; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import org.apache.http.client.methods.HttpGet; diff --git a/config-jodatime/src/test/java/org/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java b/config-jodatime/src/test/java/org/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java index 73171e59d..283d64c86 100644 --- a/config-jodatime/src/test/java/org/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java +++ b/config-jodatime/src/test/java/org/ocpsoft/rewrite/config/jodatime/JodaTimeTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.config.jodatime; -import junit.framework.Assert; +import org.junit.Assert; import org.joda.time.DateTime; import org.junit.Test; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationTest.java index 96b2ae20f..fdf61bc79 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/EncodeQueryConfigurationTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.servlet.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JaasRolesTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JaasRolesTest.java index f45ff20b0..ae4a94a5d 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JaasRolesTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JaasRolesTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.servlet.config; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationTest.java index e6f51ffdf..91201c72a 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinBindingConfigurationTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.servlet.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinOtherwiseConfigurationTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinOtherwiseConfigurationTest.java index 328fe1a55..8a3a0ac45 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinOtherwiseConfigurationTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinOtherwiseConfigurationTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.servlet.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinOutboundConfigurationTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinOutboundConfigurationTest.java index 7552264b5..bedb39e83 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinOutboundConfigurationTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinOutboundConfigurationTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.servlet.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinRequestBindingConfigurationTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinRequestBindingConfigurationTest.java index 61350e485..8681a1718 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinRequestBindingConfigurationTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/JoinRequestBindingConfigurationTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.servlet.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestBindingTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestBindingTest.java index d1118d6e7..5fafdc014 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestBindingTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/RequestBindingTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.servlet.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ResourceReadParamsInConditionTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ResourceReadParamsInConditionTest.java index a95713021..3a60d5d55 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ResourceReadParamsInConditionTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ResourceReadParamsInConditionTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.servlet.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ResourceTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ResourceTest.java index 7d1eaf317..82cc51733 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ResourceTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ResourceTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.servlet.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/SchemeChangeTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/SchemeChangeTest.java index 5bbf608d0..c4484a8ac 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/SchemeChangeTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/SchemeChangeTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.servlet.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; diff --git a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ServletMappingConfigurationTest.java b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ServletMappingConfigurationTest.java index 2e89c5ce2..dee7347ee 100644 --- a/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ServletMappingConfigurationTest.java +++ b/config-servlet/src/test/java/org/ocpsoft/rewrite/servlet/config/ServletMappingConfigurationTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.servlet.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/config-tuckey/src/test/java/org/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProviderTest.java b/config-tuckey/src/test/java/org/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProviderTest.java index 0e41f4d91..fd53b1c92 100644 --- a/config-tuckey/src/test/java/org/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProviderTest.java +++ b/config-tuckey/src/test/java/org/ocpsoft/rewrite/config/tuckey/TuckeyConfigurationProviderTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.config.tuckey; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/impl-tests/src/test/java/org/ocpsoft/rewrite/convert/DefaultConverterProviderTest.java b/impl-tests/src/test/java/org/ocpsoft/rewrite/convert/DefaultConverterProviderTest.java index 6fff0f8af..40bbccbb0 100644 --- a/impl-tests/src/test/java/org/ocpsoft/rewrite/convert/DefaultConverterProviderTest.java +++ b/impl-tests/src/test/java/org/ocpsoft/rewrite/convert/DefaultConverterProviderTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.convert; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/impl-tests/src/test/java/org/ocpsoft/rewrite/convert/DefaultValidatorProviderTest.java b/impl-tests/src/test/java/org/ocpsoft/rewrite/convert/DefaultValidatorProviderTest.java index 8cb65188a..ecfef25de 100644 --- a/impl-tests/src/test/java/org/ocpsoft/rewrite/convert/DefaultValidatorProviderTest.java +++ b/impl-tests/src/test/java/org/ocpsoft/rewrite/convert/DefaultValidatorProviderTest.java @@ -1,6 +1,6 @@ package org.ocpsoft.rewrite.convert; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java index 3d38c9d3e..28bfd089d 100644 --- a/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java +++ b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/bridge/CdiMultipleFeaturesTest.java @@ -15,13 +15,12 @@ */ package org.ocpsoft.rewrite.cdi.bridge; -import junit.framework.Assert; - import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.ocpsoft.rewrite.cdi.bind.BindingBean; diff --git a/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/resolver/CdiBeanNameResolverTest.java b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/resolver/CdiBeanNameResolverTest.java index 860a87add..c7039f6d9 100644 --- a/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/resolver/CdiBeanNameResolverTest.java +++ b/integration-cdi/src/test/java/org/ocpsoft/rewrite/cdi/resolver/CdiBeanNameResolverTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.cdi.resolver; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/DeferredOperationTest.java b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/DeferredOperationTest.java index baaa07e4d..d4ab43e3b 100644 --- a/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/DeferredOperationTest.java +++ b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/DeferredOperationTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/PhaseOperationTest.java b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/PhaseOperationTest.java index 384454d62..0bc55b713 100644 --- a/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/PhaseOperationTest.java +++ b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/PhaseOperationTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/resolver/FacesBeanNameResolverTest.java b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/resolver/FacesBeanNameResolverTest.java index a6813b083..9e7042b9d 100644 --- a/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/resolver/FacesBeanNameResolverTest.java +++ b/integration-faces/src/test/java/org/ocpsoft/rewrite/faces/resolver/FacesBeanNameResolverTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.faces.resolver; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/integration-gwt/src/test/java/org/ocpsoft/rewrite/gwt/config/HistoryRewriteConfigurationTest.java b/integration-gwt/src/test/java/org/ocpsoft/rewrite/gwt/config/HistoryRewriteConfigurationTest.java index 0cf80dc13..0a84925aa 100644 --- a/integration-gwt/src/test/java/org/ocpsoft/rewrite/gwt/config/HistoryRewriteConfigurationTest.java +++ b/integration-gwt/src/test/java/org/ocpsoft/rewrite/gwt/config/HistoryRewriteConfigurationTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.gwt.config; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpHead; diff --git a/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesTest.java b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesTest.java index cd48392c8..3b2d696cd 100644 --- a/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesTest.java +++ b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/SpringFeaturesTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.spring; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/resolver/SpringBeanNameResolverTest.java b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/resolver/SpringBeanNameResolverTest.java index 4ffe5cf05..376366557 100644 --- a/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/resolver/SpringBeanNameResolverTest.java +++ b/integration-spring/src/test/java/org/ocpsoft/rewrite/spring/resolver/SpringBeanNameResolverTest.java @@ -15,7 +15,7 @@ */ package org.ocpsoft.rewrite.spring.resolver; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.http.client.methods.HttpGet; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/transform-markup/src/test/java/org/ocpsoft/rewrite/transform/markup/HtmlDocumentBuilderTest.java b/transform-markup/src/test/java/org/ocpsoft/rewrite/transform/markup/HtmlDocumentBuilderTest.java index c0a702e93..802f3e7e2 100644 --- a/transform-markup/src/test/java/org/ocpsoft/rewrite/transform/markup/HtmlDocumentBuilderTest.java +++ b/transform-markup/src/test/java/org/ocpsoft/rewrite/transform/markup/HtmlDocumentBuilderTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertThat; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import org.ocpsoft.rewrite.transform.markup.HtmlDocumentBuilder;