Skip to content

Commit 170a069

Browse files
committed
Convert vavr Try to use assertion helpers.
1 parent 9ae0b80 commit 170a069

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/test/java/org/eclipse/biscuit/token/BiscuitTest.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
import static org.eclipse.biscuit.token.builder.Utils.var;
1616
import static org.junit.jupiter.api.Assertions.assertEquals;
1717
import static org.junit.jupiter.api.Assertions.assertThrows;
18-
import static org.junit.jupiter.api.Assertions.assertTrue;
1918
import static org.junit.jupiter.api.Assertions.fail;
2019

2120
import biscuit.format.schema.Schema;
22-
import io.vavr.control.Try;
2321
import java.security.InvalidKeyException;
2422
import java.security.NoSuchAlgorithmException;
2523
import java.security.SecureRandom;
@@ -38,6 +36,7 @@
3836
import org.eclipse.biscuit.error.FailedCheck;
3937
import org.eclipse.biscuit.error.LogicError;
4038
import org.eclipse.biscuit.token.builder.Block;
39+
import org.junit.jupiter.api.Assertions;
4140
import org.junit.jupiter.api.Test;
4241

4342
public class BiscuitTest {
@@ -332,17 +331,15 @@ public void testReset() throws Error {
332331
v3.addFact("resource(\"/folder2/file3\")");
333332
v3.addFact("operation(\"read\")");
334333

335-
Try<Long> res = Try.of(() -> v3.authorize());
334+
Assertions.assertThrows(Error.class, v3::authorize);
336335
System.out.println(v3.formatWorld());
337336

338-
assertTrue(res.isFailure());
339-
340337
Authorizer v4 = v1.clone();
341338

342339
v4.addFact("resource(\"/folder2/file1\")");
343340
v4.addFact("operation(\"write\")");
344341

345-
Error e = (Error) Try.of(() -> v4.authorize()).getCause();
342+
var e = Assertions.assertThrows(Error.class, v4::authorize);
346343

347344
System.out.println(v4.formatWorld());
348345
for (FailedCheck f : e.getFailedChecks().get()) {
@@ -402,7 +399,7 @@ public void testEmptyAuthorizer() throws Error {
402399
v1.addFact("resource(\"/folder2/file1\")");
403400
v1.addFact("operation(\"write\")");
404401

405-
assertTrue(Try.of(() -> v1.authorize()).isFailure());
402+
assertThrows(Error.class, v1::authorize);
406403
}
407404

408405
@Test

0 commit comments

Comments
 (0)