Added catch2 unit testing framework

jfecher · Mar 9, 2018 · 9c0fe8b · 9c0fe8b
1 parent 1761a7a
commit 9c0fe8b
Show file tree

Hide file tree

Showing 54 changed files with 13,052 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ t.an
 u.an
 ante
 bootante
+unittest
 syntax.tab.c
 .clang_complete
 src/parser.output

diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ OBJFILES := $(patsubst src/%.cpp,obj/%.o,$(SRCFILES))
 ANSRCFILES := $(shell find $(SRCDIRS) -type f -name "*.an")
 ANOBJFILES := $(patsubst src/%.an,obj/%.ao,$(ANSRCFILES))
 
-TESTFILES := $(shell find 'tests/' -maxdepth 1 -type f -name "*.an")
+TESTFILES := $(shell find 'tests/integration/' -maxdepth 1 -type f -name "*.an")
 
 #If src/parser.cpp is still present, remove it from objfiles so as to not double-compile it
 OBJFILES := $(patsubst obj/parser.o,,$(OBJFILES))
@@ -43,6 +43,11 @@ ante: obj obj/parser.o $(OBJFILES) $(ANOBJFILES)
 	@echo Linking...
 	@$(CXX) obj/parser.o $(OBJFILES) $(ANOBJFILES) $(LLVMFLAGS) -o ante
 
+
+run: ante
+	./ante
+
+
 bootante: obj obj/parser.o $(OBJFILES) $(ANOBJFILES)
 	@echo Bootstrapping f16.ao...
 	@echo Compiling argtuple.o...
@@ -66,7 +71,7 @@ stdlib: $(LIBFILES) Makefile
 new: clean ante
 
 #create the obj folder if it is not present
-obj: 
+obj:
 	@mkdir -p obj
 
 debug_parser:
@@ -91,7 +96,19 @@ obj/parser.o: src/syntax.y Makefile
 	@$(CXX) -DAN_LIB_DIR=$(ANLIBDIR) $(CPPFLAGS) -MMD -MP -Iinclude -c $(PARSERSRC) -o $@
 
 
-test:
+test: unittest integrationtest
+
+
+unittest: ante tests/unit/main.cpp
+	@$(CXX) -DAN_LIB_DIR=$(ANLIBDIR) -DF16_BOOT $(CPPFLAGS) -MMD -MP -Iinclude -c tests/unit/main.cpp -o obj/test-main.o
+	@mv obj/ante.o obj/ante.o.tmp
+	@$(CXX) -DAN_LIB_DIR=$(ANLIBDIR) -DF16_BOOT -DTEST_MAIN $(CPPFLAGS) -MMD -MP -Iinclude -c src/ante.cpp -o obj/ante.o
+	@$(CXX) obj/test-main.o obj/parser.o $(OBJFILES) $(ANOBJFILES) $(LLVMFLAGS) -o unittest
+	@mv obj/ante.o.tmp obj/ante.o
+	@./unittest
+
+
+integrationtest:
 	@ERRC=0;                                                                  \
 	for file in $(TESTFILES); do                                              \
 		./ante -check $$file;                                                 \

diff --git a/tests/ante_store.an → tests/integration/ante_store.an b/tests/ante_store.an → tests/integration/ante_store.an
diff --git a/tests/arrays.an → tests/integration/arrays.an b/tests/arrays.an → tests/integration/arrays.an
diff --git a/tests/basicmacro.an → tests/integration/basicmacro.an b/tests/basicmacro.an → tests/integration/basicmacro.an
diff --git a/tests/basictrait.an → tests/integration/basictrait.an b/tests/basictrait.an → tests/integration/basictrait.an
diff --git a/tests/castFunctions.an → tests/integration/castFunctions.an b/tests/castFunctions.an → tests/integration/castFunctions.an
diff --git a/tests/casting.an → tests/integration/casting.an b/tests/casting.an → tests/integration/casting.an
diff --git a/tests/elif.an → tests/integration/elif.an b/tests/elif.an → tests/integration/elif.an
diff --git a/tests/enums.an → tests/integration/enums.an b/tests/enums.an → tests/integration/enums.an
diff --git a/tests/expr.an → tests/integration/expr.an b/tests/expr.an → tests/integration/expr.an
diff --git a/tests/exprif.an → tests/integration/exprif.an b/tests/exprif.an → tests/integration/exprif.an
diff --git a/tests/fib.an → tests/integration/fib.an b/tests/fib.an → tests/integration/fib.an
diff --git a/tests/floats.an → tests/integration/floats.an b/tests/floats.an → tests/integration/floats.an
diff --git a/tests/fnDecl.an → tests/integration/fnDecl.an b/tests/fnDecl.an → tests/integration/fnDecl.an
diff --git a/tests/for.an → tests/integration/for.an b/tests/for.an → tests/integration/for.an
diff --git a/tests/funcptrs.an → tests/integration/funcptrs.an b/tests/funcptrs.an → tests/integration/funcptrs.an
diff --git a/tests/globalint.an → tests/integration/globalint.an b/tests/globalint.an → tests/integration/globalint.an
diff --git a/tests/infile_iter.an → tests/integration/infile_iter.an b/tests/infile_iter.an → tests/integration/infile_iter.an
diff --git a/tests/iterable.an → tests/integration/iterable.an b/tests/iterable.an → tests/integration/iterable.an
diff --git a/tests/lazycompile.an → tests/integration/lazycompile.an b/tests/lazycompile.an → tests/integration/lazycompile.an
diff --git a/tests/letbindings.an → tests/integration/letbindings.an b/tests/letbindings.an → tests/integration/letbindings.an
diff --git a/tests/list.an → tests/integration/list.an b/tests/list.an → tests/integration/list.an
diff --git a/tests/math.an → tests/integration/math.an b/tests/math.an → tests/integration/math.an
diff --git a/tests/integration/moduleDriver.an b/tests/integration/moduleDriver.an
@@ -0,0 +1,9 @@
+//Test basic module imports from string literal
+import "tests/integration/moduleLib.an"
+
+let tup1 = (2, 3)
+let tup2 = (4, 2)
+
+print <| tup1.dotProduct tup2
+
+print "done!"
diff --git a/tests/integration/moduleImport.an b/tests/integration/moduleImport.an
@@ -0,0 +1,10 @@
+//test basic conversion to filename
+// Vec -> STD_LIB_DIR/vec.an
+import Vec
+
+//test conversion of relative paths
+// Tests.Integration.FnDecl -> ./tests/integration/fnDecl.an
+import Tests.Integration.FnDecl
+
+
+print Vec(1 .. fact 5)
diff --git a/tests/moduleLib.an → tests/integration/moduleLib.an b/tests/moduleLib.an → tests/integration/moduleLib.an
diff --git a/tests/multiplegenerics.an → tests/integration/multiplegenerics.an b/tests/multiplegenerics.an → tests/integration/multiplegenerics.an
diff --git a/tests/non_compiling/compilerr.an → tests/integration/non_compiling/compilerr.an b/tests/non_compiling/compilerr.an → tests/integration/non_compiling/compilerr.an
diff --git a/tests/non_compiling/language.an → tests/integration/non_compiling/language.an b/tests/non_compiling/language.an → tests/integration/non_compiling/language.an
diff --git a/tests/non_compiling/lexerr.an → tests/integration/non_compiling/lexerr.an b/tests/non_compiling/lexerr.an → tests/integration/non_compiling/lexerr.an
diff --git a/tests/non_compiling/syntaxerr.an → tests/integration/non_compiling/syntaxerr.an b/tests/non_compiling/syntaxerr.an → tests/integration/non_compiling/syntaxerr.an
diff --git a/tests/opAddr.an → tests/integration/opAddr.an b/tests/opAddr.an → tests/integration/opAddr.an
diff --git a/tests/opAppend.an → tests/integration/opAppend.an b/tests/opAppend.an → tests/integration/opAppend.an
diff --git a/tests/opOverload.an → tests/integration/opOverload.an b/tests/opOverload.an → tests/integration/opOverload.an
diff --git a/tests/paramsBlock.an → tests/integration/paramsBlock.an b/tests/paramsBlock.an → tests/integration/paramsBlock.an
diff --git a/tests/pow.an → tests/integration/pow.an b/tests/pow.an → tests/integration/pow.an
diff --git a/tests/printConst.an → tests/integration/printConst.an b/tests/printConst.an → tests/integration/printConst.an
diff --git a/tests/ptr.an → tests/integration/ptr.an b/tests/ptr.an → tests/integration/ptr.an
diff --git a/tests/recursion.an → tests/integration/recursion.an b/tests/recursion.an → tests/integration/recursion.an
diff --git a/tests/split.an → tests/integration/split.an b/tests/split.an → tests/integration/split.an
diff --git a/tests/strInterpolation.an → tests/integration/strInterpolation.an b/tests/strInterpolation.an → tests/integration/strInterpolation.an
diff --git a/tests/strings.an → tests/integration/strings.an b/tests/strings.an → tests/integration/strings.an
diff --git a/tests/taggedunions.an → tests/integration/taggedunions.an b/tests/taggedunions.an → tests/integration/taggedunions.an
diff --git a/tests/tuples.an → tests/integration/tuples.an b/tests/tuples.an → tests/integration/tuples.an
diff --git a/tests/typealias.an → tests/integration/typealias.an b/tests/typealias.an → tests/integration/typealias.an
diff --git a/tests/typesuffix.an → tests/integration/typesuffix.an b/tests/typesuffix.an → tests/integration/typesuffix.an
diff --git a/tests/varDecl.an → tests/integration/varDecl.an b/tests/varDecl.an → tests/integration/varDecl.an
diff --git a/tests/vecRemove.an → tests/integration/vecRemove.an b/tests/vecRemove.an → tests/integration/vecRemove.an
diff --git a/tests/while.an → tests/integration/while.an b/tests/while.an → tests/integration/while.an
diff --git a/tests/moduleDriver.an b/tests/moduleDriver.an
diff --git a/tests/moduleImport.an b/tests/moduleImport.an