Revert "Move test data"

This reverts commit aab0425ec1b2d683708781f9247c4b164b04739d.

13 files changed, 6 insertions, 9 deletions

diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/complex/book.sd b/vespa-documentgen-plugin/etc/complex/book.sd
index 6d6145cb10b..6d6145cb10b 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/complex/book.sd
+++ b/vespa-documentgen-plugin/etc/complex/book.sd
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/complex/common.sd b/vespa-documentgen-plugin/etc/complex/common.sd
index e0505eba05b..e0505eba05b 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/complex/common.sd
+++ b/vespa-documentgen-plugin/etc/complex/common.sd
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/complex/common2.sd b/vespa-documentgen-plugin/etc/complex/common2.sd
index e32d3ed6751..e32d3ed6751 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/complex/common2.sd
+++ b/vespa-documentgen-plugin/etc/complex/common2.sd
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/complex/music2.sd b/vespa-documentgen-plugin/etc/complex/music2.sd
index 2e2d96ecdec..2e2d96ecdec 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/complex/music2.sd
+++ b/vespa-documentgen-plugin/etc/complex/music2.sd
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/complex/music3.sd b/vespa-documentgen-plugin/etc/complex/music3.sd
index 8bd612268df..8bd612268df 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/complex/music3.sd
+++ b/vespa-documentgen-plugin/etc/complex/music3.sd
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/complex/sombrerowebdoc.sd.FOO b/vespa-documentgen-plugin/etc/complex/sombrerowebdoc.sd.FOO
index 1524e7480a0..1524e7480a0 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/complex/sombrerowebdoc.sd.FOO
+++ b/vespa-documentgen-plugin/etc/complex/sombrerowebdoc.sd.FOO
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/complex/video.sd b/vespa-documentgen-plugin/etc/complex/video.sd
index 0b0298a162c..0b0298a162c 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/complex/video.sd
+++ b/vespa-documentgen-plugin/etc/complex/video.sd
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/localapp/book.sd b/vespa-documentgen-plugin/etc/localapp/book.sd
index 72faa934aa6..72faa934aa6 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/localapp/book.sd
+++ b/vespa-documentgen-plugin/etc/localapp/book.sd
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/localapp/common.sd b/vespa-documentgen-plugin/etc/localapp/common.sd
index 724897b4e7f..724897b4e7f 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/localapp/common.sd
+++ b/vespa-documentgen-plugin/etc/localapp/common.sd
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/localapp/music.sd b/vespa-documentgen-plugin/etc/localapp/music.sd
index e00e046f511..e00e046f511 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/localapp/music.sd
+++ b/vespa-documentgen-plugin/etc/localapp/music.sd
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/localapp/video.sd b/vespa-documentgen-plugin/etc/localapp/video.sd
index fc7f58298c1..fc7f58298c1 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/localapp/video.sd
+++ b/vespa-documentgen-plugin/etc/localapp/video.sd
diff --git a/vespa-documentgen-plugin/src/test/resources/schemas/music/music.sd b/vespa-documentgen-plugin/etc/music/music.sd
index 5295b1bf449..5295b1bf449 100644
--- a/vespa-documentgen-plugin/src/test/resources/schemas/music/music.sd
+++ b/vespa-documentgen-plugin/etc/music/music.sd
diff --git a/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java b/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java
index 72a3209a8fd..a65701fe261 100644
--- a/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java
+++ b/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java
@@ -1,10 +1,11 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa;
 
 import com.yahoo.document.DataType;
 import com.yahoo.document.StructDataType;
 import com.yahoo.document.WeightedSetDataType;
 import com.yahoo.searchdefinition.Search;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
@@ -15,17 +16,13 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 public class DocumentGenTest {
-    private static final File schemasDir = new File("src/test/resources/schemas/");
-    private static final File musicSchemaDir = new File(schemasDir, "music/");
-    private static final File complexSchemaDir = new File(schemasDir, "complex/");
-    private static final File localappSchemaDir = new File(schemasDir, "localapp/");
 
     @Test
     public void testMusic() {
         DocumentGenMojo mojo = new DocumentGenMojo();
-        mojo.execute(musicSchemaDir, new File("target/generated-test-sources/vespa-documentgen-plugin/"), "com.yahoo.vespa.document");
+        mojo.execute(new File("etc/music/"), new File("target/generated-test-sources/vespa-documentgen-plugin/"), "com.yahoo.vespa.document");
         Map<String, Search> searches = mojo.getSearches();
-        assertEquals(searches.size(), 1);
+        assertEquals(searches.size(),1);
         assertEquals(searches.get("music").getDocument("music").getField("title").getDataType(), DataType.STRING);
         assertEquals(searches.get("music").getDocument("music").getField("eitheror").getDataType(), DataType.BOOL);
     }
@@ -33,7 +30,7 @@ public class DocumentGenTest {
     @Test
     public void testComplex() {
         DocumentGenMojo mojo = new DocumentGenMojo();
-        mojo.execute(complexSchemaDir, new File("target/generated-test-sources/vespa-documentgen-plugin/"), "com.yahoo.vespa.document");
+        mojo.execute(new File("etc/complex/"), new File("target/generated-test-sources/vespa-documentgen-plugin/"), "com.yahoo.vespa.document");
         Map<String, Search> searches = mojo.getSearches();
         assertEquals(searches.get("video").getDocument("video").getField("weight").getDataType(), DataType.FLOAT);
         assertEquals(searches.get("book").getDocument("book").getField("sw1").getDataType(), DataType.FLOAT);
@@ -47,7 +44,7 @@ public class DocumentGenTest {
     @Test
     public void testLocalApp() {
         DocumentGenMojo mojo = new DocumentGenMojo();
-        mojo.execute(localappSchemaDir, new File("target/generated-test-sources/vespa-documentgen-plugin/"), "com.yahoo.vespa.document");
+        mojo.execute(new File("etc/localapp/"), new File("target/generated-test-sources/vespa-documentgen-plugin/"), "com.yahoo.vespa.document");
         Map<String, Search> searches = mojo.getSearches();
         assertEquals(searches.get("video").getDocument("video").getField("weight").getDataType(), DataType.FLOAT);
         assertTrue(searches.get("book").getDocument("book").getField("mystruct").getDataType() instanceof StructDataType);