From 221c51437a18452084606cc4580a3fde45699793 Mon Sep 17 00:00:00 2001 From: MartinGroscheTT Date: Thu, 20 Aug 2020 12:57:11 +0200 Subject: [PATCH] packageInfo reverted --- .../test/client/AbstractTestClient.java | 53 ++----------------- .../ecutest/test/client/PackageClient.java | 28 ++++++++++ .../ecutest/test/client/ProjectClient.java | 20 +++---- .../config/PackageConfig/config.properties | 4 +- .../config/PackageConfig/config_de.properties | 4 +- 5 files changed, 46 insertions(+), 63 deletions(-) diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/AbstractTestClient.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/AbstractTestClient.java index 7e2d6dd8..3d6e6b93 100644 --- a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/AbstractTestClient.java +++ b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/AbstractTestClient.java @@ -237,9 +237,9 @@ private Map getGlobalConstantMap() { } /** - * Helper class storing project information about the test result and the test report directory. + * Helper class storing information about the test result and the test report directory. */ - protected static final class TestProjectInfoHolder implements Serializable { + protected static class TestInfoHolder implements Serializable { private static final long serialVersionUID = 1L; @@ -248,13 +248,13 @@ protected static final class TestProjectInfoHolder implements Serializable { private final boolean isAborted; /** - * Instantiates a new {@link TestProjectInfoHolder}. + * Instantiates a new {@link TestInfoHolder}. * * @param testResult the test result * @param testReportDir the test report directory * @param isAborted specifies whether test execution is aborted */ - public TestProjectInfoHolder(final String testResult, final String testReportDir, final boolean isAborted) { + public TestInfoHolder(final String testResult, final String testReportDir, final boolean isAborted) { this.testResult = testResult; this.testReportDir = testReportDir; this.isAborted = isAborted; @@ -273,51 +273,6 @@ public boolean isAborted() { } } - /** - * Helper class storing package information about the test result and the test report directory. - */ - protected static final class TestPackageInfoHolder implements Serializable { - - private static final long serialVersionUID = 1L; - - private final String testResult; - private final String testReportDir; - private final boolean isAborted; - private final Map outputParameters; - - /** - * Instantiates a new {@link TestPackageInfoHolder}. - * - * @param testResult the test result - * @param testReportDir the test report directory - * @param isAborted specifies whether test execution is aborted - * @param outputParameters the output parameter map - */ - public TestPackageInfoHolder(final String testResult, final String testReportDir, final boolean isAborted, - final Map outputParameters) { - this.testResult = testResult; - this.testReportDir = testReportDir; - this.isAborted = isAborted; - this.outputParameters = outputParameters; - } - - public String getTestResult() { - return testResult; - } - - public String getTestReportDir() { - return testReportDir; - } - - public boolean isAborted() { - return isAborted; - } - - public Map getOutputParameters() { - return outputParameters; - } - } - /** * Helper class storing information about the errors returned by checking packages and projects. */ diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/PackageClient.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/PackageClient.java index bf738c7d..4c4fb72c 100644 --- a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/PackageClient.java +++ b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/PackageClient.java @@ -448,4 +448,32 @@ public String getTestDescription() { return testDescription; } } + + /** + * Helper class storing package information about the test result and the test report directory. + */ + protected static final class TestPackageInfoHolder extends TestInfoHolder implements Serializable { + + private static final long serialVersionUID = 1L; + + private final Map outputParameters; + + /** + * Instantiates a new {@link TestPackageInfoHolder}. + * + * @param testResult the test result + * @param testReportDir the test report directory + * @param isAborted specifies whether test execution is aborted + * @param outputParameters the output parameter map + */ + public TestPackageInfoHolder(final String testResult, final String testReportDir, final boolean isAborted, + final Map outputParameters) { + super(testResult, testReportDir, isAborted); + this.outputParameters = outputParameters; + } + + public Map getOutputParameters() { + return outputParameters; + } + } } diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/ProjectClient.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/ProjectClient.java index 62e33992..4b71a9fe 100644 --- a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/ProjectClient.java +++ b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/ProjectClient.java @@ -83,7 +83,7 @@ public boolean runTestCase(final FilePath workspace, final Launcher launcher, fi try { // Run project - final TestProjectInfoHolder testInfo = launcher.getChannel().call( + final TestInfoHolder testInfo = launcher.getChannel().call( new RunProjectCallable(getTestFile(), getProjectConfig(), getExecutionConfig(), listener)); // Set project information @@ -180,7 +180,7 @@ public Boolean call() throws IOException { /** * {@link Callable} providing remote access to run a project via COM. */ - private static final class RunProjectCallable extends MasterToSlaveCallable { + private static final class RunProjectCallable extends MasterToSlaveCallable { private static final long serialVersionUID = 1L; @@ -206,10 +206,10 @@ private static final class RunProjectCallable extends MasterToSlaveCallable Project execution %s with result: %s", isAborted ? "aborted" : "completed", testResult)); final String testReportDir = new File(execInfo.getReportDb()).getParentFile().getAbsolutePath(); logger.logInfo(String.format("-> Test report directory: %s", testReportDir)); - return new TestProjectInfoHolder(testResult, testReportDir, isAborted); + return new TestInfoHolder(testResult, testReportDir, isAborted); } /** diff --git a/src/main/resources/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageConfig/config.properties b/src/main/resources/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageConfig/config.properties index db3dac7d..26f20ed2 100644 --- a/src/main/resources/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageConfig/config.properties +++ b/src/main/resources/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageConfig/config.properties @@ -5,8 +5,8 @@ # outputParameters.add=Add Output Parameter outputParameters.advanced=Package Output Parameter -outputParameters.description=The configured package output parameter are available after the test execution has \ - finished successfully. +outputParameters.description=The configured output parameters refer to package return values of the same name and\ + are available after the test execution has finished successfully. outputParameters.title=Package Output Parameter packageSection.title=Package Settings parameters.add=Add Parameter diff --git a/src/main/resources/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageConfig/config_de.properties b/src/main/resources/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageConfig/config_de.properties index f7b2711f..0c389c19 100644 --- a/src/main/resources/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageConfig/config_de.properties +++ b/src/main/resources/de/tracetronic/jenkins/plugins/ecutest/test/config/PackageConfig/config_de.properties @@ -5,8 +5,8 @@ # outputParameters.add=Output Parameter hinzuf\u00FCgen outputParameters.advanced=Package Output Parameter -outputParameters.description=Die konfigurierten Package-R\u00FCckgabe-Parameter stehen nach erfolgreicher \ - Testausf\u00FChrung als Variablen zur Verf\u00FCgung. +outputParameters.description=Die konfigurierten R\u00FCckgabe-Parameter beziehen sich auf gleichnamige\ + Package-Ausgabe-Parameter und stehen nach erfolgreicher Testausf\u00FChrung als Variablen zur Verf\u00FCgung. outputParameters.title=Package Output Parameter packageSection.title=Package-Einstellungen parameters.add=Parameter hinzuf\u00FCgen