fix tests

Author: jschnasse

test/archive/fedora/FedoraFacadeTest.java

@@ -53,8 +53,7 @@ public class FedoraFacadeTest extends BaseModelTest {
     public void setUp() throws IOException {
 
 	Properties properties = new Properties();
-	properties.load(Play.application().resourceAsStream(
-		"resources/test.properties"));
+	properties.load(Play.application().resourceAsStream("test.properties"));
 
 	facade = FedoraFactory.getFedoraImpl(
 		properties.getProperty("fedoraUrl"),
@@ -69,7 +68,7 @@ public void setUp() throws IOException {
 	object.dublinCoreData.addTitle("Ein Testtitel");
 	object.dublinCoreData.addCreator("Jan Schnasse");
 	object.setMetadataFile(Thread.currentThread().getContextClassLoader()
-		.getResource("resources/test.nt").getFile());
+		.getResource("test.nt").getFile());
 
 	object.addTransformer(new Transformer("testepicur", "epicur", server
 		+ "/resource/(pid).epicur"));
@@ -79,7 +78,7 @@ public void setUp() throws IOException {
 		+ "/resource/(pid).pdfa"));
 
 	URL url = Thread.currentThread().getContextClassLoader()
-		.getResource("resources/test.pdf");
+		.getResource("test.pdf");
 	play.Logger.info("Upload data from: " + url.getPath());
 	object.setUploadData(url.getPath(), "application/pdf");
 	cleanUp();
@@ -132,15 +131,15 @@ public void updateNode() {
 	newTitle.add("Neuer Titel");
 	object.dublinCoreData.setTitle(newTitle);
 	URL url = Thread.currentThread().getContextClassLoader()
-		.getResource("resources/HT017297166.xml");
+		.getResource("HT017297166.xml");
 	object.setUploadData(url.getPath(), "text/xml");
-	object.setFileLabel("resources/HT017297166.xml");
+	object.setFileLabel("HT017297166.xml");
 	facade.updateNode(object);
 
 	object = facade.readNode(object.getPid());
 	Assert.assertEquals("Neuer Titel",
 		object.dublinCoreData.getFirstTitle());
-	Assert.assertEquals("resources/HT017297166.xml", object.getFileLabel());
+	Assert.assertEquals("HT017297166.xml", object.getFileLabel());
 	Assert.assertEquals("text/xml", object.getMimeType());
 
 	// Object update on the reread object

test/archive/fedora/RdfUtilsTest.java

@@ -40,11 +40,10 @@ public class RdfUtilsTest {
     @Test
     public void testInputStreamToGraph() throws URISyntaxException, IOException {
 	try (InputStream in = Thread.currentThread().getContextClassLoader()
-		.getResourceAsStream("resources/HT015954381.txt")) {
+		.getResourceAsStream("HT015954381.txt")) {
 	    File expected = new File(Thread.currentThread()
 		    .getContextClassLoader()
-		    .getResource("resources/HT015954381_expected.txt").toURI()
-		    .getPath());
+		    .getResource("HT015954381_expected.txt").toURI().getPath());
 	    Graph graph = RdfUtils.readRdfToGraph(in, RDFFormat.NTRIPLES, "");
 	    String actual = RdfUtils.graphToString(graph, RDFFormat.NTRIPLES);
 	    System.out.println(actual);