Provide test case to the properties closure

Itiviti · Apr 5, 2018 · 5ca3631 · 5ca3631
1 parent ca495ef
commit 5ca3631
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/main/groovy/com/ullink/testtools/elastic/TestExportTask.groovy b/src/main/groovy/com/ullink/testtools/elastic/TestExportTask.groovy
@@ -56,8 +56,6 @@ class TestExportTask extends Exec {
     @Optional
     String indexTimestampPattern = "yyyy-MM-dd"
 
-    @Internal
-    def resultProperties
     @Internal
     BulkProcessor processor
     @Internal
@@ -79,13 +77,6 @@ class TestExportTask extends Exec {
 
     @Override
     void exec() {
-        if (properties instanceof Closure) {
-            resultProperties = properties.call()
-        }
-        if (properties instanceof Map) {
-            resultProperties = properties
-        }
-
         ElasticSearchProcessor elasticSearchProcessor = new ElasticSearchProcessor()
         Properties parameters = overrideDefaultProperties(elasticSearchProcessor.getParameters())
 
@@ -187,7 +178,17 @@ class TestExportTask extends Exec {
                 result.resultType = TestResult.ResultType.SKIPPED
             }
         }
-        result.properties = resultProperties
+        result.properties = resolveProperties(p)
         result
     }
+
+    def resolveProperties(testCase) {
+        if (properties instanceof Closure) {
+            return properties.call(testCase)
+        }
+        if (properties instanceof Map) {
+            return properties
+        }
+        return null
+    }
 }