Simplify unit test assertion logic

jimmysoda · jimmysoda · commit e340b2dd1d4d · 2018-06-26T11:30:39.000-04:00
diff --git a/tests/pdal/capi/PipelineTest.c.in b/tests/pdal/capi/PipelineTest.c.in
@@ -52,7 +52,7 @@ TEST testPDALCreateAndDisposePipeline(void)
 	ASSERT_EQ(NULL, pipeline);
 
 	pipeline = PDALCreatePipeline(gPipelineJson);
-	ASSERT_FALSE(pipeline == NULL);
+	ASSERT(pipeline);
 
 	PDALDisposePipeline(pipeline);
 	PDALDisposePipeline(NULL);
@@ -66,11 +66,11 @@ TEST testPDALGetPipelineAsString(void)
 	ASSERT_FALSE(pipeline == NULL);
 
 	int64_t count = PDALExecutePipeline(pipeline);
-	ASSERT_FALSE(count < 1);
+	ASSERT(count > 0);
 
 	char json[1024];
 	size_t size = PDALGetPipelineAsString(pipeline, json, 1024);
-	ASSERT_FALSE(size == 0 || size > 1024);
+	ASSERT(size > 0 && size <= 1024);
 	ASSERT_FALSE(json[0] == '\0');
 
 	// Make sure that the JSON object's name is "pipeline"
@@ -85,14 +85,14 @@ TEST testPDALGetPipelineAsString(void)
 TEST testPDALGetPipelineMetadata(void)
 {
 	PDALPipelinePtr pipeline = PDALCreatePipeline(gPipelineJson);
-	ASSERT_FALSE(pipeline == NULL);
+	ASSERT(pipeline);
 
 	int64_t count = PDALExecutePipeline(pipeline);
-	ASSERT_FALSE(count < 1);
+	ASSERT(count > 0);
 
 	char json[1024];
 	size_t size = PDALGetPipelineMetadata(pipeline, json, 1024);
-	ASSERT_FALSE(size == 0 || size > 1024);
+	ASSERT(size > 0 && size <= 1024);
 	ASSERT_FALSE(json[0] == '\0');
 
 	// Make sure that the JSON object's name is "metadata"
@@ -107,14 +107,14 @@ TEST testPDALGetPipelineMetadata(void)
 TEST testPDALGetPipelineSchema(void)
 {
 	PDALPipelinePtr pipeline = PDALCreatePipeline(gPipelineJson);
-	ASSERT_FALSE(pipeline == NULL);
+	ASSERT(pipeline);
 
 	int64_t count = PDALExecutePipeline(pipeline);
-	ASSERT_FALSE(count < 1);
+	ASSERT(count > 0);
 
-	char json[1024];
-	size_t size = PDALGetPipelineSchema(pipeline, json, 1024);
-	ASSERT_FALSE(size == 0 || size > 1024);
+	char json[2048];
+	size_t size = PDALGetPipelineSchema(pipeline, json, 2048);
+	ASSERT(size > 0 && size <= 2048);
 	ASSERT_FALSE(json[0] == '\0');
 
 	// Make sure that the JSON object's name is "schema"
@@ -129,10 +129,10 @@ TEST testPDALGetPipelineSchema(void)
 TEST testPDALGetSetPipelineLog(void)
 {
 	PDALPipelinePtr pipeline = PDALCreatePipeline(gPipelineJson);
-	ASSERT_FALSE(pipeline == NULL);
+	ASSERT(pipeline);
 
 	int64_t count = PDALExecutePipeline(pipeline);
-	ASSERT_FALSE(count < 1);
+	ASSERT(count > 0);
 
 	// Test valid cases: 0 to 8
 	//char log[1024];
@@ -149,7 +149,7 @@ TEST testPDALGetSetPipelineLog(void)
 
 	// TODO Determine why all levels yield empty logs
 	//size_t size = PDALGetPipelineLog(pipeline, log, 1024);
-	//ASSERT_FALSE(size == 0 || size > 1024);
+	//ASSERT(size > 0 && size <= 1024);
 	//ASSERT_FALSE(log[0] == '\0');
 
 	PDALDisposePipeline(pipeline);
@@ -160,13 +160,13 @@ TEST testPDALGetSetPipelineLog(void)
 TEST testPDALExecutePipeline(void)
 {
 	PDALPipelinePtr pipeline = PDALCreatePipeline(gPipelineJson);
-	ASSERT_FALSE(pipeline == NULL);
+	ASSERT(pipeline);
 
-	int64_t count = PDALExecutePipeline(pipeline); // 1065
-	ASSERT_FALSE(count < 1);
+	int64_t count = PDALExecutePipeline(pipeline);
+	ASSERT(count > 0);
 
 	count = PDALExecutePipeline(NULL);
-	ASSERT_FALSE(count > 0);
+	ASSERT_EQ(0, count);
 
 	PDALDisposePipeline(pipeline);
 	PASS();
@@ -178,9 +178,9 @@ TEST testPDALValidatePipeline(void)
 	ASSERT_FALSEm("Null pipeline evaluated as valid when it should be invalid", valid);
 
 	PDALPipelinePtr pipeline = PDALCreatePipeline(gPipelineJson);
-	ASSERT_FALSE(pipeline == NULL);
+	ASSERT(pipeline);
 	valid = PDALValidatePipeline(pipeline);
-	ASSERT_FALSEm("Valid pipeline evaluated as invalid", !valid);
+	ASSERTm("Valid pipeline evaluated as invalid", valid);
 
 	PASS();
 }
diff --git a/tests/pdal/capi/PointViewCollectionTest.c.in b/tests/pdal/capi/PointViewCollectionTest.c.in
@@ -9,6 +9,7 @@
 #include "greatest.h"
 
 #include <pdal/capi/Pipeline.h>
+#include <pdal/capi/PointView.h>
 #include <pdal/capi/PointViewCollection.h>
 
 SUITE(PointViewCollectionTest);
@@ -58,9 +59,9 @@ TEST testPDALHasNextPointView(void)
 	bool hasNext = PDALHasNextPointView(NULL);
 	ASSERT_FALSE(hasNext);
 
-	ASSERT_FALSE(gPointViewCollection == NULL);
+	ASSERT(gPointViewCollection);
 	hasNext = PDALHasNextPointView(gPointViewCollection);
-	ASSERT_FALSE(!hasNext);
+	ASSERT(hasNext);
 
 	PASS();
 }
@@ -73,15 +74,15 @@ TEST testPDALGetNextPointView(void)
 	ASSERT_FALSE(gPointViewCollection == NULL);
 	PDALResetPointViewCollection(gPointViewCollection);
 	bool hasNext = PDALHasNextPointView(gPointViewCollection);
-	ASSERT_FALSE(!hasNext);
+	ASSERT(hasNext);
 
 	view = PDALGetNextPointView(gPointViewCollection);
-	ASSERT_FALSE(view == NULL);
+	ASSERT(view);
 
 	if (PDALHasNextPointView(gPointViewCollection))
 	{
 		PDALPointViewPtr anotherView = PDALGetNextPointView(gPointViewCollection);
-		ASSERT_FALSE(anotherView == NULL);
+		ASSERT(anotherView);
 		ASSERT_FALSE(anotherView == view);
 		PDALDisposePointView(anotherView);
 	}
@@ -92,18 +93,18 @@ TEST testPDALGetNextPointView(void)
 
 TEST testPDALResetPointViewCollection(void)
 {
-	ASSERT_FALSE(gPointViewCollection == NULL);
+	ASSERT(gPointViewCollection);
 	PDALResetPointViewCollection(gPointViewCollection);
 	bool hasNext = PDALHasNextPointView(gPointViewCollection);
-	ASSERT_FALSE(!hasNext);
+	ASSERT(hasNext);
 
 	PDALPointViewPtr view = PDALGetNextPointView(gPointViewCollection);
-	ASSERT_FALSE(view == NULL);
+	ASSERT(view);
 
 	while (PDALHasNextPointView(gPointViewCollection))
 	{
 		PDALPointViewPtr anotherView = PDALGetNextPointView(gPointViewCollection);
-		ASSERT_FALSE(anotherView == NULL);
+		ASSERT(anotherView);
 		ASSERT_FALSE(anotherView == view);
 		PDALDisposePointView(anotherView);
 	}
@@ -117,7 +118,7 @@ TEST testPDALResetPointViewCollection(void)
 	PDALResetPointViewCollection(gPointViewCollection);
 
 	view = PDALGetNextPointView(gPointViewCollection);
-	ASSERT_FALSE(view == NULL);
+	ASSERT(view);
 	PDALDisposePointView(view);
 
 	PASS();
diff --git a/tests/pdal/capi/PointViewTest.c.in b/tests/pdal/capi/PointViewTest.c.in
@@ -102,22 +102,22 @@ TEST testPDALGetPointViewId(void)
 
 	PDALResetPointViewCollection(gPointViewCollection);
 	bool hasNext = PDALHasNextPointView(gPointViewCollection);
-	ASSERT_FALSE(!hasNext);
+	ASSERT(hasNext);
 
 	struct node *tree = NULL;
 
 	while (hasNext)
 	{
 		PDALPointViewPtr view = PDALGetNextPointView(gPointViewCollection);
-		ASSERT_FALSE(view == NULL);
+		ASSERT(view);
 
 		// Make sure all IDs are valid
 		int id = PDALGetPointViewId(view);
 		ASSERT_FALSE(id == INVALID_POINT_VIEW_ID);
 
 		// Make sure that there are no duplicate IDs
 		bool inserted = insert(id, &tree);
-		ASSERT_FALSE(!inserted);
+		ASSERT(inserted);
 
 		hasNext = PDALHasNextPointView(gPointViewCollection);
 	}
@@ -136,7 +136,7 @@ TEST testPDALGetPointViewSize(void)
 
 TEST testPDALIsPointViewEmpty(void)
 {
-	ASSERT_FALSE(!PDALIsPointViewEmpty(NULL));
+	ASSERT(PDALIsPointViewEmpty(NULL));
 
 	PASS();
 }
@@ -153,24 +153,24 @@ TEST testPDALGetPointViewProj4(void)
 {
 	PDALResetPointViewCollection(gPointViewCollection);
 	bool hasNext = PDALHasNextPointView(gPointViewCollection);
-	ASSERT_FALSE(!hasNext);
+	ASSERT(hasNext);
 
 	PDALPointViewPtr view = PDALGetNextPointView(gPointViewCollection);
-	ASSERT_FALSE(view == NULL);
+	ASSERT(view);
 
 	char proj[1024];
 	size_t size = PDALGetPointViewProj4(NULL, proj, 1024);
-	ASSERT_FALSE(size > 0);
-	ASSERT_FALSE(proj[0] != '\0');
+	ASSERT_EQ(0, size);
+	ASSERT_EQ('\0', proj[0]);
 
 	size = PDALGetPointViewProj4(view, NULL, 1024);
-	ASSERT_FALSE(size > 0);
+	ASSERT_EQ(0, size);
 
 	size = PDALGetPointViewProj4(view, proj, 0);
-	ASSERT_FALSE(size > 0);
+	ASSERT_EQ(0, size);
 
 	size = PDALGetPointViewProj4(view, proj, 1024);
-	ASSERT_FALSE(size == 0 || size > 1024);
+	ASSERT(size > 0 && size <= 1024);
 	ASSERT_FALSE(proj[0] == '\0');
 	ASSERT_STR_EQ("+proj=longlat +datum=WGS84 +no_defs", proj);
 
@@ -181,24 +181,24 @@ TEST testPDALGetPointViewWkt(void)
 {
 	PDALResetPointViewCollection(gPointViewCollection);
 	bool hasNext = PDALHasNextPointView(gPointViewCollection);
-	ASSERT_FALSE(!hasNext);
+	ASSERT(hasNext);
 
 	PDALPointViewPtr view = PDALGetNextPointView(gPointViewCollection);
-	ASSERT_FALSE(view == NULL);
+	ASSERT(view);
 
 	char wkt[1024];
 	size_t size = PDALGetPointViewWkt(NULL, wkt, 1024, false);
-	ASSERT_FALSE(size > 0);
-	ASSERT_FALSE(wkt[0] != '\0');
+	ASSERT_EQ(0, size);
+	ASSERT_EQ('\0', wkt[0]);
 
 	size = PDALGetPointViewWkt(view, NULL, 1024, false);
-	ASSERT_FALSE(size > 0);
+	ASSERT_EQ(0, size);
 
 	size = PDALGetPointViewWkt(view, wkt, 0, false);
-	ASSERT_FALSE(size > 0);
+	ASSERT_EQ(0, size);
 
 	size = PDALGetPointViewWkt(view, wkt, 1024, false);
-	ASSERT_FALSE(size == 0 || size > 1024);
+	ASSERT(size > 0 && size <= 1024);
 	ASSERT_FALSE(wkt[0] == '\0');
 	ASSERT_STR_EQ(
 		"GEOGCS[\"WGS 84\","
@@ -220,17 +220,17 @@ TEST testPDALGetPointViewWkt(void)
 TEST testPDALGetPointViewLayout(void)
 {
 	PDALPointLayoutPtr layout = PDALGetPointViewLayout(NULL);
-	ASSERT_FALSE(layout != NULL);
+	ASSERT_EQ(NULL, layout);
 
 	PDALResetPointViewCollection(gPointViewCollection);
 	bool hasNext = PDALHasNextPointView(gPointViewCollection);
-	ASSERT_FALSE(!hasNext);
+	ASSERT(hasNext);
 
 	PDALPointViewPtr view = PDALGetNextPointView(gPointViewCollection);
-	ASSERT_FALSE(view == NULL);
+	ASSERT(view);
 
 	layout = PDALGetPointViewLayout(view);
-	ASSERT_FALSE(layout == NULL);
+	ASSERT(layout);
 
 	PASS();
 }
@@ -250,4 +250,4 @@ GREATEST_SUITE(PointViewTest)
 
 	SET_SETUP(NULL, NULL);
 	SET_TEARDOWN(NULL, NULL);
-}
+}
