Skip to content

Commit 9b010c9

Browse files
committed
Addressing some tect debt in tests.
1 parent 9721bfc commit 9b010c9

File tree

7 files changed

+296
-299
lines changed

7 files changed

+296
-299
lines changed

phileas-core/src/test/java/ai/philterd/test/phileas/services/EndToEndTestsHelper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public static Policy getPdfPolicy(String policyName) throws IOException {
192192
zipCodeFilterStrategy.setTruncateDigits(2);
193193

194194
ZipCode zipCode = new ZipCode();
195-
zipCode.setZipCodeFilterStrategies(Arrays.asList(zipCodeFilterStrategy));
195+
zipCode.setZipCodeFilterStrategies(List.of(zipCodeFilterStrategy));
196196

197197
CustomDictionaryFilterStrategy customDictionaryFilterStrategy = new CustomDictionaryFilterStrategy();
198198
customDictionaryFilterStrategy.setStrategy("REDACT");
@@ -220,7 +220,7 @@ public static Policy getPolicyJustCreditCardNotInUnixTimestamps(String policyNam
220220

221221
CreditCard creditCard = new CreditCard();
222222
creditCard.setIgnoreWhenInUnixTimestamp(true);
223-
creditCard.setCreditCardFilterStrategies(Arrays.asList(creditCardFilterStrategy));
223+
creditCard.setCreditCardFilterStrategies(List.of(creditCardFilterStrategy));
224224

225225
Identifiers identifiers = new Identifiers();
226226
identifiers.setCreditCard(creditCard);
@@ -242,7 +242,7 @@ public static Policy getPolicyJustCreditCard(String policyName) {
242242
CreditCardFilterStrategy creditCardFilterStrategy = new CreditCardFilterStrategy();
243243

244244
CreditCard creditCard = new CreditCard();
245-
creditCard.setCreditCardFilterStrategies(Arrays.asList(creditCardFilterStrategy));
245+
creditCard.setCreditCardFilterStrategies(List.of(creditCardFilterStrategy));
246246

247247
Identifiers identifiers = new Identifiers();
248248
identifiers.setCreditCard(creditCard);
@@ -406,13 +406,13 @@ public static Policy getPolicy(String policyName) throws IOException, URISyntaxE
406406
public static Policy getPolicyJustIdentifier(String policyName) {
407407

408408
Identifier identifier1 = new Identifier();
409-
identifier1.setIdentifierFilterStrategies(Arrays.asList(new IdentifierFilterStrategy()));
409+
identifier1.setIdentifierFilterStrategies(List.of(new IdentifierFilterStrategy()));
410410
identifier1.setPattern("\\b\\d{3,8}\\b");
411411
identifier1.setCaseSensitive(false);
412412

413413
Identifiers identifiers = new Identifiers();
414414

415-
identifiers.setIdentifiers(Arrays.asList(identifier1));
415+
identifiers.setIdentifiers(List.of(identifier1));
416416

417417
Policy policy = new Policy();
418418
policy.setName(policyName);

phileas-core/src/test/java/ai/philterd/test/phileas/services/filters/DateFilterTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@ public class DateFilterTest extends AbstractFilterTest {
3838

3939
private FilterConfiguration buildFilterConfiguration() {
4040

41-
final FilterConfiguration filterConfiguration = new FilterConfiguration.FilterConfigurationBuilder()
41+
return new FilterConfiguration.FilterConfigurationBuilder()
4242
.withStrategies(List.of(new DateFilterStrategy()))
4343
.withAnonymizationService(new DateAnonymizationService(new InMemoryCache()))
4444
.withAlertService(alertService)
4545
.build();
4646

47-
return filterConfiguration;
4847
}
4948

5049
@Test
@@ -416,7 +415,7 @@ public void filterDate34() throws Exception {
416415
dateFilterStrategy.setShiftYears(3);
417416

418417
final FilterConfiguration filterConfiguration = new FilterConfiguration.FilterConfigurationBuilder()
419-
.withStrategies(Arrays.asList(dateFilterStrategy))
418+
.withStrategies(List.of(dateFilterStrategy))
420419
.withAnonymizationService(new DateAnonymizationService(new InMemoryCache()))
421420
.withAlertService(alertService)
422421
.build();

phileas-core/src/test/java/ai/philterd/test/phileas/services/postfilters/IgnoredPatternsFilterTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void ignored1() {
3737
ignoredPattern.setName("example-id");
3838

3939
final Policy policy = new Policy();
40-
policy.setIgnoredPatterns(Arrays.asList(ignoredPattern));
40+
policy.setIgnoredPatterns(List.of(ignoredPattern));
4141

4242
final List<Span> spans = new LinkedList<>();
4343
spans.add(Span.make(6, 10, FilterType.IDENTIFIER, "context", "docid", 0.80, "AB01", "*****", "", false, true, new String[0], 0));
@@ -57,12 +57,12 @@ public void notIgnored1() {
5757
ignoredPattern.setName("example-id");
5858

5959
final Policy policy = new Policy();
60-
policy.setIgnoredPatterns(Arrays.asList(ignoredPattern));
60+
policy.setIgnoredPatterns(List.of(ignoredPattern));
6161

6262
final List<Span> spans = new LinkedList<>();
6363
spans.add(Span.make(6, 10, FilterType.IDENTIFIER, "context", "docid", 0.80, "Ab01", "*****", "", false, true, new String[0], 0));
6464

65-
final IgnoredPatternsFilter ignoredPatternsFilter = new IgnoredPatternsFilter(Arrays.asList(ignoredPattern));
65+
final IgnoredPatternsFilter ignoredPatternsFilter = new IgnoredPatternsFilter(List.of(ignoredPattern));
6666
final List<Span> filteredSpans = ignoredPatternsFilter.filter("ID is Ab01.", spans);
6767

6868
Assertions.assertEquals(1, filteredSpans.size());

phileas-model/src/test/java/ai/philterd/test/phileas/model/conditions/FilterConditionGrammarTest.java

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ public class FilterConditionGrammarTest {
3131
@Test
3232
public void testPopulationWithAND() {
3333

34-
final ParserListener parserListener = new ParserListener();
35-
36-
final List<ParsedCondition> conditions = parserListener.getTerminals("population < 2500 and population > 10000");
34+
final List<ParsedCondition> conditions = ParserListener.getTerminals("population < 2500 and population > 10000");
3735

3836
Assertions.assertEquals(2, conditions.size());
3937

@@ -54,9 +52,7 @@ public void testPopulationWithAND() {
5452
@Test
5553
public void testPopulation() {
5654

57-
final ParserListener parserListener = new ParserListener();
58-
59-
final List<ParsedCondition> conditions = parserListener.getTerminals("population < 2500");
55+
final List<ParsedCondition> conditions = ParserListener.getTerminals("population < 2500");
6056

6157
final ParsedCondition parsedCondition = conditions.get(0);
6258

@@ -69,9 +65,7 @@ public void testPopulation() {
6965
@Test
7066
public void testToken() {
7167

72-
final ParserListener parserListener = new ParserListener();
73-
74-
final List<ParsedCondition> conditions = parserListener.getTerminals("token == \"test\"");
68+
final List<ParsedCondition> conditions = ParserListener.getTerminals("token == \"test\"");
7569

7670
ParsedCondition parsedCondition = conditions.get(0);
7771

@@ -84,9 +78,7 @@ public void testToken() {
8478
@Test
8579
public void testNerConditions1() {
8680

87-
final ParserListener parserListener = new ParserListener();
88-
89-
final List<ParsedCondition> conditions = parserListener.getTerminals("confidence != 0.5 and type != LOC");
81+
final List<ParsedCondition> conditions = ParserListener.getTerminals("confidence != 0.5 and type != LOC");
9082

9183
Assertions.assertEquals(2, conditions.size());
9284

@@ -107,9 +99,7 @@ public void testNerConditions1() {
10799
@Test
108100
public void testNerConditions2() {
109101

110-
final ParserListener parserListener = new ParserListener();
111-
112-
final List<ParsedCondition> conditions = parserListener.getTerminals("confidence < 0.4 and type == PER");
102+
final List<ParsedCondition> conditions = ParserListener.getTerminals("confidence < 0.4 and type == PER");
113103

114104
Assertions.assertEquals(2, conditions.size());
115105

0 commit comments

Comments
 (0)