RIC-1047: test include paths (#108)

* RIC-1047: Update TestUtils to use .h and .cpp files instead of .art

* RIC-1047: New .h and .cpp files

* Ignore RIC- folders for git

* RIC-1047: Add using for std::cout, std::cerr and std::endl

* include iostream in test header

* Added include guards to prevent multiple inclusion of header

* Updated cout, endl, added using chrono_literals

* Fixed order of include paths

Author: Elena Volkova

.gitignore

@@ -9,4 +9,5 @@ art-comp-test/tests/**/*_target/*
 art-comp-test/**/.vscode/art_build_settings.json
 art-comp-test/testLib_target/*
 art-comp-test/tests/*/logs/application.log
-art-samples/TcpRangeCounter/*/node_modules
+art-samples/TcpRangeCounter/*/node_modules
+RIC-*

art-comp-test/TestUtils/testLib.cpp

@@ -0,0 +1,22 @@
+#include <stdlib.h>
+#include "testLib.h"
+
+void TestUtils::fail(const std::string& msg) {
+	std::cerr << "TEST FAILED (" << msg << ")" << std::endl << std::flush;
+	exit(1);
+}
+
+void TestUtils::pass() {
+	std::cout << "***PASS***" << std::endl << std::flush;
+	//exit(0);
+}
+
+void TestUtils::assert_(bool cond, const char* expr, const char * file, int line, const char* msg) {
+	if (cond) {
+		std::string okMessage = "OK:  " + std::string(expr) + "\n";
+		std::cout << okMessage;
+		return;
+	}
+
+	std::cerr << "ASSERTION FAILED (" << msg << ")" << std::endl << std::flush;
+}

art-comp-test/TestUtils/testLib.h

@@ -0,0 +1,29 @@
+#ifndef TEST_LIB_H
+#define TEST_LIB_H
+
+#include <iostream>
+#include <string>
+
+using std::cout;
+using std::cerr;
+using std::endl;
+
+namespace TestUtils {
+
+	// Fail the test case with a message
+	void fail(const std::string& msg);
+
+	// Pass the test case
+	void pass();
+
+	// Assert on the condition being true. If not, the message (and condition expression and location of the assert)
+	// will be printed and the test case will fail.
+	void assert_(bool cond, const char* expr, const char * file, int line, const char* msg = "");
+	#define assert(cond, ...) assert_(cond, #cond, __FILE__, __LINE__, ##__VA_ARGS__)
+
+	#define PASS()            TestUtils::pass();    context()->abort()
+	#define FAIL(msg)         TestUtils::fail(msg);
+	#define ASSERT(cond, msg) TestUtils::assert(cond, msg)
+}
+
+#endif

art-comp-test/TestUtils/testlib.art

@@ -1,66 +0,0 @@
-[[rt::decl]]
-`    
-#include <string>
-#include <iostream>
-using namespace std;
-#include "../src/include/RTDiag.h"
-
-namespace TestUtils {
-
-	// Read test options from the command line
-	void getTestOptions(unsigned int& timeLimit);
-
-	// Fail the test case with a message
-	void fail(const std::string& msg);
-
-	// Pass the test case
-	void pass();
-
-	// Assert on the condition being true. If not, the message (and condition expression and location of the assert)
-	// will be printed and the test case will fail.
-	void assert_(bool cond, const char* expr, const char * file, int line, const char* msg = "");
-	#define assert(cond, ...) assert_(cond, #cond, __FILE__, __LINE__, ##__VA_ARGS__)
-
-	#define PASS()            TestUtils::pass();    context()->abort()
-	#define FAIL(msg)         TestUtils::fail(msg);
-	#define ASSERT(cond, msg) TestUtils::assert(cond, msg)
-}
-`
-
-[[rt::impl]]
-`
-#include <stdlib.h>
-
-void TestUtils::getTestOptions(unsigned int& timeLimit) {
-	int ac = RTMain::argCount();
-	const char * const * av = RTMain::argStrings();
-
-	while( --ac > 0 ) {
-		const char* arg = *++av;
-		if( RTMemoryUtil::strcmp( arg, "-timeLimit=", 11 ) == 0 )
-			timeLimit = RTMemoryUtil::atoi(*av + 11);
-	}
-}
-
-void TestUtils::fail(const std::string& msg) {
-	std::cerr << "TEST FAILED (" << msg << ")" << std::endl << std::flush;
-	exit(1);
-}
-
-void TestUtils::pass() {
-	std::cout << "***PASS***" << std::endl << std::flush;
-	//exit(0);
-}
-
-void TestUtils::assert_(bool cond, const char* expr, const char * file, int line, const char* msg) {
-	if (cond) {
-		std::string okMessage = "OK:  " + std::string(expr) + "\n";
-		std::cout << okMessage;
-		return;
-	}
-
-	std::cerr << "ASSERTION FAILED (" << msg << ")" << std::endl << std::flush;
-
-	RTDiag::failed_assertion(expr, file, line);
-}
-`

art-comp-test/TestUtils/testlib.art.h

@@ -0,0 +1 @@
+#include "testLib.h"

art-comp-test/TestUtils/testlib.tcjs

@@ -1,7 +1,7 @@
-//Transformation Configuration File
 let tc = TCF.define(TCF.ART_TO_CPP);
 tc.targetFolder = 'testLib_target';
 tc.unitName = 'TestLibUnit';
+tc.cppCodeStandard = 'C++ 17';
 
 // Uncomment to debug with Visual Studio
 /*

art-comp-test/tc.code-workspace

@@ -0,0 +1,9 @@
+{ "folders": [
+        {
+            "path": "TestUtils"
+        },
+        {
+            "path": "tests/tc_include_paths"
+        }
+    ]
+}

art-comp-test/tests/cpp_source_files/cpp_source_files.art

@@ -9,7 +9,7 @@ capsule Top {
         initial -> State
         `
             bool isSimple = is_simple(17);
-            std::cout << "is_simple(17) = " << isSimple << endl;
+            cout << "is_simple(17) = " << isSimple << endl;
             ASSERT(is_simple(17) == true, "is_simple(17) function returned false");
             ASSERT(is_simple(15) == false, "is_simple(15) function returned true");
 

art-comp-test/tests/dependency_injection_static/dependency_injection_static.art

@@ -3,6 +3,10 @@ protocol PROTO {
 };
 
 capsule Top {
+    [[rt::impl_preface]]
+    `
+        #include "CapsuleFactory.h"
+    `
     part pinger : Pinger;
     part logger : AbstractLogger;
 

art-comp-test/tests/dependency_injection_static/top.tcjs

@@ -4,7 +4,6 @@ tc.prerequisites = ["../../TestUtils/testlib.tcjs"];
 tc.targetFolder = 'dependency_injection_static_target';
 tc.commonPreface = `
 #include <iostream>
-#include "testlib.art.h"
-#include "CapsuleFactory.h"
+#include "testLib.h"
 `;
 tc.capsuleFactory = '&CapsuleFactory::factory';