From d18c9a38ca1e541d063edf36914d2ac17a1e03e1 Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Sun, 9 Nov 2014 16:22:25 -0500 Subject: [PATCH] Stop 'deprecated' messages from JUnit imports. --- .../cornell/mannlib/vitro/testing/AbstractTestClass.java | 4 ++-- .../vitro/webapp/auth/policy/SelfEditingPolicyTest.java | 6 +++--- .../mannlib/vitro/webapp/config/RevisionInfoBeanTest.java | 2 +- .../individual/IndividualRequestAnalyzerTest.java | 4 ++-- .../dao/filtering/IndividualFilteringByStatementTest.java | 2 +- webapp/test/freemarker/ext/dump/DumpAllDirectiveTest.java | 4 ++-- webapp/test/freemarker/ext/dump/DumpDirectiveTest.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/webapp/test/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java b/webapp/test/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java index 9c9a2adb6..168b9144b 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java +++ b/webapp/test/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java @@ -2,9 +2,9 @@ package edu.cornell.mannlib.vitro.testing; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.fail; import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java index 547c043b9..95cc96aff 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java @@ -5,9 +5,9 @@ package edu.cornell.mannlib.vitro.webapp.auth.policy; import static edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization.AUTHORIZED; import static edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization.INCONCLUSIVE; import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_LITERAL; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBeanTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBeanTest.java index 0c44bafd0..d5fb0ae04 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBeanTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBeanTest.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.config; import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.DUMMY_BEAN; import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.LevelRevisionInfo.DUMMY_LEVEL; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.Date; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalyzerTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalyzerTest.java index 7e1a0cb9a..273347fd4 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalyzerTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalyzerTest.java @@ -5,8 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.individual; import static edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet.N3_MIMETYPE; import static edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet.RDFXML_MIMETYPE; import static edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet.TTL_MIMETYPE; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.net.URL; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java index 2dcc40f39..7363e8b21 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java @@ -3,7 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.filtering; import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_URI; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import java.util.ArrayList; diff --git a/webapp/test/freemarker/ext/dump/DumpAllDirectiveTest.java b/webapp/test/freemarker/ext/dump/DumpAllDirectiveTest.java index 336c5c1f7..9fa77c103 100644 --- a/webapp/test/freemarker/ext/dump/DumpAllDirectiveTest.java +++ b/webapp/test/freemarker/ext/dump/DumpAllDirectiveTest.java @@ -2,8 +2,8 @@ package freemarker.ext.dump; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.StringReader; import java.io.StringWriter; diff --git a/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java b/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java index 1178ac9c3..54916c659 100644 --- a/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java +++ b/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java @@ -2,8 +2,8 @@ package freemarker.ext.dump; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.IOException; import java.io.StringReader;