Cleanup Avram schema files of K10plus and allow updating the schema #291

pkiraly · Nov 6, 2023 · 3cf58f8 · 3cf58f8
1 parent 2b89051
commit 3cf58f8
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
diff --git a/src/test/java/de/gwdg/metadataqa/marc/analysis/ShelfReadyAnalysisTest.java b/src/test/java/de/gwdg/metadataqa/marc/analysis/ShelfReadyAnalysisTest.java
@@ -34,7 +34,7 @@ public void getScores_forMarc() throws IOException, URISyntaxException {
 
   @Test
   public void getScores_forPica() throws Exception {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/schema/k10plus.json"));
     MarcReader reader = QAMarcReaderFactory.getFileReader(MarcFormat.PICA_PLAIN, CliTestUtils.getTestResource("pica/k10plus-sample.pica"), null);
     reader.hasNext();
     Record record = reader.next();

diff --git a/src/test/java/de/gwdg/metadataqa/marc/analysis/validator/DataFieldValidatorTest.java b/src/test/java/de/gwdg/metadataqa/marc/analysis/validator/DataFieldValidatorTest.java
@@ -31,7 +31,7 @@ public void validate() {
   }
 
   private DataField getDatafield() {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/schema/k10plus.json"));
     MarcReader reader;
     try {
       reader = QAMarcReaderFactory.getFileReader(MarcFormat.PICA_NORMALIZED, CliTestUtils.getTestResource("pica/pica-with-holdings-info.dat"), null);

diff --git a/src/test/java/de/gwdg/metadataqa/marc/analysis/validator/ValidatorTest.java b/src/test/java/de/gwdg/metadataqa/marc/analysis/validator/ValidatorTest.java
@@ -22,7 +22,7 @@
 
 public class ValidatorTest {
 
-  PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/k10plus.json"));
+  PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/schema/k10plus.json"));
   Validator validator = new Validator(new ValidatorConfiguration().withSchemaType(SchemaType.PICA));
   MarcReader reader;
 

diff --git a/src/test/java/de/gwdg/metadataqa/marc/cli/AuthorityAnalysisTest.java b/src/test/java/de/gwdg/metadataqa/marc/cli/AuthorityAnalysisTest.java
@@ -47,7 +47,7 @@ public void setUp() throws Exception {
 
   @Test
   public void pica() throws Exception {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/schema/k10plus.json"));
     MarcReader reader = QAMarcReaderFactory.getFileReader(MarcFormat.PICA_PLAIN, CliTestUtils.getTestResource("pica/k10plus-sample.pica"), null);
     reader.hasNext();
     Record record = reader.next();

diff --git a/src/test/java/de/gwdg/metadataqa/marc/cli/BibSelectorTest.java b/src/test/java/de/gwdg/metadataqa/marc/cli/BibSelectorTest.java
@@ -45,7 +45,7 @@ public void testConstructorNullArgument() {
 
   @Test
   public void get_pica() throws Exception {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/schema/k10plus.json"));
     BibliographicRecord marcRecord = new PicaRecord("u2407796");
     marcRecord.addDataField(new DataField(schema.lookup("001B"), null, null, "0", "1999:02-05-18"));
     BibSelector selector = BibSelectorFactory.create(marcRecord);

diff --git a/src/test/java/de/gwdg/metadataqa/marc/cli/FormatterTest.java b/src/test/java/de/gwdg/metadataqa/marc/cli/FormatterTest.java
@@ -42,7 +42,7 @@ public void setUp() throws Exception {
 
   @Test
   public void pica() throws Exception {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/schema/k10plus.json"));
     MarcReader reader = QAMarcReaderFactory.getFileReader(MarcFormat.PICA_PLAIN, CliTestUtils.getTestResource("pica/k10plus-sample.pica"), null);
     reader.hasNext();
     Record record = reader.next();

diff --git a/src/test/java/de/gwdg/metadataqa/marc/cli/MarcToSolrTest.java b/src/test/java/de/gwdg/metadataqa/marc/cli/MarcToSolrTest.java
@@ -57,7 +57,7 @@ public void testVersionSpecificSubfield() {
 
   @Test
   public void pica() throws Exception {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/schema/k10plus.json"));
     MarcReader reader = QAMarcReaderFactory.getFileReader(MarcFormat.PICA_PLAIN, CliTestUtils.getTestResource("pica/k10plus-sample.pica"), null);
     reader.hasNext();
     Record record = reader.next();
@@ -70,7 +70,7 @@ public void pica() throws Exception {
 
   @Test
   public void pica_extra() throws Exception {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/schema/k10plus.json"));
     MarcReader reader = QAMarcReaderFactory.getFileReader(MarcFormat.PICA_NORMALIZED, CliTestUtils.getTestResource("pica/pica-with-holdings-info.dat"), null);
     reader.hasNext();
     Record record = reader.next();

diff --git a/src/test/java/de/gwdg/metadataqa/marc/dao/record/PicaRecordTest.java b/src/test/java/de/gwdg/metadataqa/marc/dao/record/PicaRecordTest.java
@@ -11,7 +11,7 @@
 
 public class PicaRecordTest {
 
-  private PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/k10plus.json"));
+  private PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/schema/k10plus.json"));
 
   @Test
   public void addDataField() {

diff --git a/src/test/java/de/gwdg/metadataqa/marc/utils/pica/PicaSchemaManagerTest.java b/src/test/java/de/gwdg/metadataqa/marc/utils/pica/PicaSchemaManagerTest.java
@@ -14,7 +14,7 @@ public class PicaSchemaManagerTest {
 
   @Before
   public void setUp() throws Exception {
-    schema = PicaSchemaReader.createSchema(getPath("pica/k10plus.json"));
+    schema = PicaSchemaReader.createSchema(getPath("pica/schema/k10plus.json"));
   }
 
   @Test

diff --git a/src/test/java/de/gwdg/metadataqa/marc/utils/pica/reader/PicaPlainReaderTest.java b/src/test/java/de/gwdg/metadataqa/marc/utils/pica/reader/PicaPlainReaderTest.java
@@ -119,8 +119,8 @@ public void readTags() {
   public void readAvramSchema() {
     try {
       Map<String, PicaFieldDefinition> schemaDirectory = new HashMap<>();
-      schemaDirectory.putAll(PicaSchemaReader.create(getPath("pica/pica-schema.json")));
-      schemaDirectory.putAll(PicaSchemaReader.create(getPath("pica/pica-schema-extra.json")));
+      schemaDirectory.putAll(PicaSchemaReader.create(getPath("pica/schema/pica-schema.json")));
+      schemaDirectory.putAll(PicaSchemaReader.create(getPath("pica/schema/pica-schema-extra.json")));
 
       Map<String, Integer> counter = new HashMap<>();
       Map<String, List<String>> ppns = new HashMap<>();
@@ -192,7 +192,7 @@ public void readAvramSchema() {
 
   @Test
   public void picaReader() throws IOException, URISyntaxException {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(getPath("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(getPath("pica/schema/k10plus.json"));
     String recordFile = FileUtils.getPath("pica/picaplus-sample.txt").toAbsolutePath().toString();
     MarcReader reader = new PicaPlainReader(recordFile).setIdField("003@ƒ0").setSubfieldSeparator("ƒ");
     int i = 0;
@@ -207,7 +207,7 @@ public void picaReader() throws IOException, URISyntaxException {
 
   @Test
   public void picaReader2() throws IOException, URISyntaxException {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(getPath("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(getPath("pica/schema/k10plus.json"));
     String recordFile = FileUtils.getPath("pica/k10plus-sample.pica").toAbsolutePath().toString();
     MarcReader reader = new PicaPlainReader(recordFile)
       .setIdField("003@$0")
@@ -241,7 +241,7 @@ private boolean directoryContains(Map<String, PicaFieldDefinition> schemaDirecto
 
   @Test
   public void readASchema() {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(getPath("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(getPath("pica/schema/k10plus.json"));
     assertEquals(431, schema.size());
     PicaFieldDefinition definition = schema.lookup("048H");
     assertEquals("048H", definition.getTag());

diff --git a/src/test/java/de/gwdg/metadataqa/marc/utils/pica/reader/PicaXmlReaderTest.java b/src/test/java/de/gwdg/metadataqa/marc/utils/pica/reader/PicaXmlReaderTest.java
@@ -19,7 +19,7 @@ public class PicaXmlReaderTest {
 
   @Test
   public void xml()  {
-    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/k10plus.json"));
+    PicaSchemaManager schema = PicaSchemaReader.createSchema(CliTestUtils.getTestResource("pica/schema/k10plus.json"));
     MarcReader reader = null;
     try {
       reader = QAMarcReaderFactory.getFileReader(MarcFormat.PICA_XML, CliTestUtils.getTestResource("picaxml/pica.xml"), null);

diff --git a/src/test/resources/pica/README.txt → src/test/resources/pica/schema/README.txt b/src/test/resources/pica/README.txt → src/test/resources/pica/schema/README.txt
diff --git a/src/test/resources/pica/k10plus.json → src/test/resources/pica/schema/k10plus.json b/src/test/resources/pica/k10plus.json → src/test/resources/pica/schema/k10plus.json
diff --git a/...est/resources/pica/pica-schema-extra.json → ...ources/pica/schema/pica-schema-extra.json b/...est/resources/pica/pica-schema-extra.json → ...ources/pica/schema/pica-schema-extra.json
diff --git a/src/test/resources/pica/pica-schema.json → ...st/resources/pica/schema/pica-schema.json b/src/test/resources/pica/pica-schema.json → ...st/resources/pica/schema/pica-schema.json
diff --git a/src/test/resources/pica/vocabularies.json → ...t/resources/pica/schema/vocabularies.json b/src/test/resources/pica/vocabularies.json → ...t/resources/pica/schema/vocabularies.json