Merge pull request #42 from fledge-iot/2.1.0RC

2.1.0RC

Author: dianomicbot

Jenkinsfile

@@ -0,0 +1,61 @@
+timestamps {
+    node("ubuntu18-agent") {
+        catchError {
+            checkout scm
+            dir_exists = sh (
+		        script: "test -d 'tests' && echo 'Y' || echo 'N' ",
+                returnStdout: true
+            ).trim()
+
+            if (dir_exists == 'N'){
+                currentBuild.result= 'FAILURE'
+                echo "No tests directory found! Exiting."
+                return
+            }
+            try {
+                stage("Prerequisites"){
+                    // Change to corresponding CORE_BRANCH as required
+                    // e.g. FOGL-xxxx, main etc.
+                    sh '''
+                        CORE_BRANCH='develop'
+                        ${HOME}/buildFledge ${CORE_BRANCH} ${WORKSPACE}
+                    '''
+                }
+            } catch (e) {
+                currentBuild.result = 'FAILURE'
+                echo "Failed to build Fledge; required to run the tests!"
+                return
+            }   
+
+            try { 
+                stage("Run Tests"){
+                    echo "Executing tests..."
+                    sh '''
+                        export FLEDGE_ROOT=$HOME/fledge
+                        cd tests && cmake . && make && ./RunTests --gtest_output=xml:test_output.xml
+                    '''
+                    echo "Done."
+                }
+            } catch (e) {
+                result = "TESTS FAILED" 
+                currentBuild.result = 'FAILURE'
+                echo "Tests failed!"
+            }
+
+            try {
+                stage("Publish Test Report"){
+                    junit "tests/test_output.xml"
+                }
+            } catch (e) {
+                result = "TEST REPORT GENERATION FAILED"
+                currentBuild.result = 'FAILURE'
+                echo "Failed to generate test reports!"
+            }
+        }
+
+        stage ("Cleanup"){
+            // Add here if any cleanup is required
+            echo "Done."
+        }
+    }
+}

VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

fledge.version

@@ -1 +1 @@
-fledge_version>=2.0
+fledge_version>=2.1

include/python35.h

@@ -59,6 +59,7 @@ class Python35Filter : public FledgeFilter
 			getFiltersPath() const { return m_filtersPath; };
 		bool	setScriptName();
 		bool	configure();
+		bool	initSuccess() { return m_init; }
 		bool	reconfigure(const std::string& newConfig);
 		void	lock() { m_configMutex.lock(); };
 		void	unlock() { m_configMutex.unlock(); };

tests/test_info.cpp

@@ -15,7 +15,7 @@ TEST(EXPRESSION_INFO, PluginInfo)
 {
 	PLUGIN_INFORMATION *info = plugin_info();
 	ASSERT_STREQ(info->name, "python35");
-	ASSERT_EQ(info->type, PLUGIN_TYPE_FILTER);
+	ASSERT_STREQ(info->type, PLUGIN_TYPE_FILTER);
 }
 
 TEST(EXPRESSION_INFO, PluginInfoConfigParse)

tests/test_python35.cpp

@@ -9,6 +9,7 @@
 #include <rapidjson/document.h>
 #include <reading.h>
 #include <reading_set.h>
+#include <python35.h>
 
 using namespace std;
 using namespace rapidjson;
@@ -291,7 +292,9 @@ TEST(PYTHON35, IndentError)
 	config->setValue("enable", "true");
 	ReadingSet *outReadings;
 	void *handle = plugin_init(config, &outReadings, Handler);
-	ASSERT_EQ(handle, (void *)NULL);
+	Python35Filter *hndl = (Python35Filter *) handle;
+	// handle is valid but it has not been configured/init properly/completely because of indent error in python script
+	ASSERT_FALSE(hndl && hndl->initSuccess());
 }
 
 #if 0