Skip to content
This repository has been archived by the owner on Jul 5, 2019. It is now read-only.

Commit

Permalink
Rename XL Test -> XL TestView
Browse files Browse the repository at this point in the history
  • Loading branch information
amolenaar committed Jun 3, 2015
1 parent e1097ec commit ea034f9
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 26 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Expand Up @@ -42,7 +42,7 @@ apply plugin: 'eclipse'
apply plugin: 'idea'

group = "com.xebialabs.xltest.ci"
description = "Aggregate your test results in <a href='http://www.xebialabs.com'>XebiaLabs XL Test</a>."
description = "Aggregate your test results in <a href='http://www.xebialabs.com'>XebiaLabs XL TestView</a>."

// starting with jenkins 1.608 this should move to 1.7
sourceCompatibility = '1.6'
Expand All @@ -67,9 +67,9 @@ localizer.dependsOn deleteGeneratedSrcLocalizer

jenkinsPlugin {
coreVersion = '1.580.3' // we need to support LTS versions
displayName = "XL Test Plugin"
url = 'https://wiki.jenkins-ci.org/display/JENKINS/XL+Test+Plugin'
gitHubUrl = 'https://github.com/jenkinsci/xltest-plugin'
displayName = "XL TestView Plugin"
url = 'https://wiki.jenkins-ci.org/display/JENKINS/XL+TestView+Plugin'
gitHubUrl = 'https://github.com/jenkinsci/xltestview-plugin'

developers {
developer {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
@@ -1 +1 @@
rootProject.name = "xltest-plugin-plugin"
rootProject.name = "xltestview-plugin-plugin"
22 changes: 11 additions & 11 deletions src/main/java/com/xebialabs/xltest/ci/XLTestNotifier.java
@@ -1,7 +1,7 @@
/**
* Copyright (c) 2014-2015, XebiaLabs B.V., All rights reserved.
* <p/>
* The XL Test plugin for Jenkins is licensed under the terms of the GPLv2
* The XL TestView plugin for Jenkins is licensed under the terms of the GPLv2
* <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most XebiaLabs
* Libraries. There are special exceptions to the terms and conditions of the
* GPLv2 as it is applied to this software, see the FLOSS License Exception
Expand Down Expand Up @@ -90,7 +90,7 @@ public BuildStepMonitor getRequiredMonitorService() {
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
PrintStream logger = listener.getLogger();
if (!build.getResult().completeBuild) {
logger.printf("[XL Test] Not sending test run data since the build was aborted\n");
logger.printf("[XL TestView] Not sending test run data since the build was aborted\n");
// according to javadoc we have to do this...
// TODO: or throw an exception?
return true;
Expand All @@ -100,12 +100,12 @@ public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, Build
// TODO: metadata.put("buildEnvironment", build.getEnvironment(listener));
// TODO: metadata.put("ciServerVersion", Jenkins.getVersion().toString());

logger.printf("[XL Test] Uploading test run data to '%s'\n", getDescriptor().getServerUrl());
logger.printf("[XL TestView] Uploading test run data to '%s'\n", getDescriptor().getServerUrl());

String rootUrl = Jenkins.getInstance().getRootUrl();
if (rootUrl == null) {
LOG.error("Unable to determine root URL for jenkins instance aborting post build step.");
logger.printf("[XL Test] unable to determine root URL for the jenkins instance\n");
logger.printf("[XL TestView] unable to determine root URL for the jenkins instance\n");
throw new IllegalStateException("Unable to determine root URL for jenkins instance. Aborting XL Test post build step.");
}
String jobUrl = rootUrl + build.getProject().getUrl();
Expand All @@ -129,10 +129,10 @@ public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, Build
uploadTestRun(ts, metadata, workspace, logger);
} catch (Exception e) {
if (build.getResult().equals(Result.FAILURE)) {
logger.printf("[XL Test] Reason: %s\n", e.getMessage());
logger.printf("[XL TestView] Reason: %s\n", e.getMessage());
} else {
logger.printf("[XL Test] XL Test changes the build status to UNSTABLE\n");
logger.printf("[XL Test] Reason: %s\n", e.getMessage());
logger.printf("[XL TestView] XL Test changes the build status to UNSTABLE\n");
logger.printf("[XL TestView] Reason: %s\n", e.getMessage());
build.setResult(Result.UNSTABLE);
}
}
Expand All @@ -144,17 +144,17 @@ public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, Build
private void uploadTestRun(TestSpecificationDescribable ts, Map<String, Object> metadata, FilePath workspace, PrintStream logger) throws InterruptedException, IOException {
try {
// TODO: title would be nicer..
logger.printf("[XL Test] Uploading test run for test specification with id '%s'\n", ts.getTestSpecificationId());
logger.printf("[XL Test] data:\n%s\n", metadata.toString());
logger.printf("[XL TestView] Uploading test run for test specification with id '%s'\n", ts.getTestSpecificationId());
logger.printf("[XL TestView] data:\n%s\n", metadata.toString());

getXLTestServer().uploadTestRun(ts.getTestSpecificationId(), workspace, ts.getIncludes(), ts.getExcludes(), metadata, logger);
} catch (IOException e) {
// this probably means the build was aborted in some way...
logger.printf("[XL Test] Error uploading: %s\n", e.getMessage());
logger.printf("[XL TestView] Error uploading: %s\n", e.getMessage());
throw e;
} catch (InterruptedException e) {
// this probably means the build was aborted in some way...
logger.printf("[XL Test] Upload interrupted: %s\n", e.getMessage());
logger.printf("[XL TestView] Upload interrupted: %s\n", e.getMessage());
throw e;
}
}
Expand Down
@@ -1,7 +1,7 @@
/**
* Copyright (c) 2014-2015, XebiaLabs B.V., All rights reserved.
* <p/>
* The XL Test plugin for Jenkins is licensed under the terms of the GPLv2
* The XL TestView plugin for Jenkins is licensed under the terms of the GPLv2
* <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most XebiaLabs
* Libraries. There are special exceptions to the terms and conditions of the
* GPLv2 as it is applied to this software, see the FLOSS License Exception
Expand Down
@@ -1,7 +1,7 @@
/**
* Copyright (c) 2014-2015, XebiaLabs B.V., All rights reserved.
* <p/>
* The XL Test plugin for Jenkins is licensed under the terms of the GPLv2
* The XL TestView plugin for Jenkins is licensed under the terms of the GPLv2
* <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most XebiaLabs
* Libraries. There are special exceptions to the terms and conditions of the
* GPLv2 as it is applied to this software, see the FLOSS License Exception
Expand Down
@@ -1,7 +1,7 @@
/**
* Copyright (c) 2014-2015, XebiaLabs B.V., All rights reserved.
* <p/>
* The XL Test plugin for Jenkins is licensed under the terms of the GPLv2
* The XL TestView plugin for Jenkins is licensed under the terms of the GPLv2
* <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most XebiaLabs
* Libraries. There are special exceptions to the terms and conditions of the
* GPLv2 as it is applied to this software, see the FLOSS License Exception
Expand Down Expand Up @@ -49,7 +49,7 @@
public class XLTestServerImpl implements XLTestServer {
private static final Logger LOG = LoggerFactory.getLogger(XLTestServerImpl.class);

public static final String XL_TEST_LOG_FORMAT = "[XL Test] [%s] %s\n";
public static final String XL_TEST_LOG_FORMAT = "[XL TestView] [%s] %s\n";
public static final TypeReference<Map<String, TestSpecification>> MAP_OF_TESTSPECIFICATION = new TypeReference<Map<String, TestSpecification>>() {
};

Expand Down Expand Up @@ -146,7 +146,7 @@ public Object getVersion() {
@Override
public void uploadTestRun(String testSpecificationId, FilePath workspace, String includes, String excludes, Map<String, Object> metadata, PrintStream logger) throws IOException, InterruptedException {
if (testSpecificationId == null || testSpecificationId.isEmpty()) {
throw new IllegalArgumentException("No test specification id specified. Does the test specification still exist in XL Test?");
throw new IllegalArgumentException("No test specification id specified. Does the test specification still exist in XL TestView?");
}
try {
logInfo(logger, format("Collecting files from '%s' using include pattern: '%s' and exclude pattern '%s'",
Expand Down
Expand Up @@ -21,4 +21,4 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#

XLTestNotifier.displayName = Send test results to XL Test
XLTestNotifier.displayName = Send test results to XL TestView
@@ -1,4 +1,4 @@
<div>
<p>Select a credential that will be used to connect to the XL Test instance.</p>
<p>Select a credential that will be used to connect to the XL TestView instance.</p>
<p>Credentials can be managed <a href="${rootURL}/credentials">here</a>.</p>
</div>
@@ -1,4 +1,4 @@
<div>
If XL Test can only be accessed via a proxy you can specify its URL here. Only the host and port part are used.
If XL TestView can only be accessed via a proxy you can specify its URL here. Only the host and port part are used.
Alternatively configure the proxy settings for Jenkins itself and leave this blank.
</div>
@@ -1,4 +1,4 @@
<div>
The URL of the XL Test instance you want to connect to this Jenkins instance. This includes the any configured
The URL of the XL TestView instance you want to connect to this Jenkins instance. This includes the any configured
context root. For example: http://localhost:6516.
</div>
2 changes: 1 addition & 1 deletion src/main/resources/index.jelly
Expand Up @@ -3,5 +3,5 @@
This view is used to render the installed plugins page.
-->
<div>
Send test results from Jenkins to <a href='http://xebialabs.com/products/xl-test'>XebiaLabs XL Test</a>.
Send test results from Jenkins to <a href='http://xebialabs.com/products/xl-testview'>XebiaLabs XL TestView</a>.
</div>

0 comments on commit ea034f9

Please sign in to comment.