fix some more boolean operations of groundtruth.result

Author: floweisshardt

atf_core/scripts/analyser.py

@@ -13,15 +13,14 @@
 import yaml
 
 from atf_core import ATFConfigurationParser
-from atf_msgs.msg import AtfResult, TestResult, TestblockResult, MetricResult, TestblockStatus, KeyValue, DataStamped
+from atf_msgs.msg import AtfResult, TestResult, TestblockResult, MetricResult, TestblockStatus, KeyValue, DataStamped, Groundtruth
 from atf_metrics import metrics_helper
 
 class Analyser:
     def __init__(self, package_name, test_generation_config_file = "atf/test_generation_config.yaml"):
         print "ATF analyser: started!"
         start_time = time.time()
         self.ns = "/atf/"
-        self.error = False
         self.package_name = package_name
 
         # parse configuration
@@ -182,7 +181,7 @@ def aggregate_results(self, atf_result):
                         #print "    tl_test=", tl_test
                         metric_result = MetricResult()
                         status = TestblockStatus.SUCCEEDED
-                        groundtruth_result = True
+                        groundtruth_result = Groundtruth.SUCCEEDED
                         groundtruth_error_message = ""
                         details = []
                         for test in mbt[metric][testblock].keys():
@@ -201,8 +200,8 @@ def aggregate_results(self, atf_result):
 
                                 # aggregate groundtruth from every metric_result
                                 groundtruth = mbt[metric][testblock][test].groundtruth
-                                if groundtruth.result == False:
-                                    groundtruth_result = False
+                                if groundtruth.result != Groundtruth.SUCCEEDED:
+                                    groundtruth_result = Groundtruth.FAILED
                                     if groundtruth_error_message != "":
                                         groundtruth_error_message += "\n"
                                     groundtruth_error_message += "groundtruth missmatch in subtest %s"%(test)
@@ -272,7 +271,7 @@ def aggregate_results(self, atf_result):
                     metric_result = tbm[test][testblock][metric]
                     testblock_result.results.append(metric_result)
                     # aggregate metric result
-                    if metric_result.groundtruth.result == False:
+                    if metric_result.groundtruth.result != Groundtruth.SUCCEEDED:
                         testblock_result.result = False
                         testblock_result.error_message += "\n     - metric '%s': %s"%(metric_result.name, metric_result.groundtruth.error_message)
 

atf_core/src/atf_core/testblock.py

@@ -12,7 +12,7 @@ def __init__(self, name, metric_handles, recorder_handle):
         self.trigger = None
         self.timestamp = None
         self.exception = None
-        self.status = None
+        self.status = TestblockStatus.INACTIVE
 
     def get_result(self):
 
@@ -34,7 +34,7 @@ def get_result(self):
                 testblock_result.results.append(metric_result)
 
                 # aggregate result
-                if metric_result.groundtruth.result != None and metric_result.groundtruth.result != Groundtruth.SUCCEEDED:
+                if metric_result.groundtruth.result != Groundtruth.SUCCEEDED:
                     testblock_result.result = False
                     testblock_result.error_message += "\n     - metric '%s': %s"%(metric_result.name, metric_result.groundtruth.error_message)
                     #print testblock_result.groundtruth_error_message

atf_metrics/src/atf_metrics/calculate_interface.py

@@ -159,11 +159,11 @@ def calculate_data_and_details(self):
         node_name = self.params['node']
         if node_name not in self.api_dict:
             details = "node " + node_name + " is not in api"
-            groundtruth.result = False
+            groundtruth.result = Groundtruth.FAILED
             data = 0.0
         else:
             details = "node " + node_name + " is in api"
-            groundtruth.result = True
+            groundtruth.result = Groundtruth.SUCCEEDED
             data = 100.0
             for interface, interface_data in self.params.items():
                 if interface == "publishers" or interface == "subscribers" or interface == "services":
@@ -175,16 +175,16 @@ def calculate_data_and_details(self):
                         name_check, type_check = self.check_interface(topic_name, topic_type, self.api_dict[node_name][interface])
                         if not name_check:
                             details += ", but " + topic_name + " is not an interface of node " + node_name + ". Interfaces are: " + str(self.api_dict[node_name][interface])
-                            groundtruth.result = False
+                            groundtruth.result = Groundtruth.FAILED
                             data = 33.3
                         else:
                             if not type_check:
                                 details += ", but " + topic_name + " (with type " + topic_type + ") is not an interface of node " + node_name + ". Interfaces are: " + str(self.api_dict[node_name][interface])
-                                groundtruth.result = False
+                                groundtruth.result = Groundtruth.FAILED
                                 data = 66.0
                             else: # all Ok
                                 details += ", all interfaces of node " + node_name + ": OK"
-                                groundtruth.result = True
+                                groundtruth.result = Groundtruth.SUCCEEDED
                                 data = 100.0
         return data, details
 

atf_metrics/src/atf_metrics/calculate_user_result.py

@@ -94,7 +94,6 @@ def get_result(self):
         # check if result is available
         if self.metric_result.groundtruth.result == Groundtruth.UNSET and not self.groundtruth.available:
             # let the analyzer know that this test failed
-            print self.metric_result.groundtruth.result, self.status.status
             metric_result.groundtruth.result = Groundtruth.FAILED
             metric_result.groundtruth.error_message = "testblock %s stopped without user_result"%self.testblock_name
             return metric_result

atf_plotter/scripts/plot.py

@@ -5,7 +5,7 @@
 import matplotlib as mpl
 mpl.style.use('classic')
 
-from atf_msgs.msg import AtfResult, MetricResult, TestblockStatus
+from atf_msgs.msg import AtfResult, MetricResult, TestblockStatus, Groundtruth
 from atf_core import ATFConfigurationParser
 
 import matplotlib.pyplot as plt
@@ -143,7 +143,7 @@ def plot_benchmark(self, style, sharey, hide_groundtruth, hide_min_max, filter_t
 
                     # set marker transparency (filled or transparent)
                     if metric_result.status == TestblockStatus.SUCCEEDED\
-                        and (metric_result.groundtruth.result or not metric_result.groundtruth.available):
+                        and (metric_result.groundtruth.result == Groundtruth.SUCCEEDED or not metric_result.groundtruth.available):
                         markerfacecolor = None      # plot filled marker
                     else:
                         markerfacecolor = 'None'    # plot transparent marker