Convert everything to proper assertThat.

src/test/java/org/leumasjaffe/json/schema/factory/SchemaFactoryTest.java

@@ -1,6 +1,8 @@
 package org.leumasjaffe.json.schema.factory;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.leumasjaffe.json.schema.matcher.Accepts.accepts;
 
 import java.io.File;
 import java.io.IOException;
@@ -94,7 +96,7 @@ public class SchemaFactoryTest {
 	@Test
 	public void testSchemaValidatesDraftV6Schema() throws JsonProcessingException, IOException {
 		JsonNode node = mapper.readTree(new File("src/test/resources/schema6.json"));
-		assertTrue(factory.create(node).accepts(node));
+		assertThat(factory.create(node), accepts(node));
 	}
 
 }

src/test/java/org/leumasjaffe/json/schema/tester/AllItemsTesterTest.java

@@ -1,6 +1,8 @@
 package org.leumasjaffe.json.schema.tester;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
+import static org.leumasjaffe.json.schema.matcher.Accepts.accepts;
+import static org.leumasjaffe.json.schema.matcher.Not.not;
 import static com.fasterxml.jackson.databind.node.JsonNodeType.ARRAY;
 import static com.fasterxml.jackson.databind.node.JsonNodeType.OBJECT;
 
@@ -16,16 +18,16 @@ public class AllItemsTesterTest {
 
 	@Test
 	public void testRejectsNonMatching() {
-		assertFalse(new AllItemsTester(ARRAY, FixedTester.ACCEPT)
-				.accepts(new ObjectNode(JsonNodeFactory.instance)));
-		assertFalse(new AllItemsTester(OBJECT, FixedTester.ACCEPT)
-				.accepts(new ArrayNode(JsonNodeFactory.instance)));
+		assertThat(new AllItemsTester(ARRAY, FixedTester.ACCEPT),
+				not(accepts(new ObjectNode(JsonNodeFactory.instance))));
+		assertThat(new AllItemsTester(OBJECT, FixedTester.ACCEPT),
+				not(accepts(new ArrayNode(JsonNodeFactory.instance))));
 	}
 
 	@Test
 	public void testAcceptsEmptyArray() {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
-		assertTrue(new AllItemsTester(ARRAY, FixedTester.ACCEPT).accepts(node));
+		assertThat(new AllItemsTester(ARRAY, FixedTester.ACCEPT), accepts(node));
 	}
 	
 	@Test
@@ -33,7 +35,7 @@ public class AllItemsTesterTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(false);
 		node.add(true);
-		assertFalse(new AllItemsTester(ARRAY, FixedTester.REJECT).accepts(node));
+		assertThat(new AllItemsTester(ARRAY, FixedTester.REJECT), not(accepts(node)));
 	}
 	
 	@Test
@@ -42,7 +44,7 @@ public class AllItemsTesterTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(false);
 		node.add(true);
-		assertFalse(new AllItemsTester(ARRAY, test).accepts(node));
+		assertThat(new AllItemsTester(ARRAY, test), not(accepts(node)));
 	}
 	
 	@Test
@@ -51,6 +53,6 @@ public class AllItemsTesterTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(true);
 		node.add(true);
-		assertTrue(new AllItemsTester(ARRAY, test).accepts(node));
+		assertThat(new AllItemsTester(ARRAY, test), accepts(node));
 	}
 }

src/test/java/org/leumasjaffe/json/schema/tester/ContainsTesterTest.java

@@ -1,6 +1,8 @@
 package org.leumasjaffe.json.schema.tester;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
+import static org.leumasjaffe.json.schema.matcher.Accepts.accepts;
+import static org.leumasjaffe.json.schema.matcher.Not.not;
 
 import org.junit.Test;
 import org.leumasjaffe.json.schema.Tester;
@@ -14,13 +16,14 @@ public class ContainsTesterTest {
 
 	@Test
 	public void testRejectsNonArray() {
-		assertFalse(new ContainsTester(FixedTester.ACCEPT).accepts(NullNode.getInstance()));
+		assertThat(new ContainsTester(FixedTester.ACCEPT),
+				not(accepts(NullNode.getInstance())));
 	}
 
 	@Test
 	public void testRejectsEmptyArray() {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
-		assertFalse(new ContainsTester(FixedTester.ACCEPT).accepts(node));
+		assertThat(new ContainsTester(FixedTester.ACCEPT), not(accepts(node)));
 	}
 	
 	@Test
@@ -28,7 +31,7 @@ public class ContainsTesterTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(false);
 		node.add(true);
-		assertFalse(new ContainsTester(FixedTester.REJECT).accepts(node));
+		assertThat(new ContainsTester(FixedTester.REJECT), not(accepts(node)));
 	}
 	
 	@Test
@@ -37,6 +40,6 @@ public class ContainsTesterTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(false);
 		node.add(true);
-		assertTrue(new ContainsTester(test).accepts(node));
+		assertThat(new ContainsTester(test), accepts(node));
 	}
 }

src/test/java/org/leumasjaffe/json/schema/tester/DependencyTesterTest.java

@@ -1,6 +1,8 @@
 package org.leumasjaffe.json.schema.tester;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
+import static org.leumasjaffe.json.schema.matcher.Accepts.accepts;
+import static org.leumasjaffe.json.schema.matcher.Not.not;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,7 +25,7 @@ public class DependencyTesterTest {
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
 		node.set("A", BooleanNode.TRUE);
 		
-		assertFalse(new DependencyTester(expect).accepts(node));
+		assertThat(new DependencyTester(expect), not(accepts(node)));
 	}
 
 	@Test
@@ -34,6 +36,6 @@ public class DependencyTesterTest {
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
 		node.set("A", BooleanNode.TRUE);
 		
-		assertTrue(new DependencyTester(expect).accepts(node));
+		assertThat(new DependencyTester(expect), accepts(node));
 	}
 }

src/test/java/org/leumasjaffe/json/schema/tester/ItemsTesterTest.java

@@ -1,6 +1,8 @@
 package org.leumasjaffe.json.schema.tester;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
+import static org.leumasjaffe.json.schema.matcher.Accepts.accepts;
+import static org.leumasjaffe.json.schema.matcher.Not.not;
 
 import org.junit.Test;
 import org.leumasjaffe.json.schema.Tester;
@@ -14,13 +16,13 @@ public class ItemsTesterTest {
 	
 	@Test
 	public void testRejectsNonArray() {
-		assertFalse(new ItemsTester(FixedTester.ACCEPT).accepts(NullNode.getInstance()));
+		assertThat(new ItemsTester(FixedTester.ACCEPT), not(accepts(NullNode.getInstance())));
 	}
 
 	@Test
 	public void testAcceptsEmptyArray() {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
-		assertTrue(new ItemsTester(FixedTester.ACCEPT).accepts(node));
+		assertThat(new ItemsTester(FixedTester.ACCEPT), accepts(node));
 	}
 	
 	@Test
@@ -28,7 +30,7 @@ public class ItemsTesterTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(false);
 		node.add(true);
-		assertFalse(new ItemsTester(FixedTester.REJECT).accepts(node));
+		assertThat(new ItemsTester(FixedTester.REJECT), not(accepts(node)));
 	}
 	
 	@Test
@@ -37,7 +39,7 @@ public class ItemsTesterTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(true);
 		node.add(false);
-		assertTrue(new ItemsTester(test).accepts(node));
+		assertThat(new ItemsTester(test), accepts(node));
 	}
 	
 	@Test
@@ -46,7 +48,7 @@ public class ItemsTesterTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(true);
 		node.add(false);
-		assertTrue(new ItemsTester(test, FixedTester.ACCEPT, FixedTester.REJECT)
-				.accepts(node));
+		assertThat(new ItemsTester(test, FixedTester.ACCEPT, FixedTester.REJECT),
+				accepts(node));
 	}
 }

src/test/java/org/leumasjaffe/json/schema/tester/NumberTesterTest.java

@@ -1,6 +1,8 @@
 package org.leumasjaffe.json.schema.tester;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
+import static org.leumasjaffe.json.schema.matcher.Accepts.accepts;
+import static org.leumasjaffe.json.schema.matcher.Not.not;
 
 import java.util.function.DoublePredicate;
 
@@ -14,16 +16,16 @@ public class NumberTesterTest {
 	
 	@Test
 	public void testRejectsNonNumber() {
-		assertFalse(new NumberTester(nonZero).accepts(NullNode.getInstance()));
+		assertThat(new NumberTester(nonZero), not(accepts(NullNode.getInstance())));
 	}
 
 	@Test
 	public void testRejectsFailingPred() {
-		assertFalse(new NumberTester(nonZero).accepts(new DoubleNode(0.0)));
+		assertThat(new NumberTester(nonZero), not(accepts(new DoubleNode(0.0))));
 	}
 
 	@Test
 	public void testAcceptsPassingPred() {
-		assertTrue(new NumberTester(nonZero).accepts(new DoubleNode(1.0)));
+		assertThat(new NumberTester(nonZero), accepts(new DoubleNode(1.0)));
 	}
 }

src/test/java/org/leumasjaffe/json/schema/tester/UniqueItemTesterTest.java

@@ -1,6 +1,8 @@
 package org.leumasjaffe.json.schema.tester;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
+import static org.leumasjaffe.json.schema.matcher.Accepts.accepts;
+import static org.leumasjaffe.json.schema.matcher.Not.not;
 
 import org.junit.Test;
 
@@ -13,13 +15,13 @@ public class UniqueItemTesterTest {
 	@Test
 	public void testAcceptsEmptyArray() {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
-		assertTrue(new UniqueItemTester().accepts(node));
+		assertThat(new UniqueItemTester(), accepts(node));
 	}
 
 	@Test
 	public void testRejectsNonArray() {
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
-		assertFalse(new UniqueItemTester().accepts(node));
+		assertThat(new UniqueItemTester(), not(accepts(node)));
 	}
 	
 	@Test
@@ -27,6 +29,6 @@ public class UniqueItemTesterTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(1.5);
 		node.add(1.5);
-		assertFalse(new UniqueItemTester().accepts(node));
+		assertThat(new UniqueItemTester(), not(accepts(node)));
 	}
 }