Merge branch 'develop' into feature/fauxEditing

webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEditTest.java

@@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit;
 
 import java.util.Set;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilderTest.java

@@ -7,7 +7,7 @@ import static org.easymock.EasyMock.*;
 
 import javax.servlet.http.HttpServletRequest;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java

@@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 import java.io.StringReader;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;

webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java

@@ -6,7 +6,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.io.StringReader;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java

@@ -5,9 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 
-import junit.framework.Assert;
-
 import org.apache.log4j.Level;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -19,7 +18,6 @@ import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler;
 
 import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.menu.MainMenu;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.menu.MenuItem;
 

webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSegementationTest.java

@@ -2,7 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Ignore;
 import org.junit.Test;

webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java

@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.ontology.OntModelSpec;

webapp/test/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3UtilsTest.java

@@ -2,7 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.commons.io.output.NullOutputStream;
 import org.junit.Test;

webapp/test/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwoTest.java

@@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
 
 import java.util.Collections;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

webapp/test/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtilsTest.java

@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

webapp/test/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java

@@ -8,7 +8,7 @@ import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

webapp/test/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 import javax.servlet.ServletResponse;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

webapp/test/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchControllerTest.java

@@ -6,7 +6,7 @@ package edu.cornell.mannlib.vitro.webapp.search.controller;
 
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilderThreadTest.java

@@ -2,7 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.search.indexing;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.log4j.Level;
 import org.junit.Ignore;

webapp/test/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java

@@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.servlet.setup;
 
 import java.io.StringReader;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;

webapp/test/edu/cornell/mannlib/vitro/webapp/utils/ingest/JenaIngestUtilsTest.java

@@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.utils.ingest;
 
 import java.io.StringWriter;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

webapp/test/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtilsTest.java

@@ -2,7 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.utils.jena;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 import org.junit.Test;
 

webapp/test/edu/cornell/mannlib/vitro/webapp/web/ContentTypeTest.java

@@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.web;
 
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;