junit.framework.* -> org.junit.*

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;
 

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;

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;
 

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;