Skip to content

Commit 1a4e301

Browse files
gnl42gnl42
committed
Migrate to JUnit 5 - Jenkins #51
Task-Url: https://github.com/eclipse-mylyn/org.eclipse.mylyn/issues/issues/51
1 parent 693ab1c commit 1a4e301

File tree

21 files changed

+380
-294
lines changed

21 files changed

+380
-294
lines changed

‎mylyn.builds/org.eclipse.mylyn.jenkins.core/src/org/eclipse/mylyn/internal/jenkins/core/client/JenkinsServerInfo.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/*******************************************************************************
22
* Copyright (c) 2010, 2011 Tasktop Technologies and others.
3-
*
3+
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0 which is available at
66
* https://www.eclipse.org/legal/epl-2.0
7-
*
7+
*
88
* SPDX-License-Identifier: EPL-2.0
99
*
1010
* Tasktop Technologies - initial API and implementation
11+
* See git histpry
1112
*******************************************************************************/
1213

1314
package org.eclipse.mylyn.internal.jenkins.core.client;
@@ -18,7 +19,7 @@
1819
public class JenkinsServerInfo {
1920

2021
public enum Type {
21-
HUDSON, JENKINS
22+
JENKINS
2223
}
2324

2425
private final String version;

‎mylyn.builds/org.eclipse.mylyn.jenkins.core/src/org/eclipse/mylyn/internal/jenkins/core/client/RestfulJenkinsClient.java‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* Tasktop Technologies - improvements
1212
* Eike Stepper - improvements for bug 323759
1313
* Benjamin Muskalla - 323920: [build] config retrival fails for jobs with whitespaces
14+
* See git histpry
1415
*******************************************************************************/
1516

1617
package org.eclipse.mylyn.internal.jenkins.core.client;
@@ -470,18 +471,11 @@ public JenkinsServerInfo execute() throws IOException, JenkinsException, JAXBExc
470471
protected JenkinsServerInfo doProcess(CommonHttpResponse response, IOperationMonitor monitor)
471472
throws IOException, JenkinsException, JAXBException {
472473
Header header = response.getResponse().getFirstHeader("X-Jenkins"); //$NON-NLS-1$
473-
Type type;
474474
if (header == null) {
475-
type = Type.HUDSON;
476-
header = response.getResponse().getFirstHeader("X-Hudson"); //$NON-NLS-1$
477-
if (header == null) {
478-
throw new JenkinsException(NLS.bind("{0} does not appear to be a Hudson or Jenkins instance", //$NON-NLS-1$
479-
baseUrl()));
480-
}
481-
} else {
482-
type = Type.JENKINS;
475+
throw new JenkinsException(NLS.bind("{0} does not appear to be a Jenkins instance", //$NON-NLS-1$
476+
baseUrl()));
483477
}
484-
JenkinsServerInfo info = new JenkinsServerInfo(type, header.getValue());
478+
JenkinsServerInfo info = new JenkinsServerInfo(Type.JENKINS, header.getValue());
485479
return info;
486480
}
487481
}.run();

‎mylyn.builds/org.eclipse.mylyn.jenkins.tests/META-INF/MANIFEST.MF‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
1616
org.eclipse.search;bundle-version="0.0.0",
1717
org.eclipse.ui;bundle-version="0.0.0",
1818
org.eclipse.ui.workbench.texteditor;bundle-version="0.0.0",
19-
org.junit;bundle-version="4.8.2"
19+
junit-jupiter-api;bundle-version="5.10.3",
20+
junit-platform-suite-api;bundle-version="1.10.3",
21+
junit-platform-suite-engine;bundle-version="1.10.3",
22+
junit-platform-suite-commons;bundle-version="1.10.3",
23+
org.hamcrest;bundle-version="2.2.0"
2024
Bundle-RequiredExecutionEnvironment: JavaSE-17
2125
Bundle-Vendor: Eclipse Mylyn
2226
Export-Package: org.eclipse.mylyn.jenkins.tests;x-internal:=true,

‎mylyn.builds/org.eclipse.mylyn.jenkins.tests/src/org/eclipse/mylyn/jenkins/tests/AllJenkinsTests.java‎

Lines changed: 9 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,71 +7,25 @@
77
*
88
* Contributors:
99
* Tasktop Technologies - initial API and implementation
10+
* See git history
1011
*******************************************************************************/
1112

1213
package org.eclipse.mylyn.jenkins.tests;
1314

14-
import java.util.List;
15-
16-
import org.eclipse.mylyn.commons.sdk.util.CommonTestUtil;
17-
import org.eclipse.mylyn.commons.sdk.util.ManagedSuite;
18-
import org.eclipse.mylyn.commons.sdk.util.ManagedTestSuite;
19-
import org.eclipse.mylyn.commons.sdk.util.TestConfiguration;
2015
import org.eclipse.mylyn.jenkins.tests.client.JenkinsClientTest;
2116
import org.eclipse.mylyn.jenkins.tests.client.JenkinsUrlTest;
2217
import org.eclipse.mylyn.jenkins.tests.client.JenkinsValidationTest;
2318
import org.eclipse.mylyn.jenkins.tests.core.JenkinsConnectorTest;
2419
import org.eclipse.mylyn.jenkins.tests.core.JenkinsServerBehaviourTest;
2520
import org.eclipse.mylyn.jenkins.tests.integration.JenkinsIntegrationTest;
26-
import org.eclipse.mylyn.jenkins.tests.support.JenkinsFixture;
27-
28-
import junit.framework.Test;
29-
import junit.framework.TestSuite;
30-
31-
/**
32-
* @author Steffen Pingel
33-
*/
34-
@SuppressWarnings("nls")
21+
import org.junit.platform.suite.api.SelectClasses;
22+
import org.junit.platform.suite.api.Suite;
23+
import org.junit.platform.suite.api.SuiteDisplayName;
24+
25+
@Suite
26+
@SuiteDisplayName("Jenkins Test Suite")
27+
@SelectClasses({ SuiteSetup.class, JenkinsConnectorTest.class, JenkinsServerBehaviourTest.class, JenkinsUrlTest.class,
28+
JenkinsValidationTest.class, JenkinsClientTest.class, JenkinsIntegrationTest.class })
3529
public class AllJenkinsTests {
3630

37-
public static Test suite() {
38-
if (CommonTestUtil.fixProxyConfiguration()) {
39-
CommonTestUtil.dumpSystemInfo(System.err);
40-
}
41-
TestConfiguration testConfiguration = ManagedSuite.getTestConfigurationOrCreateDefault();
42-
testConfiguration.setLocalOnly(true); // No CI Server
43-
TestSuite suite = new ManagedTestSuite(AllJenkinsTests.class.getName());
44-
addTests(suite, testConfiguration);
45-
return suite;
46-
}
47-
48-
public static Test suite(TestConfiguration configuration) {
49-
TestSuite suite = new TestSuite(AllJenkinsTests.class.getName());
50-
addTests(suite, configuration);
51-
return suite;
52-
}
53-
54-
private static void addTests(TestSuite suite, TestConfiguration configuration) {
55-
suite.addTestSuite(JenkinsConnectorTest.class);
56-
suite.addTestSuite(JenkinsServerBehaviourTest.class);
57-
suite.addTestSuite(JenkinsUrlTest.class);
58-
if (!configuration.isLocalOnly()) {
59-
// network tests
60-
suite.addTestSuite(JenkinsValidationTest.class);
61-
List<JenkinsFixture> fixtures = configuration.discover(JenkinsFixture.class, "jenkins");
62-
for (JenkinsFixture fixture : fixtures) {
63-
if (fixture.isExcluded()
64-
|| fixture.isUseCertificateAuthentication() && CommonTestUtil.isCertificateAuthBroken()) {
65-
continue;
66-
}
67-
fixture.createSuite(suite);
68-
fixture.add(JenkinsClientTest.class);
69-
if (!fixture.isUseCertificateAuthentication()) {
70-
fixture.add(JenkinsIntegrationTest.class);
71-
}
72-
fixture.done();
73-
}
74-
}
75-
}
76-
7731
}

‎mylyn.builds/org.eclipse.mylyn.jenkins.tests/src/org/eclipse/mylyn/jenkins/tests/SuiteSetup.java‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2024 George Lindholm
3+
* All rights reserved. This program and the accompanying materials
4+
* are made available under the terms of the Eclipse Public License v2.0
5+
* which accompanies this distribution, and is available at
6+
* https://www.eclipse.org/legal/epl-v20.html.
7+
*
8+
* Contributors:
9+
* See git history
10+
*******************************************************************************/
11+
12+
package org.eclipse.mylyn.jenkins.tests;
13+
14+
import org.eclipse.mylyn.commons.sdk.util.CommonTestUtil;
15+
import org.eclipse.mylyn.commons.sdk.util.ManagedSuite;
16+
import org.eclipse.mylyn.commons.sdk.util.TestConfiguration;
17+
import org.eclipse.mylyn.jenkins.tests.support.JenkinsFixture;
18+
import org.junit.jupiter.api.Test;
19+
20+
public class SuiteSetup {
21+
private static boolean notLocalOnly = false;
22+
23+
private static boolean useCertificateAuthentication = false;
24+
25+
private static boolean fixtureActive = false;
26+
27+
static {
28+
if (CommonTestUtil.fixProxyConfiguration()) {
29+
CommonTestUtil.dumpSystemInfo(System.err);
30+
}
31+
TestConfiguration configuration = ManagedSuite.getTestConfigurationOrCreateDefault();
32+
33+
if (!configuration.isLocalOnly()) {
34+
// network tests
35+
notLocalOnly = true;
36+
for (JenkinsFixture fixture : configuration.discover(JenkinsFixture.class, "jenkins")) { //$NON-NLS-1$
37+
if (fixture.isExcluded()
38+
|| fixture.isUseCertificateAuthentication() && CommonTestUtil.isCertificateAuthBroken()) {
39+
continue;
40+
}
41+
fixtureActive = true;
42+
useCertificateAuthentication = !fixture.isUseCertificateAuthentication();
43+
}
44+
}
45+
}
46+
47+
@Test
48+
public void dummyTest() {
49+
// This is a dummy test to ensure the setup method is run
50+
}
51+
52+
public static boolean isNotLocalOnly() {
53+
return notLocalOnly;
54+
}
55+
56+
public static boolean isUseCertificateAuthentication() {
57+
return useCertificateAuthentication;
58+
}
59+
60+
public static boolean isFixtureActive() {
61+
return fixtureActive;
62+
}
63+
64+
}

0 commit comments

Comments
 (0)