diff --git a/src/test/java/de/gwdg/metadataqa/marc/cli/CompletenessTest.java b/src/test/java/de/gwdg/metadataqa/marc/cli/CompletenessTest.java index d57c15998..7d84d4143 100644 --- a/src/test/java/de/gwdg/metadataqa/marc/cli/CompletenessTest.java +++ b/src/test/java/de/gwdg/metadataqa/marc/cli/CompletenessTest.java @@ -74,28 +74,6 @@ public void completeness_pica() throws Exception { } } - @Test - public void testStream() { - Map> packages = new HashMap<>(); - Map general = new HashMap<>(); - general.put("010", 1); - general.put("020", 2); - general.put("030", 3); - packages.put("general", general); - Map specific = new HashMap<>(); - specific.put("110", 1); - specific.put("120", 2); - specific.put("130", 3); - packages.put("specific", specific); - - packages.forEach((a, b) -> { - System.err.println(a); - b.forEach((c, d) ->{ - System.err.println(c + ": " + d); - }); - }); - } - @Test public void testSimple() { Map namesMap = new HashMap<>(); diff --git a/src/test/java/de/gwdg/metadataqa/marc/cli/utils/ignorablerecords/RecordIgnoratorPicaTest.java b/src/test/java/de/gwdg/metadataqa/marc/cli/utils/ignorablerecords/RecordIgnoratorPicaTest.java index 4ef342821..6d06ec517 100644 --- a/src/test/java/de/gwdg/metadataqa/marc/cli/utils/ignorablerecords/RecordIgnoratorPicaTest.java +++ b/src/test/java/de/gwdg/metadataqa/marc/cli/utils/ignorablerecords/RecordIgnoratorPicaTest.java @@ -22,16 +22,6 @@ public void parse_ex1() { testParsing("002@.0 !~ '^L'", 1, "002@.0", Operator.NOT_MATCH, "^L"); } - private void testParsing(String ignorableRecordsInput, int expected, String expected1, Operator notMatch, String expected2) { - RecordIgnorator ignorator = new RecordIgnoratorPica(ignorableRecordsInput); - assertFalse(ignorator.isEmpty()); - List criteria = ((RecordIgnoratorPica)ignorator).getCriteria(); - assertEquals(expected, criteria.size()); - assertEquals(expected1, criteria.get(0).getPath().getPath()); - assertEquals(notMatch, criteria.get(0).getOperator()); - assertEquals(expected2, criteria.get(0).getValue()); - } - @Test public void parse_ex2() { testParsing("002@.0 !~ '^..[iktN]'", 1, "002@.0", Operator.NOT_MATCH, "^..[iktN]"); @@ -84,13 +74,6 @@ public void isIgnorable_ex2_2() { isIgnorable("abk", "002@.0 =~ '^..[iktN]'"); } - private void isIgnorable(String abk, String ignorableRecordsInput) { - MarcRecord marcRecord = new MarcRecord("010000011"); - marcRecord.addDataField(new DataField(schema.get("002@"), " ", " ", "0", abk)); - RecordIgnorator ignorator = new RecordIgnoratorPica(ignorableRecordsInput); - assertTrue(ignorator.isIgnorable(marcRecord)); - } - @Test public void isIgnorable_ex2_3() { isIgnorable("abt", "002@.0 =~ '^..[iktN]'"); @@ -103,20 +86,12 @@ public void isIgnorable_ex2_4() { @Test public void isIgnorable_ex2_5() { - MarcRecord marcRecord = new MarcRecord("010000011"); - marcRecord.addDataField(new DataField(schema.get("002@"), " ", " ", "0", "abM")); - RecordIgnorator ignorator = new RecordIgnoratorPica("002@.0 =~ '^..[iktN]'"); - assertFalse(ignorator.isIgnorable(marcRecord)); + isIgnorableFailing("abM", "002@.0 =~ '^..[iktN]'"); } @Test public void isIgnorable_ex1_reverse() { - MarcRecord marcRecord = new MarcRecord("010000011"); - marcRecord.addDataField(new DataField(schema.get("002@"), " ", " ", "0", "L")); - - RecordIgnorator ignorator = new RecordIgnoratorPica("002@.0 !~ '^L'"); - - assertFalse(ignorator.isIgnorable(marcRecord)); + isIgnorableFailing("L", "002@.0 !~ '^L'"); } @Test @@ -126,10 +101,7 @@ public void isIgnorable_match() { @Test public void isIgnorable_not_match() { - MarcRecord marcRecord = new MarcRecord("010000011"); - marcRecord.addDataField(new DataField(schema.get("002@"), " ", " ", "0", "L")); - RecordIgnorator ignorator = new RecordIgnoratorPica("002@.0 != 'L'"); - assertFalse(ignorator.isIgnorable(marcRecord)); + isIgnorableFailing("L", "002@.0 != 'L'"); } @Test @@ -139,10 +111,7 @@ public void isIgnorable_startsWith() { @Test public void isIgnorable_startsWith_reverse() { - MarcRecord marcRecord = new MarcRecord("010000011"); - marcRecord.addDataField(new DataField(schema.get("002@"), " ", " ", "0", "pica")); - RecordIgnorator ignorator = new RecordIgnoratorPica("002@.0 =^ 'po'"); - assertFalse(ignorator.isIgnorable(marcRecord)); + isIgnorableFailing("pica", "002@.0 =^ 'po'"); } @Test @@ -152,10 +121,7 @@ public void isIgnorable_endsWith() { @Test public void isIgnorable_endsWith_not() { - MarcRecord marcRecord = new MarcRecord("010000011"); - marcRecord.addDataField(new DataField(schema.get("002@"), " ", " ", "0", "pica")); - RecordIgnorator ignorator = new RecordIgnoratorPica("002@.0 =$ 'co'"); - assertFalse(ignorator.isIgnorable(marcRecord)); + isIgnorableFailing("pica", "002@.0 =$ 'co'"); } @Test @@ -165,13 +131,34 @@ public void isIgnorable_exists() { @Test public void isIgnorable_exists_not() { - MarcRecord marcRecord = new MarcRecord("010000011"); - marcRecord.addDataField(new DataField(schema.get("002@"), " ", " ", "0", "pica")); - RecordIgnorator ignorator = new RecordIgnoratorPica("002@.b?"); - assertFalse(ignorator.isIgnorable(marcRecord)); + isIgnorableFailing("pica", "002@.b?"); } private String getPath(String fileName) { return Paths.get("src/test/resources/" + fileName).toAbsolutePath().toString(); } + + private void testParsing(String ignorableRecordsInput, int expected, String expected1, Operator notMatch, String expected2) { + RecordIgnorator ignorator = new RecordIgnoratorPica(ignorableRecordsInput); + assertFalse(ignorator.isEmpty()); + List criteria = ((RecordIgnoratorPica)ignorator).getCriteria(); + assertEquals(expected, criteria.size()); + assertEquals(expected1, criteria.get(0).getPath().getPath()); + assertEquals(notMatch, criteria.get(0).getOperator()); + assertEquals(expected2, criteria.get(0).getValue()); + } + + private void isIgnorable(String abk, String ignorableRecordsInput) { + MarcRecord marcRecord = new MarcRecord("010000011"); + marcRecord.addDataField(new DataField(schema.get("002@"), " ", " ", "0", abk)); + RecordIgnorator ignorator = new RecordIgnoratorPica(ignorableRecordsInput); + assertTrue(ignorator.isIgnorable(marcRecord)); + } + + private void isIgnorableFailing(String abM, String ignorableRecordsInput) { + MarcRecord marcRecord = new MarcRecord("010000011"); + marcRecord.addDataField(new DataField(schema.get("002@"), " ", " ", "0", abM)); + RecordIgnorator ignorator = new RecordIgnoratorPica(ignorableRecordsInput); + assertFalse(ignorator.isIgnorable(marcRecord)); + } } \ No newline at end of file