Convert all other tests to use accepts() in assertTrue clauses.

src/test/java/org/leumasjaffe/json/schema/SchemaTest.java

@@ -127,9 +127,9 @@ public class SchemaTest {
 		Schema schema = new Schema(tests);
 		
 		assertFalse(schema.accepts(new DoubleNode(0.0)));
-		assertTrue(schema.accepts(new DoubleNode(0.5)));
-		assertTrue(schema.accepts(new DoubleNode(0.6)));
-		assertTrue(schema.accepts(new DoubleNode(1.0)));
+		assertThat(schema, accepts(new DoubleNode(0.5)));
+		assertThat(schema, accepts(new DoubleNode(0.6)));
+		assertThat(schema, accepts(new DoubleNode(1.0)));
 		assertFalse(schema.accepts(new DoubleNode(1.1)));
 	}
 
@@ -191,7 +191,7 @@ public class SchemaTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(0.5);
 		node.add("https://google.com");
-		assertTrue(schema.accepts(node));
+		assertThat(schema, accepts(node));
 		node.add(true);
 		assertFalse(schema.accepts(node));
 
@@ -228,7 +228,7 @@ public class SchemaTest {
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		assertFalse(schema.accepts(node));
 		node.add(true);
-		assertTrue(schema.accepts(node));
+		assertThat(schema, accepts(node));
 	}
 
 
@@ -261,7 +261,7 @@ public class SchemaTest {
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
 		node.set("float", new DoubleNode(0.5));
 		node.set("string", new TextNode("https://google.com"));
-		assertTrue(schema.accepts(node));
+		assertThat(schema, accepts(node));
 		node.set("boolean", BooleanNode.TRUE);
 		assertFalse(schema.accepts(node));
 
@@ -281,7 +281,7 @@ public class SchemaTest {
 
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
 		node.set("string", new TextNode("https://google.com"));
-		assertTrue(schema.accepts(node));
+		assertThat(schema, accepts(node));
 		node.set("float", new DoubleNode(0.5));
 		assertFalse(schema.accepts(node));
 	}
@@ -314,5 +314,5 @@ public class SchemaTest {
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
 		assertFalse(schema.accepts(node));
 		node.set("A", BooleanNode.TRUE);
-		assertTrue(schema.accepts(node));
+		assertThat(schema, accepts(node));
 	}}

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

@@ -52,46 +52,46 @@ public class SchemaV6FactoryTest {
 	@Test
 	public void testIDSchema() {
 		Tester test = fromSingleElement("{ \"$id\": \"test.json\" }");
-		assertTrue(test.accepts(NullNode.getInstance()));
+		assertThat(test, accepts(NullNode.getInstance()));
 	}
 	
 	@Test
 	public void testSchemaSchema() {
 		Tester test = fromSingleElement("{ \"$schema\": \"http://json-schema.org/draft-06/schema#\" }");
-		assertTrue(test.accepts(NullNode.getInstance()));
+		assertThat(test, accepts(NullNode.getInstance()));
 	}
 	
 	@Test
 	public void testTitleSchema() {
 		Tester test = fromSingleElement("{ \"title\": \"This is a schema\" }");
-		assertTrue(test.accepts(NullNode.getInstance()));
+		assertThat(test, accepts(NullNode.getInstance()));
 	}
 	
 	@Test
 	public void testDescriptionSchema() {
 		Tester test = fromSingleElement("{ \"description\": \"This is a schema\" }");
-		assertTrue(test.accepts(NullNode.getInstance()));
+		assertThat(test, accepts(NullNode.getInstance()));
 	}
 	
 	@Test
 	public void testDefaultSchema() {
 		Tester test = fromSingleElement("{ \"default\": {} }");
-		assertTrue(test.accepts(NullNode.getInstance()));
+		assertThat(test, accepts(NullNode.getInstance()));
 	}
 
 	@Test
 	public void testExamplesSchema() {
 		Tester test = fromSingleElement("{ \"examples\": [] }");
-		assertTrue(test.accepts(NullNode.getInstance()));
+		assertThat(test, accepts(NullNode.getInstance()));
 	}
 	
 	@Test
 	public void testMultipleOfSchema() {
 		Tester test = fromSingleElement("{ \"multipleOf\": 1.5 }");
 		assertFalse(test.accepts(NullNode.getInstance()));
-		assertTrue(test.accepts(new DoubleNode(1.5)));
-		assertTrue(test.accepts(new DoubleNode(3.0)));
-		assertTrue(test.accepts(new IntNode(3)));
+		assertThat(test, accepts(new DoubleNode(1.5)));
+		assertThat(test, accepts(new DoubleNode(3.0)));
+		assertThat(test, accepts(new IntNode(3)));
 		assertFalse(test.accepts(new DoubleNode(2.5)));
 	}
 	
@@ -99,20 +99,20 @@ public class SchemaV6FactoryTest {
 	public void testMaximumSchema() {
 		Tester test = fromSingleElement("{ \"maximum\": 2.5 }");
 		assertFalse(test.accepts(NullNode.getInstance()));
-		assertTrue(test.accepts(new DoubleNode(1.5)));
+		assertThat(test, accepts(new DoubleNode(1.5)));
 		assertFalse(test.accepts(new DoubleNode(3.0)));
-		assertTrue(test.accepts(new IntNode(2)));
+		assertThat(test, accepts(new IntNode(2)));
 		assertFalse(test.accepts(new IntNode(3)));
-		assertTrue(test.accepts(new DoubleNode(2.5)));
+		assertThat(test, accepts(new DoubleNode(2.5)));
 	}
 	
 	@Test
 	public void testExclusiveMaximumSchema() {
 		Tester test = fromSingleElement("{ \"exclusiveMaximum\": 2.5 }");
 		assertFalse(test.accepts(NullNode.getInstance()));
-		assertTrue(test.accepts(new DoubleNode(1.5)));
+		assertThat(test, accepts(new DoubleNode(1.5)));
 		assertFalse(test.accepts(new DoubleNode(3.0)));
-		assertTrue(test.accepts(new IntNode(2)));
+		assertThat(test, accepts(new IntNode(2)));
 		assertFalse(test.accepts(new IntNode(3)));
 		assertFalse(test.accepts(new DoubleNode(2.5)));
 	}
@@ -122,10 +122,10 @@ public class SchemaV6FactoryTest {
 		Tester test = fromSingleElement("{ \"minimum\": 2.5 }");
 		assertFalse(test.accepts(NullNode.getInstance()));
 		assertFalse(test.accepts(new DoubleNode(1.5)));
-		assertTrue(test.accepts(new DoubleNode(3.0)));
+		assertThat(test, accepts(new DoubleNode(3.0)));
 		assertFalse(test.accepts(new IntNode(2)));
-		assertTrue(test.accepts(new IntNode(3)));
-		assertTrue(test.accepts(new DoubleNode(2.5)));
+		assertThat(test, accepts(new IntNode(3)));
+		assertThat(test, accepts(new DoubleNode(2.5)));
 	}
 	
 	@Test
@@ -133,9 +133,9 @@ public class SchemaV6FactoryTest {
 		Tester test = fromSingleElement("{ \"exclusiveMinimum\": 2.5 }");
 		assertFalse(test.accepts(NullNode.getInstance()));
 		assertFalse(test.accepts(new DoubleNode(1.5)));
-		assertTrue(test.accepts(new DoubleNode(3.0)));
+		assertThat(test, accepts(new DoubleNode(3.0)));
 		assertFalse(test.accepts(new IntNode(2)));
-		assertTrue(test.accepts(new IntNode(3)));
+		assertThat(test, accepts(new IntNode(3)));
 		assertFalse(test.accepts(new DoubleNode(2.5)));
 	}
 	
@@ -144,7 +144,7 @@ public class SchemaV6FactoryTest {
 		Tester test = fromSingleElement("{ \"maxLength\": 1 }");
 		assertFalse(test.accepts(NullNode.getInstance()));
 		assertFalse(test.accepts(new DoubleNode(1.5)));
-		assertTrue(test.accepts(new TextNode("")));
+		assertThat(test, accepts(new TextNode("")));
 		assertFalse(test.accepts(new TextNode("  ")));
 	}
 	
@@ -154,7 +154,7 @@ public class SchemaV6FactoryTest {
 		assertFalse(test.accepts(NullNode.getInstance()));
 		assertFalse(test.accepts(new DoubleNode(1.5)));
 		assertFalse(test.accepts(new TextNode("")));
-		assertTrue(test.accepts(new TextNode("  ")));
+		assertThat(test, accepts(new TextNode("  ")));
 	}
 	
 	@Test
@@ -162,14 +162,14 @@ public class SchemaV6FactoryTest {
 		Tester test = fromSingleElement("{ \"pattern\": \"^\\\\s.*\" }");
 		assertFalse(test.accepts(NullNode.getInstance()));
 		assertFalse(test.accepts(new TextNode("S ")));
-		assertTrue(test.accepts(new TextNode(" S")));
+		assertThat(test, accepts(new TextNode(" S")));
 	}
 	
 	@Test
 	public void testAdditionalItemsSchema() {
 		Tester test = fromSingleElement("{ \"additionalItems\": false }");
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 		node.add(false);
 		assertFalse(test.accepts(node));
 		node.add(false);
@@ -180,9 +180,9 @@ public class SchemaV6FactoryTest {
 	public void testItemsSchema() {
 		Tester test = fromSingleElement("{ \"items\": [ true, false ] }");
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 		node.add(false);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 		node.add(false);
 		assertFalse(test.accepts(node));
 	}
@@ -191,11 +191,11 @@ public class SchemaV6FactoryTest {
 	public void testItemsSchemaSingle() {
 		Tester test = fromSingleElement("{ \"items\": true }");
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 		node.add(false);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 		node.add(false);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 	}
 	
 	@Test
@@ -204,7 +204,7 @@ public class SchemaV6FactoryTest {
 		assertFalse(test.accepts(NullNode.getInstance()));
 		assertFalse(test.accepts(new DoubleNode(1.5)));
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 		node.add(false);
 		node.add(false);
 		assertFalse(test.accepts(node));
@@ -219,7 +219,7 @@ public class SchemaV6FactoryTest {
 		assertFalse(test.accepts(node));
 		node.add(false);
 		node.add(false);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 	}
 	
 	@Test
@@ -228,11 +228,11 @@ public class SchemaV6FactoryTest {
 		Tester any = fromSingleElement("{ \"uniqueItems\": false }");
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(false);
-		assertTrue(uniq.accepts(node));
-		assertTrue(any.accepts(node));
+		assertThat(uniq, accepts(node));
+		assertThat(any, accepts(node));
 		node.add(false);
 		assertFalse(uniq.accepts(node));
-		assertTrue(any.accepts(node));
+		assertThat(any, accepts(node));
 	}
 	
 	@Test
@@ -243,7 +243,7 @@ public class SchemaV6FactoryTest {
 		assertFalse(test.accepts(node));
 		
 		node.add(new ObjectNode(JsonNodeFactory.instance));
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 	}
 	
 	@Test
@@ -252,7 +252,7 @@ public class SchemaV6FactoryTest {
 		assertFalse(test.accepts(NullNode.getInstance()));
 		assertFalse(test.accepts(new DoubleNode(1.5)));
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 		node.set("A", BooleanNode.FALSE);
 		node.set("B", BooleanNode.FALSE);
 		assertFalse(test.accepts(node));
@@ -267,7 +267,7 @@ public class SchemaV6FactoryTest {
 		assertFalse(test.accepts(node));
 		node.set("A", BooleanNode.FALSE);
 		node.set("B", BooleanNode.FALSE);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 	}
 	
 	@Test
@@ -278,13 +278,13 @@ public class SchemaV6FactoryTest {
 		node.set("C", BooleanNode.FALSE);
 		assertFalse(test.accepts(node));
 		node.set("B", BooleanNode.FALSE);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 	}
 
 	@Test
 	public void testAdditionalPropertiesSchema() {
 		Tester test = fromSingleElement("{ \"additionalProperties\": false }");
-		assertTrue(test.accepts(readTree("{ }")));
+		assertThat(test, accepts(readTree("{ }")));
 		assertFalse(test.accepts(readTree("{ \"A\": {} }")));
 		assertFalse(test.accepts(readTree("{ \"B\": {} }")));
 	}
@@ -299,14 +299,14 @@ public class SchemaV6FactoryTest {
 		"}"));
 		assertFalse(defArray.accepts(NullNode.instance));
 		assertFalse(defArray.accepts(new ObjectNode(JsonNodeFactory.instance)));
-		assertTrue(defArray.accepts(BooleanNode.TRUE));
+		assertThat(defArray, accepts(BooleanNode.TRUE));
 	}
 	
 	@Test
 	public void testPropertiesSchema() {
 		Tester test = fromSingleElement("{ \"properties\": { \"A\": true, \"B\": false } }");
-		assertTrue(test.accepts(readTree("{ }")));
-		assertTrue(test.accepts(readTree("{ \"A\": {} }")));
+		assertThat(test, accepts(readTree("{ }")));
+		assertThat(test, accepts(readTree("{ \"A\": {} }")));
 		assertFalse(test.accepts(readTree("{ \"B\": {} }")));
 		assertFalse(test.accepts(readTree("{ \"A\": {}, \"B\": {} }")));
 	}
@@ -314,8 +314,8 @@ public class SchemaV6FactoryTest {
 	@Test
 	public void testPatternPropertiesSchema() {
 		Tester test = fromSingleElement("{ \"patternProperties\": { \"A\": true, \"A.\": false } }");
-		assertTrue(test.accepts(readTree("{ }")));
-		assertTrue(test.accepts(readTree("{ \"A\": {} }")));
+		assertThat(test, accepts(readTree("{ }")));
+		assertThat(test, accepts(readTree("{ \"A\": {} }")));
 		assertFalse(test.accepts(readTree("{ \"A.\": {} }")));
 		assertFalse(test.accepts(readTree("{ \"A_\": {} }")));
 	}
@@ -327,18 +327,18 @@ public class SchemaV6FactoryTest {
 				"\"A\": [ \"B\", \"C\" ]" +
 			"}" +
 		"}");
-		assertTrue(arrayDep.accepts(readTree("{ \"B\": true }")));
+		assertThat(arrayDep, accepts(readTree("{ \"B\": true }")));
 		assertFalse(arrayDep.accepts(readTree("{ \"A\": true, \"B\": true }")));
-		assertTrue(arrayDep.accepts(readTree("{ \"A\": true, \"B\": true, \"C\": true }")));
+		assertThat(arrayDep, accepts(readTree("{ \"A\": true, \"B\": true, \"C\": true }")));
 		
 		Tester schemaDep = fromSingleElement("{" +
 			"\"dependencies\": {" +
 				"\"D\": { \"properties\": { \"B\": { \"type\": \"integer\" } } }" +
 			"}" +
 		"}");
-		assertTrue(schemaDep.accepts(readTree("{ \"B\": true }")));
+		assertThat(schemaDep, accepts(readTree("{ \"B\": true }")));
 		assertFalse(schemaDep.accepts(readTree("{ \"D\": true, \"B\": true }")));
-		assertTrue(schemaDep.accepts(readTree("{ \"D\": true, \"B\": 5 }")));
+		assertThat(schemaDep, accepts(readTree("{ \"D\": true, \"B\": 5 }")));
 		
 		Tester bothDep = fromSingleElement("{" +
 			"\"dependencies\": {" +
@@ -346,16 +346,16 @@ public class SchemaV6FactoryTest {
 				"\"D\": { \"properties\": { \"B\": { \"type\": \"integer\" } } }" +
 			"}" +
 		"}");
-		assertTrue(bothDep.accepts(readTree("{ \"A\": true, \"B\": true, \"C\": true }")));
-		assertTrue(bothDep.accepts(readTree("{ \"D\": true, \"B\": 5 }")));
+		assertThat(bothDep, accepts(readTree("{ \"A\": true, \"B\": true, \"C\": true }")));
+		assertThat(bothDep, accepts(readTree("{ \"D\": true, \"B\": 5 }")));
 		assertFalse(bothDep.accepts(readTree("{ \"A\": true, \"D\": true, \"B\": true, \"C\": true }")));
-		assertTrue(bothDep.accepts(readTree("{ \"A\": true, \"D\": true, \"B\": 5, \"C\": true }")));
+		assertThat(bothDep, accepts(readTree("{ \"A\": true, \"D\": true, \"B\": 5, \"C\": true }")));
 	}
 	
 	@Test
 	public void testPropertyNamesSchema() {
 		Tester test = fromSingleElement("{ \"propertyNames\": false }");
-		assertTrue(test.accepts(readTree("{ }")));
+		assertThat(test, accepts(readTree("{ }")));
 		assertFalse(test.accepts(readTree("{ \"A\": {} }")));
 	}
 	
@@ -363,28 +363,28 @@ public class SchemaV6FactoryTest {
 	public void testConstSchema() {
 		Tester test = fromSingleElement("{ \"const\": { \"nice\": \"meme\" } }");
 		JsonNode matching = readTree("{ \"nice\": \"meme\" }");
-		assertTrue(test.accepts(matching));
+		assertThat(test, accepts(matching));
 	}
 	
 	@Test
 	public void testEnumSchema() {
 		Tester test = fromSingleElement("{ \"enum\": [ \"A\", \"B\", \"D\" ] }");
-		assertTrue(test.accepts(new TextNode("A")));
+		assertThat(test, accepts(new TextNode("A")));
 		assertFalse(test.accepts(new TextNode("a")));
-		assertTrue(test.accepts(new TextNode("B")));
+		assertThat(test, accepts(new TextNode("B")));
 		assertFalse(test.accepts(new TextNode("AB")));
 		assertFalse(test.accepts(new TextNode("C")));
-		assertTrue(test.accepts(new TextNode("D")));
+		assertThat(test, accepts(new TextNode("D")));
 	}
 	
 	@Test
 	public void testTypeSchema() {
 		Tester multi = fromSingleElement("{ \"type\": [ \"boolean\", \"number\" ] }");
-		assertTrue(multi.accepts(BooleanNode.TRUE));
-		assertTrue(multi.accepts(new DoubleNode(1.5)));
+		assertThat(multi, accepts(BooleanNode.TRUE));
+		assertThat(multi, accepts(new DoubleNode(1.5)));
 		assertFalse(multi.accepts(new TextNode("hi")));
 		Tester sing = fromSingleElement("{ \"type\": \"boolean\" }");
-		assertTrue(sing.accepts(BooleanNode.TRUE));
+		assertThat(sing, accepts(BooleanNode.TRUE));
 		assertFalse(sing.accepts(new DoubleNode(1.5)));
 	}
 	

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

@@ -40,7 +40,7 @@ public class AllOfTesterTest {
 		Tester fails = new AllOfTester(isArray, notEmpty);
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(true);
-		assertTrue(fails.accepts(node));
+		assertThat(fails, accepts(node));
 	}
 	
 	@Test

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

@@ -40,7 +40,7 @@ public class AnyOfTesterTest {
 		Tester fails = new AnyOfTester(isArray, notEmpty);
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(true);
-		assertTrue(fails.accepts(node));
+		assertThat(fails, accepts(node));
 	}
 	
 	@Test
@@ -48,13 +48,13 @@ public class AnyOfTesterTest {
 		Tester fails = new AnyOfTester(isArray, isObject, notEmpty);
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(true);
-		assertTrue(fails.accepts(node));
+		assertThat(fails, accepts(node));
 	}
 	
 	@Test
 	public void testPassesIfPreciselyOnePasses() {
 		Tester fails = new AnyOfTester(isArray, notEmpty);
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
-		assertTrue(fails.accepts(node));
+		assertThat(fails, accepts(node));
 	}
 }

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

@@ -25,7 +25,7 @@ public class NotTesterTest {
 	@Test
 	public void testNotInvertsOutputTrue() {
 		StubTester impl = JsonNode::isNull;
-		assertTrue(impl.accepts(NullNode.getInstance()));
+		assertThat(impl, accepts(NullNode.getInstance()));
 		assertFalse(new NotTester(impl).accepts(NullNode.getInstance()));
 	}
 

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

@@ -55,6 +55,6 @@ public class OneOfTesterTest {
 	public void testPassesIfPreciselyOnePasses() {
 		Tester fails = new OneOfTester(isArray, notEmpty);
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
-		assertTrue(fails.accepts(node));
+		assertThat(fails, accepts(node));
 	}
 }

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

@@ -21,7 +21,7 @@ public class PropertyNameTesterTest {
 	public void testPassesEmptyObject() {
 		PropertyNameTester test = new PropertyNameTester(FixedTester.REJECT);
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 	}
 	
 	@Test

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

@@ -23,7 +23,7 @@ public class PropertyTesterTest {
 		PropertyTester test = new PropertyTester(new Pair[0]);
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
 		node.set("A", NullNode.getInstance());
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 	}
 
 	@Test
@@ -68,7 +68,7 @@ public class PropertyTesterTest {
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
 		node.set("A", NullNode.getInstance());
 		node.set("B", NullNode.getInstance());
-		assertTrue(test.accepts(node));
+		assertThat(test, accepts(node));
 	}
 	
 	@Test

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

@@ -79,7 +79,7 @@ public class SizeTesterTest {
 		final SizeTester notEmptyArray = new SizeTester(ARRAY, NON_ZERO);
 		final ArrayNode node = new ArrayNode(JsonNodeFactory.instance);
 		node.add(NullNode.getInstance());
-		assertTrue(notEmptyArray.accepts(node));
+		assertThat(notEmptyArray, accepts(node));
 	}
 
 	@Test
@@ -87,13 +87,13 @@ public class SizeTesterTest {
 		final SizeTester notEmptyArray = new SizeTester(OBJECT, NON_ZERO);
 		final ObjectNode node = new ObjectNode(JsonNodeFactory.instance);
 		node.set("_", NullNode.getInstance());
-		assertTrue(notEmptyArray.accepts(node));
+		assertThat(notEmptyArray, accepts(node));
 	}
 
 	@Test
 	public void testMatcherAcceptsGoodSize() {
 		final SizeTester notEmptyArray = new SizeTester(STRING, NON_ZERO);
-		assertTrue(notEmptyArray.accepts(new TextNode("_")));
+		assertThat(notEmptyArray, accepts(new TextNode("_")));
 	}
 	
 }

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

@@ -35,7 +35,7 @@ public class TypeTesterTest {
 	public void testMatcheNullNode() {
 		final Tester t = TypeTester.fromType("null");
 		assertThat(t.acceptedTypes(), is(Tester.ANY));
-		assertTrue(t.accepts(jNull));
+		assertThat(t, accepts(jNull));
 		assertFalse(t.accepts(bool));
 		assertFalse(t.accepts(integral));
 		assertFalse(t.accepts(floating));
@@ -49,7 +49,7 @@ public class TypeTesterTest {
 		final Tester t = TypeTester.fromType("boolean");
 		assertThat(t.acceptedTypes(), is(Tester.ANY));
 		assertFalse(t.accepts(jNull));
-		assertTrue(t.accepts(bool));
+		assertThat(t, accepts(bool));
 		assertFalse(t.accepts(integral));
 		assertFalse(t.accepts(floating));
 		assertFalse(t.accepts(text));
@@ -63,7 +63,7 @@ public class TypeTesterTest {
 		assertThat(t.acceptedTypes(), is(Tester.ANY));
 		assertFalse(t.accepts(jNull));
 		assertFalse(t.accepts(bool));
-		assertTrue(t.accepts(integral));
+		assertThat(t, accepts(integral));
 		assertFalse(t.accepts(floating));
 		assertFalse(t.accepts(text));
 		assertFalse(t.accepts(array));
@@ -76,8 +76,8 @@ public class TypeTesterTest {
 		assertThat(t.acceptedTypes(), is(Tester.ANY));
 		assertFalse(t.accepts(jNull));
 		assertFalse(t.accepts(bool));
-		assertTrue(t.accepts(integral));
-		assertTrue(t.accepts(floating));
+		assertThat(t, accepts(integral));
+		assertThat(t, accepts(floating));
 		assertFalse(t.accepts(text));
 		assertFalse(t.accepts(array));
 		assertFalse(t.accepts(object));
@@ -91,7 +91,7 @@ public class TypeTesterTest {
 		assertFalse(t.accepts(bool));
 		assertFalse(t.accepts(integral));
 		assertFalse(t.accepts(floating));
-		assertTrue(t.accepts(text));
+		assertThat(t, accepts(text));
 		assertFalse(t.accepts(array));
 		assertFalse(t.accepts(object));
 	}
@@ -105,7 +105,7 @@ public class TypeTesterTest {
 		assertFalse(t.accepts(integral));
 		assertFalse(t.accepts(floating));
 		assertFalse(t.accepts(text));
-		assertTrue(t.accepts(array));
+		assertThat(t, accepts(array));
 		assertFalse(t.accepts(object));
 	}
 	
@@ -119,6 +119,6 @@ public class TypeTesterTest {
 		assertFalse(t.accepts(floating));
 		assertFalse(t.accepts(text));
 		assertFalse(t.accepts(array));
-		assertTrue(t.accepts(object));
+		assertThat(t, accepts(object));
 	}
 }