Skip to content

Commit

Permalink
issue #137: fixing code smells
Browse files Browse the repository at this point in the history
  • Loading branch information
@pkiraly
pkiraly committed Jun 22, 2022
1 parent bd290f3 commit 037b647
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 65 deletions.
22 changes: 0 additions & 22 deletions src/test/java/de/gwdg/metadataqa/marc/cli/CompletenessTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,28 +74,6 @@ public void completeness_pica() throws Exception {
}
}

@Test
public void testStream() {
Map<String, Map<String, Integer>> packages = new HashMap<>();
Map<String, Integer> general = new HashMap<>();
general.put("010", 1);
general.put("020", 2);
general.put("030", 3);
packages.put("general", general);
Map<String, Integer> 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<Integer, String> namesMap = new HashMap<>();
Expand Down
73 changes: 30 additions & 43 deletions ...test/java/de/gwdg/metadataqa/marc/cli/utils/ignorablerecords/RecordIgnoratorPicaTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@ public void parse_ex1() {
testParsing("[email protected] !~ '^L'", 1, "[email protected]", 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<CriteriumPica> 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("[email protected] !~ '^..[iktN]'", 1, "[email protected]", Operator.NOT_MATCH, "^..[iktN]");
Expand Down Expand Up @@ -84,13 +74,6 @@ public void isIgnorable_ex2_2() {
isIgnorable("abk", "[email protected] =~ '^..[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", "[email protected] =~ '^..[iktN]'");
Expand All @@ -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("[email protected] =~ '^..[iktN]'");
assertFalse(ignorator.isIgnorable(marcRecord));
isIgnorableFailing("abM", "[email protected] =~ '^..[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("[email protected] !~ '^L'");

assertFalse(ignorator.isIgnorable(marcRecord));
isIgnorableFailing("L", "[email protected] !~ '^L'");
}

@Test
Expand All @@ -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("[email protected] != 'L'");
assertFalse(ignorator.isIgnorable(marcRecord));
isIgnorableFailing("L", "[email protected] != 'L'");
}

@Test
Expand All @@ -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("[email protected] =^ 'po'");
assertFalse(ignorator.isIgnorable(marcRecord));
isIgnorableFailing("pica", "[email protected] =^ 'po'");
}

@Test
Expand All @@ -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("[email protected] =$ 'co'");
assertFalse(ignorator.isIgnorable(marcRecord));
isIgnorableFailing("pica", "[email protected] =$ 'co'");
}

@Test
Expand All @@ -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("[email protected]?");
assertFalse(ignorator.isIgnorable(marcRecord));
isIgnorableFailing("pica", "[email protected]?");
}

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<CriteriumPica> 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));
}
}

0 comments on commit 037b647

Please sign in to comment.