Skip to content

Commit df6e6f8

Browse files
mperrymperry
committed
Updated H2 lib to 2.1.210. Updated deprecated Assert.assertThat to MatcherAssert.assertThat
1 parent c4ebbb5 commit df6e6f8

15 files changed

Lines changed: 34 additions & 19 deletions

‎core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ archivesBaseName = project.projectName
88
dependencies {
99
testCompile junitCompile
1010
testRuntime junitRuntime
11-
testCompile 'com.h2database:h2:1.4.199'
11+
testCompile 'com.h2database:h2:2.1.210'
1212
testCompile 'commons-dbutils:commons-dbutils:1.7'
1313
}
1414

‎core/src/test/java/fj/FFunctionsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import fj.data.TreeZipper;
55
import org.junit.Test;
66
import static org.hamcrest.core.Is.is;
7-
import static org.junit.Assert.*;
7+
import static org.hamcrest.MatcherAssert.assertThat;
88

99
public class FFunctionsTest {
1010

‎core/src/test/java/fj/OrderingTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import static fj.Ordering.GT;
99
import static fj.Ordering.LT;
1010
import static org.hamcrest.core.Is.is;
11-
import static org.junit.Assert.*;
11+
import static org.hamcrest.MatcherAssert.assertThat;
1212

1313
public class OrderingTest {
1414

‎core/src/test/java/fj/PTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import static fj.Function.identity;
66
import static org.hamcrest.core.Is.is;
7-
import static org.junit.Assert.assertThat;
7+
import static org.hamcrest.MatcherAssert.assertThat;
88

99
public class PTest {
1010
@Test

‎core/src/test/java/fj/TryEffectTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import fj.function.TryEffect1;
66
import org.junit.Test;
77
import static org.hamcrest.core.Is.is;
8-
import static org.junit.Assert.*;
8+
import static org.hamcrest.MatcherAssert.assertThat;
99

1010
public class TryEffectTest {
1111

‎core/src/test/java/fj/control/parallel/StrategyTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
import static fj.control.parallel.Strategy.*;
1717
import static fj.data.Stream.range;
1818
import static org.hamcrest.core.Is.is;
19-
import static org.junit.Assert.assertThat;
19+
import static org.hamcrest.MatcherAssert.assertThat;
20+
2021

2122
public class StrategyTest {
2223

‎core/src/test/java/fj/data/BooleansTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static fj.data.List.list;
1010
import static fj.function.Booleans.isnot;
1111
import static org.hamcrest.core.Is.is;
12+
import static org.hamcrest.MatcherAssert.assertThat;
1213

1314
public class BooleansTest {
1415

@@ -70,7 +71,7 @@ public void testIsNot(){
7071
F<Integer, Boolean> f1 = a -> a == 4;
7172
List<String> result = list("some", "come", "done!").filter(isnot(String::length, f1));
7273

73-
Assert.assertThat(result.length(), is(1));
74+
assertThat(result.length(), is(1));
7475
Assert.assertEquals(result, list("done!"));
7576

7677
}

‎core/src/test/java/fj/data/IOFunctionsTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
import static fj.data.Stream.cons;
1313
import static fj.data.Stream.nil_;
1414
import static org.hamcrest.CoreMatchers.is;
15-
import static org.junit.Assert.*;
15+
import static org.hamcrest.MatcherAssert.assertThat;
16+
import static org.junit.Assert.fail;
1617

1718
public class IOFunctionsTest {
1819

@@ -33,8 +34,8 @@ public void close() {
3334
r -> () -> new BufferedReader(r).readLine()
3435
);
3536

36-
Assert.assertThat(bracketed.run(), is("Read OK"));
37-
Assert.assertThat(closed.get(), is(true));
37+
assertThat(bracketed.run(), is("Read OK"));
38+
assertThat(closed.get(), is(true));
3839
}
3940

4041
@Test
@@ -59,9 +60,9 @@ public void close() {
5960
bracketed.run();
6061
fail("Exception expected");
6162
} catch (IllegalArgumentException e) {
62-
Assert.assertThat(e.getMessage(), is("OoO"));
63+
assertThat(e.getMessage(), is("OoO"));
6364
}
64-
Assert.assertThat(closed.get(), is(true));
65+
assertThat(closed.get(), is(true));
6566
}
6667

6768
@Test

‎core/src/test/java/fj/data/ListTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
import static fj.data.Validation.fail;
3131
import static fj.data.Validation.*;
3232
import static org.hamcrest.CoreMatchers.equalTo;
33-
import static org.junit.Assert.*;
33+
import static org.junit.Assert.assertFalse;
34+
import static org.junit.Assert.assertTrue;
35+
import static org.hamcrest.MatcherAssert.assertThat;
36+
import static org.junit.Assert.assertEquals;
3437

3538
public class ListTest {
3639

‎core/src/test/java/fj/data/List_Traverse_Tests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import static fj.data.List.list;
88
import static fj.data.Option.some;
99
import static org.hamcrest.CoreMatchers.is;
10-
import static org.junit.Assert.assertThat;
10+
import static org.hamcrest.MatcherAssert.assertThat;
1111

1212
public class List_Traverse_Tests {
1313

0 commit comments

Comments
 (0)