diff --git a/extensions/wikidata/pom.xml b/extensions/wikidata/pom.xml index 93b6f36ab..83a6f8fa4 100644 --- a/extensions/wikidata/pom.xml +++ b/extensions/wikidata/pom.xml @@ -24,6 +24,11 @@ tests/src + + + tests/data + + module/MOD-INF/classes @@ -151,6 +156,16 @@ 0.9.0-SNAPSHOT + + + + org.openrefine + main + 3.0-SNAPSHOT + tests + test-jar + test + org.testng testng diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java index d1026a28c..81596105e 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java +++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java @@ -52,7 +52,7 @@ public class PreviewWikibaseSchemaCommandTest extends SchemaCommandTest { @Test public void testValidSchema() throws JSONException, IOException, ServletException { - String schemaJson = jsonFromFile("data/schema/inception.json").toString(); + String schemaJson = jsonFromFile("schema/inception.json").toString(); when(request.getParameter("schema")).thenReturn(schemaJson); command.doPost(request, response); diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java index 081e44e85..365bb1796 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java +++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java @@ -44,7 +44,7 @@ public class SaveWikibaseSchemaCommandTest extends SchemaCommandTest { @Test public void testValidSchema() throws ServletException, IOException { - String schemaJson = jsonFromFile("data/schema/inception.json").toString(); + String schemaJson = jsonFromFile("schema/inception.json").toString(); when(request.getParameter("schema")).thenReturn(schemaJson); command.doPost(request, response); diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java index dfc15bc9d..b5d56fbbd 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java +++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java @@ -70,7 +70,7 @@ public class QuickStatementsExporterTest extends RefineTest { throws JSONException, IOException { Project project = this.createCSVProject(TestingData.inceptionWithNewCsv); TestingData.reconcileInceptionCells(project); - JSONObject serialized = TestingData.jsonFromFile("data/schema/inception.json"); + JSONObject serialized = TestingData.jsonFromFile("schema/inception.json"); WikibaseSchema schema = WikibaseSchema.reconstruct(serialized); project.overlayModels.put("wikibaseSchema", schema); Engine engine = new Engine(project); diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java index 348941cd2..a0a91b4c7 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java +++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java @@ -53,7 +53,7 @@ public class PerformWikibaseEditsOperationTest extends OperationTest { @Override public JSONObject getJson() throws Exception { - return TestingData.jsonFromFile("data/operations/perform-edits.json"); + return TestingData.jsonFromFile("operations/perform-edits.json"); } @Test(expectedExceptions=IllegalArgumentException.class) diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java index a587de25c..6c5e5db5a 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java +++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java @@ -53,13 +53,13 @@ public class SaveWikibaseSchemaOperationTest extends OperationTest { @Override public JSONObject getJson() throws Exception { - return TestingData.jsonFromFile("data/operations/save-schema.json"); + return TestingData.jsonFromFile("operations/save-schema.json"); } @Test public void testLoadChange() throws Exception { - JSONObject schemaJson = TestingData.jsonFromFile("data/schema/inception.json"); + JSONObject schemaJson = TestingData.jsonFromFile("schema/inception.json"); String changeString = "newSchema=" + schemaJson.toString() + "\n" + "oldSchema=\n" + "/ec/"; WikibaseSchema schema = WikibaseSchema.reconstruct(schemaJson); diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java index 2a4c2c9c1..15078ff52 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java +++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java @@ -100,7 +100,7 @@ public class WikibaseSchemaTest extends RefineTest { @Test public void testSerialize() throws JSONException, IOException { - JSONObject serialized = TestingData.jsonFromFile("data/schema/history_of_medicine.json"); + JSONObject serialized = TestingData.jsonFromFile("schema/history_of_medicine.json"); WikibaseSchema parsed = WikibaseSchema.reconstruct(serialized); StringWriter writer = new StringWriter(); JSONWriter jsonWriter = new JSONWriter(writer); @@ -108,7 +108,7 @@ public class WikibaseSchemaTest extends RefineTest { writer.close(); JSONObject newSerialized = ParsingUtilities.evaluateJsonStringToObject(writer.toString()); // toString because it looks like JSONObject equality isn't great… - assertEquals(TestingData.jsonFromFile("data/schema/history_of_medicine_normalized.json").toString(), + assertEquals(TestingData.jsonFromFile("schema/history_of_medicine_normalized.json").toString(), newSerialized.toString()); } @@ -117,14 +117,14 @@ public class WikibaseSchemaTest extends RefineTest { throws JSONException, IOException { // this json file was generated by an earlier version of the software // it contains extra "type" fields that are now ignored. - JSONObject serialized = TestingData.jsonFromFile("data/schema/roarmap.json"); + JSONObject serialized = TestingData.jsonFromFile("schema/roarmap.json"); WikibaseSchema.reconstruct(serialized); } @Test public void testEvaluate() throws JSONException, IOException { - JSONObject serialized = TestingData.jsonFromFile("data/schema/inception.json"); + JSONObject serialized = TestingData.jsonFromFile("schema/inception.json"); WikibaseSchema schema = WikibaseSchema.reconstruct(serialized); Engine engine = new Engine(project); List updates = schema.evaluate(project, engine); @@ -146,7 +146,7 @@ public class WikibaseSchemaTest extends RefineTest { @Test public void testEvaluateRespectsFacets() throws JSONException, IOException { - JSONObject serialized = TestingData.jsonFromFile("data/schema/inception.json"); + JSONObject serialized = TestingData.jsonFromFile("schema/inception.json"); WikibaseSchema schema = WikibaseSchema.reconstruct(serialized); Engine engine = new Engine(project); JSONObject engineConfig = new JSONObject("{\n" + " \"mode\": \"row-based\",\n" + " \"facets\": [\n" diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java index 3542824d2..efa25756f 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java +++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java @@ -24,10 +24,12 @@ package org.openrefine.wikidata.testing; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Collections; +import org.apache.commons.io.IOUtils; import org.json.JSONException; import org.json.JSONObject; import org.openrefine.wikidata.schema.WbLanguageConstant; @@ -133,8 +135,8 @@ public class TestingData { public static JSONObject jsonFromFile(String filename) throws IOException, JSONException { - byte[] contents = Files.readAllBytes(Paths.get(filename)); - String decoded = new String(contents, "utf-8"); + InputStream f = TestingData.class.getClassLoader().getResourceAsStream(filename); + String decoded = IOUtils.toString(f); return ParsingUtilities.evaluateJsonStringToObject(decoded); }