Skip to content

Commit 3b73725

Browse files
victornoelvictornoel
committed
(yegor256#1597) Bump cactoos-matchers to 0.25
1 parent 5210945 commit 3b73725

19 files changed

+55
-56
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ The MIT License (MIT)
9191
<dependency>
9292
<groupId>org.llorllale</groupId>
9393
<artifactId>cactoos-matchers</artifactId>
94-
<version>0.24</version>
94+
<version>0.25</version>
9595
<scope>test</scope>
9696
<exclusions>
9797
<exclusion>

‎src/test/java/org/cactoos/bytes/HexOfTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.hamcrest.core.IsEqual;
3030
import org.junit.jupiter.api.Test;
3131
import org.llorllale.cactoos.matchers.Assertion;
32+
import org.llorllale.cactoos.matchers.Satisfies;
3233
import org.llorllale.cactoos.matchers.Throws;
33-
import org.llorllale.cactoos.matchers.Verifies;
3434

3535
/**
3636
* Test case for {@link HexOf}.
@@ -47,7 +47,7 @@ public void emptyText() throws Exception {
4747
new Assertion<>(
4848
"Must represent an empty hexadecimal text",
4949
new HexOf(new TextOf("")).asBytes(),
50-
new Verifies<>(array -> array.length == 0)
50+
new Satisfies<>(array -> array.length == 0)
5151
).affirm();
5252
}
5353

‎src/test/java/org/cactoos/collection/BehavesAsCollection.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.hamcrest.core.IsNot;
3434
import org.llorllale.cactoos.matchers.Assertion;
3535
import org.llorllale.cactoos.matchers.HasValues;
36-
import org.llorllale.cactoos.matchers.Verifies;
36+
import org.llorllale.cactoos.matchers.Satisfies;
3737

3838
/**
3939
* Matcher for collection.
@@ -78,7 +78,7 @@ public boolean matchesSafely(final Collection<E> col) {
7878
"Size must be more than 0",
7979
col,
8080
new IsCollectionWithSize<>(
81-
new Verifies<>(s -> s > 0)
81+
new Satisfies<>(s -> s > 0)
8282
)
8383
).affirm();
8484
new Assertion<>(

‎src/test/java/org/cactoos/experimental/ThreadsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
import java.util.concurrent.ExecutorService;
3131
import java.util.concurrent.Executors;
3232
import java.util.concurrent.TimeUnit;
33+
import org.cactoos.scalar.LengthOf;
3334
import org.junit.jupiter.api.RepeatedTest;
3435
import org.junit.jupiter.api.Test;
3536
import org.llorllale.cactoos.matchers.Assertion;
3637
import org.llorllale.cactoos.matchers.HasValues;
3738
import org.llorllale.cactoos.matchers.Throws;
38-
import org.llorllale.cactoos.shaded.org.cactoos.scalar.LengthOf;
3939

4040
/**
4141
* Test case for {@link Threads}.

‎src/test/java/org/cactoos/func/AsyncTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.junit.jupiter.api.Test;
3232
import org.llorllale.cactoos.matchers.Assertion;
3333
import org.llorllale.cactoos.matchers.IsApplicable;
34-
import org.llorllale.cactoos.matchers.Verifies;
34+
import org.llorllale.cactoos.matchers.Satisfies;
3535

3636
/**
3737
* Test case for {@link Async}.
@@ -52,7 +52,7 @@ void runsInBackground() {
5252
),
5353
new IsApplicable<>(
5454
true,
55-
new Verifies<>(
55+
new Satisfies<>(
5656
future -> !future.isDone()
5757
)
5858
)
@@ -87,7 +87,7 @@ void runsInBackgroundWithoutFuture() {
8787
),
8888
new IsApplicable<>(
8989
true,
90-
new Verifies<>(
90+
new Satisfies<>(
9191
future -> latch.await(1L, TimeUnit.SECONDS)
9292
)
9393
)
@@ -117,7 +117,7 @@ void runsInBackgroundWithThreadFactory() {
117117
),
118118
new IsApplicable<>(
119119
name,
120-
new Verifies<>(
120+
new Satisfies<>(
121121
future -> {
122122
future.get();
123123
return latch.getCount() == 0;
@@ -150,7 +150,7 @@ void runsInBackgroundWithExecutorService() {
150150
),
151151
new IsApplicable<>(
152152
name,
153-
new Verifies<>(
153+
new Satisfies<>(
154154
future -> {
155155
future.get();
156156
return latch.getCount() == 0;

‎src/test/java/org/cactoos/func/BiFuncOfTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.hamcrest.core.IsSame;
3131
import org.junit.jupiter.api.Test;
3232
import org.llorllale.cactoos.matchers.Assertion;
33-
import org.llorllale.cactoos.matchers.Verifies;
33+
import org.llorllale.cactoos.matchers.Satisfies;
3434

3535
/**
3636
* Test case for {@link BiFuncOf}.
@@ -48,7 +48,7 @@ void convertsFuncIntoBiFunc() throws Exception {
4848
new BiFuncOf<>(
4949
new FuncOf<>(input -> input)
5050
),
51-
new Verifies<>(
51+
new Satisfies<>(
5252
func -> {
5353
final Object first = new Object();
5454
final Object res = func.apply(first, "discarded");
@@ -72,7 +72,7 @@ void convertsProcIntoBiFunc() throws Exception {
7272
),
7373
result
7474
),
75-
new Verifies<>(
75+
new Satisfies<>(
7676
func -> {
7777
final Object first = new Object();
7878
final Object res = func.apply(first, "discarded");
@@ -97,7 +97,7 @@ void convertsLambdaIntoBiFunc() throws Exception {
9797
new Assertion<>(
9898
"Must convert lambda into bi-function",
9999
new BiFuncOf<>((first, second) -> new Object[] {first, second}),
100-
new Verifies<BiFunc<Object, Object, Object[]>>(
100+
new Satisfies<BiFunc<Object, Object, Object[]>>(
101101
func -> {
102102
final Object first = new Object();
103103
final Object second = new Object();

‎src/test/java/org/cactoos/func/FuncOfTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.cactoos.scalar.Constant;
2929
import org.junit.jupiter.api.Test;
3030
import org.llorllale.cactoos.matchers.Assertion;
31-
import org.llorllale.cactoos.matchers.Verifies;
31+
import org.llorllale.cactoos.matchers.Satisfies;
3232

3333
/**
3434
* Test case for {@link FuncOf}.
@@ -50,7 +50,7 @@ void convertsProcIntoFunc() throws Exception {
5050
),
5151
result
5252
),
53-
new Verifies<>(
53+
new Satisfies<>(
5454
func -> {
5555
final Object input = new Object();
5656
final Object res = func.apply(input);
@@ -66,7 +66,7 @@ void convertsScalarIntoFunc() throws Exception {
6666
new Assertion<>(
6767
"Must convert Scalar into Func",
6868
new FuncOf<>(new Constant<>(result)),
69-
new Verifies<>(
69+
new Satisfies<>(
7070
func -> {
7171
final Object res = func.apply("discarded");
7272
return res.equals(result);
@@ -80,7 +80,7 @@ void convertsLambdaIntoFunc() throws Exception {
8080
new Assertion<>(
8181
"Must convert Lambda into Func",
8282
new FuncOf<>(input -> input),
83-
new Verifies<>(
83+
new Satisfies<>(
8484
func -> {
8585
final Object input = new Object();
8686
final Object res = func.apply(input);

‎src/test/java/org/cactoos/io/CloseShieldInputStreamTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.junit.jupiter.api.Test;
3131
import org.llorllale.cactoos.matchers.Assertion;
3232
import org.llorllale.cactoos.matchers.IsText;
33-
import org.llorllale.cactoos.matchers.Verifies;
33+
import org.llorllale.cactoos.matchers.Satisfies;
3434

3535
/**
3636
* Test case for {@link CloseShieldInputStream}.
@@ -73,7 +73,7 @@ void makesDataAvailable() throws IOException {
7373
new Assertion<>(
7474
"Must show that data is available",
7575
new CloseShieldInputStream(in).available(),
76-
new Verifies<>(l -> l > 0)
76+
new Satisfies<>(l -> l > 0)
7777
).affirm();
7878
}
7979
}

‎src/test/java/org/cactoos/io/InputOfTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
import org.llorllale.cactoos.matchers.HasString;
4646
import org.llorllale.cactoos.matchers.IsTrue;
4747
import org.llorllale.cactoos.matchers.MatchesRegex;
48+
import org.llorllale.cactoos.matchers.Satisfies;
4849
import org.llorllale.cactoos.matchers.StartsWith;
49-
import org.llorllale.cactoos.matchers.Verifies;
5050
import org.takes.http.FtRemote;
5151
import org.takes.tk.TkHtml;
5252

@@ -127,7 +127,7 @@ void readsFileContent() throws Exception {
127127
)
128128
)
129129
).asBytes(),
130-
new Verifies<>(arr -> arr.length > 0)
130+
new Satisfies<>(arr -> arr.length > 0)
131131
).affirm();
132132
}
133133

@@ -312,7 +312,7 @@ void makesDataAvailable() throws Exception {
312312
new Assertion<>(
313313
"must show that data is available",
314314
new InputOf(content).stream(),
315-
new Verifies<>(s -> s.available() > 0)
315+
new Satisfies<>(s -> s.available() > 0)
316316
).affirm();
317317
}
318318

‎src/test/java/org/cactoos/io/InputStreamOfTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.junit.rules.TemporaryFolder;
3939
import org.llorllale.cactoos.matchers.Assertion;
4040
import org.llorllale.cactoos.matchers.HasContent;
41-
import org.llorllale.cactoos.matchers.Verifies;
41+
import org.llorllale.cactoos.matchers.Satisfies;
4242

4343
/**
4444
* Test case for {@link InputStreamOf}.
@@ -94,7 +94,7 @@ public void makesDataAvailable() throws IOException {
9494
new Assertion<>(
9595
"Must show that data is available",
9696
new InputStreamOf(content).available(),
97-
new Verifies<>(x -> x > 0)
97+
new Satisfies<>(x -> x > 0)
9898
).affirm();
9999
}
100100

0 commit comments

Comments
 (0)