Unify with FJ series/5.x branch

mperry · mperry · commit d2744315f4ad · 2022-02-15T00:08:12.000+10:00
diff --git a/core/src/test/java/fj/ClassTest.java b/core/src/test/java/fj/ClassTest.java
@@ -8,9 +8,10 @@
 
 import java.lang.reflect.Type;
 import java.util.Collection;
+import java.util.Iterator;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class ClassTest {
     @Test
diff --git a/core/src/test/java/fj/FFunctionsTest.java b/core/src/test/java/fj/FFunctionsTest.java
@@ -4,7 +4,6 @@
 import fj.data.TreeZipper;
 import org.junit.Test;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 public class FFunctionsTest {
diff --git a/core/src/test/java/fj/MonoidTest.java b/core/src/test/java/fj/MonoidTest.java
@@ -10,7 +10,6 @@
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 public class MonoidTest {
 
   @Test
diff --git a/core/src/test/java/fj/OrderingTest.java b/core/src/test/java/fj/OrderingTest.java
@@ -8,10 +8,8 @@
 import static fj.Ordering.GT;
 import static fj.Ordering.LT;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 public class OrderingTest {
 
   @Test
diff --git a/core/src/test/java/fj/PTest.java b/core/src/test/java/fj/PTest.java
@@ -6,7 +6,6 @@
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 public class PTest {
     @Test
     public void testPF(){
diff --git a/core/src/test/java/fj/TryEffectTest.java b/core/src/test/java/fj/TryEffectTest.java
@@ -4,9 +4,8 @@
 import fj.function.TryEffect0;
 import fj.function.TryEffect1;
 import org.junit.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class TryEffectTest {
 
diff --git a/core/src/test/java/fj/data/IOFunctionsTest.java b/core/src/test/java/fj/data/IOFunctionsTest.java
@@ -12,8 +12,8 @@
 import static fj.data.Stream.cons;
 import static fj.data.Stream.nil_;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
 
 public class IOFunctionsTest {
 
diff --git a/core/src/test/java/fj/data/ListTest.java b/core/src/test/java/fj/data/ListTest.java
@@ -30,10 +30,10 @@
 import static fj.data.Validation.fail;
 import static fj.data.Validation.*;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.*;
-
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.hamcrest.MatcherAssert.assertThat;
-
+import static org.junit.Assert.assertEquals;
 
 public class ListTest {
 
diff --git a/core/src/test/java/fj/data/SetTest.java b/core/src/test/java/fj/data/SetTest.java
@@ -8,7 +8,6 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 public class SetTest {
 
 	@Test
diff --git a/core/src/test/java/fj/data/StreamTest.java b/core/src/test/java/fj/data/StreamTest.java
@@ -38,7 +38,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 public class StreamTest {
 
   @Test
diff --git a/core/src/test/java/fj/data/TreeMapTest.java b/core/src/test/java/fj/data/TreeMapTest.java
@@ -16,9 +16,8 @@
 import static fj.data.TreeMap.iterableTreeMap;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.hamcrest.MatcherAssert.assertThat;
-
+import static org.junit.Assert.assertTrue;
 
 public class TreeMapTest {
 
diff --git a/core/src/test/java/fj/data/TreeTest.java b/core/src/test/java/fj/data/TreeTest.java
@@ -6,7 +6,6 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 public class TreeTest {
 
     @Test
diff --git a/core/src/test/java/fj/data/TreeZipperTest.java b/core/src/test/java/fj/data/TreeZipperTest.java
@@ -6,7 +6,6 @@
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 public class TreeZipperTest {
     @Test
     public void testDelete() {
diff --git a/core/src/test/java/fj/data/ValidationTest.java b/core/src/test/java/fj/data/ValidationTest.java
@@ -40,7 +40,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 
-
 public class ValidationTest {
     @Test
     public void testParseShort() {
diff --git a/core/src/test/java/fj/function/DoublesTest.java b/core/src/test/java/fj/function/DoublesTest.java
@@ -1,6 +1,8 @@
 package fj.function;
 
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
 
 import fj.F;
 import org.junit.Test;
@@ -9,11 +11,10 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import static org.junit.Assert.assertTrue;
 import static org.hamcrest.core.Is.is;
 
 import static fj.data.List.list;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 
 public class DoublesTest {
 
diff --git a/core/src/test/java/fj/function/IntegersTest.java b/core/src/test/java/fj/function/IntegersTest.java
@@ -8,9 +8,10 @@
 import static fj.data.List.list;
 import static fj.data.Option.none;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
-import static org.hamcrest.MatcherAssert.assertThat;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
 
 public class IntegersTest {
 
diff --git a/core/src/test/java/fj/function/LongsTest.java b/core/src/test/java/fj/function/LongsTest.java
@@ -8,8 +8,9 @@
 import static fj.data.List.list;
 import static fj.data.Option.none;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 
 public class LongsTest {
diff --git a/core/src/test/java/fj/function/VisitorTest.java b/core/src/test/java/fj/function/VisitorTest.java
@@ -13,7 +13,6 @@
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 public class VisitorTest {
     @Test
     public void testFindFirst() {
diff --git a/core/src/test/java/fj/parser/ParserTest.java b/core/src/test/java/fj/parser/ParserTest.java
@@ -8,10 +8,8 @@
 
 import static fj.parser.Result.result;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 public class ParserTest {
     @Test
     public void testParserFail() {
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -8,7 +8,7 @@ archivesBaseName = "${project.projectName}-${project.name}"
 dependencies {
     api project(":core")
     api project(":quickcheck")
-    api junitCompile
+    testImplementation junitCompile
     testImplementation junitRuntime
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -4,4 +4,8 @@ signingEnabled = false
 sonatypeUsername = incorrectUser
 sonatypePassword = incorrectPwd
 
+#signing.keyId=
+#signing.password=
+#signing.secretKeyRingFile=
+
 org.gradle.parallel = true
diff --git a/props-core/src/test/java/fj/data/ReaderTest.java b/props-core/src/test/java/fj/data/ReaderTest.java
@@ -10,8 +10,9 @@
 import static fj.test.Property.prop;
 import static fj.test.Property.property;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertTrue;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 
 public class ReaderTest {
 
diff --git a/props-core/src/test/java/fj/data/properties/PriorityQueueProperties.java b/props-core/src/test/java/fj/data/properties/PriorityQueueProperties.java
@@ -24,7 +24,7 @@
 import static fj.test.Property.prop;
 import static fj.test.Property.property;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 @RunWith(PropertyTestRunner.class)
 @CheckParams(maxSize = 100)
