1 files changed, 14 insertions, 36 deletions

diff --git a/test/array_test.cpp b/test/array_test.cpp
index e401fc8..014b062 100644
--- a/test/array_test.cpp
+++ b/test/array_test.cpp
@@ -1,6 +1,6 @@
 /*
   This file is part of Raul.
-  Copyright 2007-2016 David Robillard <http://drobilla.net>
+  Copyright 2007-2019 David Robillard <http://drobilla.net>
 
   Raul is free software: you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
@@ -14,8 +14,11 @@
   along with Raul.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#undef NDEBUG
+
 #include "raul/Array.hpp"
 
+#include <cassert>
 #include <cstdio>
 
 int
@@ -24,51 +27,26 @@ main()
 	Raul::Array<int> array1(32, 2);
 
 	array1[0] = 42;
-	if (array1[0] != 42) {
-		fprintf(stderr, "array1[0] != 42\n");
-		return 1;
-	} else if (array1[1] != 2) {
-		fprintf(stderr, "array1[1] != 2\n");
-		return 1;
-	} else if (array1.size() != 32) {
-		fprintf(stderr, "array1.size() != 1\n");
-		return 1;
-	}
+	assert(array1[0] == 42);
+	assert(array1[1] == 2);
+	assert(array1.size() == 32);
 
 	array1.alloc(16, 0);
-	if (array1[0] != 0) {
-		fprintf(stderr, "array1[0] != 0\n");
-		return 1;
-	} else if (array1.at(0) != 0) {
-		fprintf(stderr, "array1.at(0) != 0\n");
-		return 1;
-	} else if (array1.size() != 16) {
-		fprintf(stderr, "array1.size() != 16\n");
-		return 1;
-	}
+	assert(array1[0] == 0);
+	assert(array1.at(0) == 0);
+	assert(array1.size() == 16);
 
 	array1.alloc(8, 0);
-	if (array1.size() != 8) {
-		fprintf(stderr, "array1.size() != 8\n");
-		return 1;
-	}
+	assert(array1.size() == 8);
 
 	Raul::Array<int> array2(array1);
 	for (size_t i = 0; i < array1.size(); ++i) {
-		if (array2[i] != array1[i]) {
-			fprintf(stderr, "Mismatch at %zu\n", i);
-			return 1;
-		}
+		assert(array2[i] == array1[i]);
 	}
 
 	Raul::Array<int> array3(8, 47);
-	if (array3[0] != 47) {
-		fprintf(stderr, "array3[0] != 47\n");
-		return 1;
-	} else if (array3.size() != 8) {
-		fprintf(stderr, "array3.size() != 8\n");
-		return 1;
-	}
+	assert(array3[0] == 47);
+	assert(array3.size() == 8);
 
 	return 0;
 }