move tests into the right namespace

fcrepo · Mar 15, 2013 · 086ae44 · 086ae44
1 parent bcb3081
commit 086ae44
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/...repo/api/legacy/AbstractResourceTest.java → .../org/fcrepo/api/AbstractResourceTest.java b/...repo/api/legacy/AbstractResourceTest.java → .../org/fcrepo/api/AbstractResourceTest.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api.legacy;
+package org.fcrepo.api;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

diff --git a/...epo/api/legacy/FedoraDatastreamsTest.java → ...org/fcrepo/api/FedoraDatastreamsTest.java b/...epo/api/legacy/FedoraDatastreamsTest.java → ...org/fcrepo/api/FedoraDatastreamsTest.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api.legacy;
+package org.fcrepo.api;
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;
@@ -23,6 +23,7 @@
 import org.apache.http.entity.mime.MultipartEntity;
 import org.apache.http.entity.mime.content.StringBody;
 import org.apache.http.util.EntityUtils;
+import org.fcrepo.api.AbstractResourceTest;
 import org.fcrepo.jaxb.responses.management.DatastreamFixity;
 import org.fcrepo.jaxb.responses.management.FixityStatus;
 import org.junit.Test;

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraFieldSearchTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraFieldSearchTest.java
@@ -4,7 +4,6 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.message.BasicNameValuePair;
-import org.fcrepo.api.legacy.AbstractResourceTest;
 import org.junit.Test;
 
 import java.util.ArrayList;

diff --git a/...epo/api/legacy/FedoraIdentifiersTest.java → ...org/fcrepo/api/FedoraIdentifiersTest.java b/...epo/api/legacy/FedoraIdentifiersTest.java → ...org/fcrepo/api/FedoraIdentifiersTest.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api.legacy;
+package org.fcrepo.api;
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;
@@ -13,6 +13,7 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.util.EntityUtils;
+import org.fcrepo.api.AbstractResourceTest;
 import org.junit.Test;
 
 public class FedoraIdentifiersTest extends AbstractResourceTest {

diff --git a/.../fcrepo/api/legacy/FedoraObjectsTest.java → ...ava/org/fcrepo/api/FedoraObjectsTest.java b/.../fcrepo/api/legacy/FedoraObjectsTest.java → ...ava/org/fcrepo/api/FedoraObjectsTest.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api.legacy;
+package org.fcrepo.api;
 
 import static java.util.regex.Pattern.compile;
 import static org.junit.Assert.assertEquals;
@@ -10,6 +10,7 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.util.EntityUtils;
+import org.fcrepo.api.AbstractResourceTest;
 import org.junit.Test;
 
 public class FedoraObjectsTest extends AbstractResourceTest {

diff --git a/...repo/api/legacy/FedoraRepositoryTest.java → .../org/fcrepo/api/FedoraRepositoryTest.java b/...repo/api/legacy/FedoraRepositoryTest.java → .../org/fcrepo/api/FedoraRepositoryTest.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.api.legacy;
+package org.fcrepo.api;
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;
@@ -13,6 +13,7 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.util.EntityUtils;
+import org.fcrepo.api.AbstractResourceTest;
 import org.junit.Test;
 
 public class FedoraRepositoryTest extends AbstractResourceTest {
@@ -50,7 +51,7 @@ public void testDescribeHtml() throws Exception {
         final String description = EntityUtils.toString(response.getEntity());
         logger.debug("Found the repository description:\n" + description);
         assertTrue("Failed to find a proper repo version", compile(
-                "Number Of Objects").matcher(
+                "Number Of Objects: ").matcher(
                 description).find());
     }