Skip to content

Commit 0261a98

Browse files
author
Aleksandar Damjanovic
committed
Remove jusecase-builders dependency
Replace a(list(of(...))) with List.of() to eliminate the jusecase-builders dependency which was compiled with a newer Java version and broke Java 11 compatibility.
1 parent d1bfa30 commit 0261a98

File tree

3 files changed

+22
-29
lines changed

3 files changed

+22
-29
lines changed

pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@
5757
<version>3.27.7</version>
5858
<scope>test</scope>
5959
</dependency>
60-
<dependency>
61-
<groupId>org.jusecase</groupId>
62-
<artifactId>builders</artifactId>
63-
<version>1.0.0</version>
64-
<scope>test</scope>
65-
</dependency>
6660
</dependencies>
6761

6862
<build>

src/test/java/com/github/zrdj/java/predicates/PredicatesTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import org.assertj.core.api.Assertions;
77
import org.junit.Test;
88

9+
import java.util.List;
910
import java.util.function.Predicate;
1011

1112
import static org.assertj.core.api.Assertions.assertThat;
12-
import static org.jusecase.Builders.*;
1313

1414
public class PredicatesTest {
1515
private final Predicates well = new Predicates.Default();
@@ -41,8 +41,8 @@ public void testFluentCollectionPredicate() {
4141
.and(it.isNotEmpty())
4242
.and(it.containsAnyOf("one", "two"))
4343
.and(it.containsNoneOf("three", "four")))
44-
.accepts(a(list(of("one", "five", "ten"))))
45-
.rejects(null, a(list(of("one", "five", "ten", "four"))));
44+
.accepts(List.of("one", "five", "ten"))
45+
.rejects(null, List.of("one", "five", "ten", "four"));
4646
}
4747

4848
@Test

src/test/java/com/github/zrdj/java/predicates/testcases/AbstractCollectionPredicatesTestcase.java

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.util.List;
88

99
import static org.assertj.core.api.Assertions.assertThat;
10-
import static org.jusecase.Builders.*;
1110

1211
public abstract class AbstractCollectionPredicatesTestcase {
1312
protected final CollectionPredicates checking;
@@ -20,89 +19,89 @@ protected AbstractCollectionPredicatesTestcase() {
2019

2120
@Test
2221
public void testHasSize() {
23-
final List<Object> listWithTwoElements = a(list(of("two", "elements")));
24-
final List<Object> listWithOneElement = a(list(of("one element")));
22+
final List<Object> listWithTwoElements = List.of("two", "elements");
23+
final List<Object> listWithOneElement = List.of("one element");
2524
assertThat(checking.hasSize(1)).accepts(listWithOneElement).rejects(listWithTwoElements);
2625
}
2726

2827
@Test
2928
public void testHasSizeGreaterThan() {
30-
final List<Object> listWithTwoElements = a(list(of("two", "elements")));
31-
final List<Object> listWithOneElement = a(list(of("one element")));
29+
final List<Object> listWithTwoElements = List.of("two", "elements");
30+
final List<Object> listWithOneElement = List.of("one element");
3231
assertThat(checking.hasSizeGreaterThan(1)).accepts(listWithTwoElements).rejects(listWithOneElement);
3332
}
3433

3534
@Test
3635
public void testHasSizeLessThan() {
3736
final List<Object> emptyList = Collections.emptyList();
38-
final List<Object> listWithOneElement = a(list(of("one element")));
37+
final List<Object> listWithOneElement = List.of("one element");
3938
assertThat(checking.hasSizeLessThan(1)).accepts(emptyList).rejects(listWithOneElement);
4039
}
4140

4241
@Test
4342
public void testHasSizeEqualOrGreaterThan() {
4443
final List<Object> emptyList = Collections.emptyList();
45-
final List<Object> listWithOneElement = a(list(of("one element")));
44+
final List<Object> listWithOneElement = List.of("one element");
4645
assertThat(checking.hasSizeEqualOrGreaterThan(1)).accepts(listWithOneElement).rejects(emptyList);
4746
}
4847

4948
@Test
5049
public void testHasSizeEqualOrLessThan() {
51-
final List<Object> listWithTwoElements = a(list(of("two", "elements")));
52-
final List<Object> listWithOneElement = a(list(of("one element")));
50+
final List<Object> listWithTwoElements = List.of("two", "elements");
51+
final List<Object> listWithOneElement = List.of("one element");
5352
final List<Object> emptyList = Collections.emptyList();
5453
assertThat(checking.hasSizeEqualOrLessThan(1)).accepts(emptyList, listWithOneElement).rejects(listWithTwoElements);
5554
}
5655

5756
@Test
5857
public void testEquals() {
59-
final List<String> listWithTwoElements = a(list(of("two", "elements")));
60-
final List<String> listWithOneElement = a(list(of("one element")));
58+
final List<String> listWithTwoElements = List.of("two", "elements");
59+
final List<String> listWithOneElement = List.of("one element");
6160
assertThat(checking.equals(listWithTwoElements)).accepts(listWithTwoElements).rejects(listWithOneElement);
6261
}
6362

6463
@Test
6564
public void testContains() {
66-
final List<String> listWithOneElement = a(list(of("one element")));
65+
final List<String> listWithOneElement = List.of("one element");
6766
final List<String> emptyList = Collections.emptyList();
6867
assertThat(checking.contains("one element")).accepts(listWithOneElement).rejects(emptyList);
6968
}
7069

7170
@Test
7271
public void testContainsAllOf() {
73-
final List<String> listWithTwoElements = a(list(of("two", "elements")));
74-
final List<String> listWithOneElement = a(list(of("one element")));
72+
final List<String> listWithTwoElements = List.of("two", "elements");
73+
final List<String> listWithOneElement = List.of("one element");
7574
final List<String> emptyList = Collections.emptyList();
7675
assertThat(checking.containsAllOf("two", "elements")).accepts(listWithTwoElements).rejects(emptyList, listWithOneElement);
7776
}
7877

7978
@Test
8079
public void testContainsAnyOf() {
81-
final List<String> listWithTwoElements = a(list(of("two", "elements")));
82-
final List<String> listWithOneElement = a(list(of("one element")));
80+
final List<String> listWithTwoElements = List.of("two", "elements");
81+
final List<String> listWithOneElement = List.of("one element");
8382
final List<String> emptyList = Collections.emptyList();
8483
assertThat(checking.containsAnyOf("two", "one element")).accepts(listWithTwoElements, listWithOneElement).rejects(emptyList);
8584
}
8685

8786
@Test
8887
public void testContainsNoneOf() {
89-
final List<String> listWithTwoElements = a(list(of("two", "elements")));
90-
final List<String> listWithOneElement = a(list(of("one element")));
88+
final List<String> listWithTwoElements = List.of("two", "elements");
89+
final List<String> listWithOneElement = List.of("one element");
9190
final List<String> emptyList = Collections.emptyList();
9291
assertThat(checking.containsNoneOf("two", "one element")).accepts(emptyList).rejects(listWithTwoElements, listWithOneElement);
9392
}
9493

9594
@Test
9695
public void testEmpty() {
9796
final List<Object> emptyList = Collections.emptyList();
98-
final List<Object> listWithOneElement = a(list(of("one element")));
97+
final List<Object> listWithOneElement = List.of("one element");
9998
assertThat(checking.isEmpty()).accepts(emptyList).rejects(listWithOneElement);
10099
}
101100

102101
@Test
103102
public void testAny() {
104103
final List<Object> emptyList = Collections.emptyList();
105-
final List<Object> listWithOneElement = a(list(of("one element")));
104+
final List<Object> listWithOneElement = List.of("one element");
106105
assertThat(checking.isNotEmpty()).accepts(listWithOneElement).rejects(emptyList);
107106
}
108107
}

0 commit comments

Comments
 (0)