Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve usability when migrating to this plugin (#155) #157

Merged
merged 5 commits into from
Jul 25, 2024
+7 −5
Merged

Improve usability when migrating to this plugin (#155) #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a64dfa7
Improve usability when migrating to this plugin (#155)
MarioFuchsTT Jul 22, 2024
cf964a0
Sync tests and apply rebranding convention (#155)
MarioFuchsTT Jul 22, 2024
168373b
Remove suffix to check if tests start (#155)
MarioFuchsTT Jul 22, 2024
094d0e4
Readd suffix (#155)
MarioFuchsTT Jul 22, 2024
2cda421
Add review notes (#155)
MarioFuchsTT Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ and [CX Templates](https://github.com/tracetronic/cx-templates).
### Tool configuration

ecu.test and trace.check installations are administrated in the global tool configuration at section "ecu.test". An installation entry
is specified by an arbitrary name and the path to the executable. The execution on a Jenkins agent requires
is specified by an arbitrary name and the full path including the executable file extension. The execution on a Jenkins agent requires
the adaptation of the path to the executable of the tool on the agent configuration page.

![ecu.test](docs/images/ecu.test-config.png "ecu.test-config")
Expand Down
5 changes: 3 additions & 2 deletions src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/ETInstallation.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ class ETInstallation extends ToolInstallation implements

if (!executables.contains(exeName)) {
throw new IllegalArgumentException("Tool executable path of '${getName()}': " +
"'${home}' does not contain a tracetronic tool!")
"'${home}' does not contain a tracetronic tool! " +
"Please ensure the path is a full path including the executable file extension, not a directory.")
}

return new File(home)
Expand Down Expand Up @@ -162,7 +163,7 @@ class ETInstallation extends ToolInstallation implements

@Override
String getDisplayName() {
'ecu.test'
'ecu.test (ecu.test execution plugin)'
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/ETInstallationIT.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ class ETInstallationIT extends IntegrationTestBase {
where:
toolName | executablePath | exceptionMessage
'INVALID-ET' | '' | "Tool executable path of \'${toolName}\' is not configured for this node!"
'INVALID-ET' | 'C:\\ecu.test\\INVALID.exe' | "Tool executable path of \'${toolName}\': \'${executablePath}\' does not contain a tracetronic tool!"
'INVALID-ET' | 'C:\\ecu.test\\INVALID.exe' | "Tool executable path of \'${toolName}\': \'${executablePath}\' does not contain a tracetronic tool! " +
"Please ensure the path is a full path including the executable file extension, not a directory."
}

@IgnoreIf({ os.linux })
Expand Down Expand Up @@ -155,7 +156,7 @@ class ETInstallationIT extends IntegrationTestBase {
toolPaths.contains("trace.check")
}

def 'getExeFileNames for TraceTronic tools' () {
def 'getExeFileNames for tracetronic tools' () {
expect:
ETInstallation.getExeFileNames() == Functions.isWindows() ?
['ECU-TEST.exe', 'TRACE-CHECK.exe', 'ecu.test.exe', 'trace.check.exe'] :
Expand Down
Loading