Return final value of package variables #199

MartinGroscheTT · 2020-08-17T08:35:13Z

Resolves #138

Screenshots:

cpoenisch · 2020-08-17T10:45:47Z

src/main/java/de/tracetronic/jenkins/plugins/ecutest/env/TestEnvContributor.java

@@ -71,13 +72,20 @@
     */
    public static final String TEST_TIMEOUT = "TEST_TIMEOUT_";

+    /**
+     * Build environment variable part for the timeout running the test.


Wrong description

cpoenisch · 2020-08-17T10:46:29Z

src/main/java/de/tracetronic/jenkins/plugins/ecutest/env/TestEnvContributor.java

@@ -90,6 +98,9 @@ public void buildEnvironmentFor(@Nonnull final Run r, @Nonnull final EnvVars env
            envs.put(PREFIX + TEST_REPORT + id, action.getTestReportDir());
            envs.put(PREFIX + TEST_RESULT + id, action.getTestResult());
            envs.put(PREFIX + TEST_TIMEOUT + id, String.valueOf(action.getTimeout()));
+            for (Map.Entry<String, String> outParam : outParams.entrySet()) {
+                envs.put(PREFIX + TEST_RETVAL + outParam.getKey() + "_" + id, outParam.getValue());


param name is the key, no need for id

cpoenisch · 2020-08-17T10:48:15Z

src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/AbstractTestClient.java

        this.testFile = StringUtils.trimToEmpty(testFile);
        this.testConfig = testConfig;
        this.executionConfig = executionConfig;
+        this.outputParameters = outParams;


param names should match

cpoenisch · 2020-08-17T10:48:53Z

src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/AbstractTestClient.java

@@ -246,18 +270,22 @@ private void setGlobalConstants(final ETComClient comClient, final Map<String, S
        private final String testResult;
        private final String testReportDir;
        private final boolean isAborted;
+        private final Map<String, String> outputParam;


Be consistent with naming, see AbstractTestClient.java

cpoenisch · 2020-08-17T10:49:06Z

src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/AbstractTestClient.java

            this.testResult = testResult;
            this.testReportDir = testReportDir;
            this.isAborted = isAborted;
+            this.outputParam = outParam;


param names should match

cpoenisch · 2020-08-17T10:54:27Z

src/main/resources/de/tracetronic/jenkins/plugins/ecutest/test/Messages_de.properties

@@ -24,6 +24,8 @@ ImportProjectBuilder.DisplayName=[TT] Projekte importieren
 ImportProjectBuilder.PrzFileExtension=Archiv muss vom Dateityp ".prz" sein.
 ImportProjectConfig.DisplayName=Projekt aus Testmanagementsystem importieren
 ImportProjectDirConfig.DisplayName=Projektverzeichnis aus Testmanagementsystem importieren
+PackageOutputParameter.InvalidName=Parameteroutputname muss alphanumerisch sein. Er kann Unterstriche \


cpoenisch · 2020-08-17T10:55:15Z

...urces/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageOutputParameter/config.jelly

@@ -0,0 +1,17 @@
+<!--
+  Copyright (c) 2015-2019 TraceTronic GmbH


cpoenisch · 2020-08-17T10:55:20Z

.../de/tracetronic/jenkins/plugins/ecutest/test/config/PackageOutputParameter/config.properties

@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2015-2019 TraceTronic GmbH


cpoenisch · 2020-08-17T10:55:25Z

.../tracetronic/jenkins/plugins/ecutest/test/config/PackageOutputParameter/config_de.properties

@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2015-2019 TraceTronic GmbH


cpoenisch · 2020-08-17T10:55:33Z

src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageOutputParameter.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2015-2019 TraceTronic GmbH


cpoenisch

Add new build var to README#environment-variables

cpoenisch · 2020-08-18T08:07:32Z

...resources/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageConfig/config.properties

 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
+outputParameters.add=Add Output Parameter
+outputParameters.advanced=Package Output Parameter
+outputParameters.description=The configured package output parameter remain available throughout the entire test \


description is misleading

cpoenisch · 2020-08-18T08:07:35Z

...ources/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageConfig/config_de.properties

 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
+outputParameters.add=Output Parameter hinzuf\u00FCgen
+outputParameters.advanced=Package Output Parameter
+outputParameters.description=Die konfigurierten Package-Output-Parameter stehen w\u00E4hrend der Testausf\u00FChrung \


description is misleading

cpoenisch · 2020-08-18T08:12:36Z

src/main/resources/de/tracetronic/jenkins/plugins/ecutest/test/Messages_de.properties

@@ -24,6 +24,8 @@ ImportProjectBuilder.DisplayName=[TT] Projekte importieren
 ImportProjectBuilder.PrzFileExtension=Archiv muss vom Dateityp ".prz" sein.
 ImportProjectConfig.DisplayName=Projekt aus Testmanagementsystem importieren
 ImportProjectDirConfig.DisplayName=Projektverzeichnis aus Testmanagementsystem importieren
+PackageOutputParameter.InvalidName=R\u00FCckgabe-Parameter muss alphanumerisch sein. Er kann Unterstriche \
+        enthalten aber darf nicht mit einer Zahl beginnen oder Umlaute beinhalten.


comma before "aber"

cpoenisch · 2020-08-18T08:15:43Z

...in/resources/de/tracetronic/jenkins/plugins/ecutest/env/view/TestEnvActionView/summary.jelly

+                                <j:set var="varName" value="${outParam.getKey()}"/>
+                                <tr class="child-${testId}">
+                                    <td class="tooltip" tooltip="${%outputParameters}">
+                                        TT_TEST_RETVAL_${varName}_${testId}</td>


testId is obsolete

cpoenisch · 2020-08-18T08:17:10Z

src/test/java/de/tracetronic/jenkins/plugins/ecutest/env/TestEnvContributorIT.java

@@ -74,6 +74,7 @@ public void testWithTestPackageEnvInvisibleAction() throws Exception {
            envVars.get(TestEnvContributor.PREFIX + TestEnvContributor.TEST_RESULT + testId));
        assertEquals("TT_TEST_TIMEOUT_0 should match env action", String.valueOf(testEnvAction.getTimeout()),
            envVars.get(TestEnvContributor.PREFIX + TestEnvContributor.TEST_TIMEOUT + testId));
+        assertEquals("TT_TEST_RETVAL_0 should not exist",0, testEnvAction.getOutParams().size());


check positive case here

cpoenisch · 2020-08-19T08:40:58Z

src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/AbstractTestClient.java

@@ -39,6 +40,7 @@
    private String testReportDir;
    private String testResult;
    private boolean isAborted;
+    private Map<String, String> outputParameters;


Move to PackageClient class

* output parameter option in package config added * return value and display for output parameter implemented * review notes added * checkstyle warning fixed * tests and review notes added * packageInfo reverted * Correct naming for test info holder of packages * Tweak used wording in translations

MartinGroscheTT added 2 commits August 10, 2020 13:54

output parameter option in package config added

3a61140

return value and display for output parameter implemented

301b9b4

MartinGroscheTT added feature New feature request ecu-test labels Aug 17, 2020

MartinGroscheTT added this to the 2.19.0 milestone Aug 17, 2020

MartinGroscheTT requested a review from cpoenisch August 17, 2020 08:35

MartinGroscheTT self-assigned this Aug 17, 2020

cpoenisch requested changes Aug 17, 2020

View reviewed changes

MartinGroscheTT added 2 commits August 17, 2020 14:10

review notes added

f4d5a68

checkstyle warning fixed

8077f24

cpoenisch requested changes Aug 18, 2020

View reviewed changes

cpoenisch reviewed Aug 19, 2020

View reviewed changes

MartinGroscheTT and others added 5 commits August 20, 2020 08:50

tests and review notes added

e233d7c

packageInfo reverted

221c514

Correct naming for test info holder of packages

4b31a5b

Tweak used wording in translations

db19788

Tweak used wording in translations

42cfc95

cpoenisch approved these changes Aug 21, 2020

View reviewed changes

cpoenisch merged commit 84ab9ee into master Aug 21, 2020

cpoenisch deleted the i138-return-final-value-of-package-variables branch August 21, 2020 12:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Return final value of package variables #199

Return final value of package variables #199

MartinGroscheTT commented Aug 17, 2020 •

edited by cpoenisch

Loading

cpoenisch Aug 17, 2020

cpoenisch Aug 17, 2020

cpoenisch Aug 17, 2020

cpoenisch Aug 17, 2020

cpoenisch Aug 17, 2020

cpoenisch Aug 17, 2020

cpoenisch Aug 17, 2020

cpoenisch Aug 17, 2020

cpoenisch Aug 17, 2020

cpoenisch Aug 17, 2020

cpoenisch left a comment

cpoenisch Aug 18, 2020

cpoenisch Aug 18, 2020

cpoenisch Aug 18, 2020

cpoenisch Aug 18, 2020

cpoenisch Aug 18, 2020

cpoenisch Aug 19, 2020

		@@ -0,0 +1,17 @@
		<!--
		Copyright (c) 2015-2019 TraceTronic GmbH

		@@ -0,0 +1,93 @@
		/*
		* Copyright (c) 2015-2019 TraceTronic GmbH

Return final value of package variables #199

Return final value of package variables #199

Conversation

MartinGroscheTT commented Aug 17, 2020 • edited by cpoenisch Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cpoenisch left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MartinGroscheTT commented Aug 17, 2020 •

edited by cpoenisch

Loading