Author: echatellier Date: 2011-03-04 11:09:41 +0100 (Fri, 04 Mar 2011) New Revision: 741 Url: http://nuiton.org/repositories/revision/wikitty/741 Log: Move test to junit 4 Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-03-04 10:06:24 UTC (rev 740) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-03-04 10:09:41 UTC (rev 741) @@ -22,18 +22,19 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ + package org.nuiton.wikitty.storage.solr; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import junit.framework.Assert; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.wikitty.search.Criteria; Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java 2011-03-04 10:06:24 UTC (rev 740) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java 2011-03-04 10:09:41 UTC (rev 741) @@ -25,8 +25,8 @@ package org.nuiton.wikitty.storage.solr; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2011-03-04 10:06:24 UTC (rev 740) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2011-03-04 10:09:41 UTC (rev 741) @@ -25,10 +25,10 @@ package org.nuiton.wikitty.storage.solr; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.util.ArrayList; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-03-04 10:06:24 UTC (rev 740) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-03-04 10:09:41 UTC (rev 741) @@ -22,9 +22,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ + package org.nuiton.wikitty.storage.solr; - import java.util.ArrayList; import java.util.List; import org.apache.commons.logging.Log;