From d60702e301a7b144965ed031fa46ad10679d4775 Mon Sep 17 00:00:00 2001 From: Sam Davis Date: Thu, 21 Jul 2016 11:47:07 -0700 Subject: 495085: AllGerritTests calls fixProxyConfiguration Change-Id: I50bc6266dd981dabc3f29fbad1b2c6906b1c731d Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=495085 --- .../eclipse/mylyn/gerrit/tests/AllGerritTests.java | 223 +++++++++++---------- 1 file changed, 114 insertions(+), 109 deletions(-) diff --git a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/AllGerritTests.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/AllGerritTests.java index d49dd6b78..59915ac6c 100644 --- a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/AllGerritTests.java +++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/AllGerritTests.java @@ -1,109 +1,114 @@ -/******************************************************************************* - * Copyright (c) 2012, 2016 Tasktop Technologies and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Tasktop Technologies - initial API and implementation - *******************************************************************************/ - -package org.eclipse.mylyn.gerrit.tests; - -import java.util.List; - -import org.eclipse.mylyn.commons.sdk.util.ManagedTestSuite; -import org.eclipse.mylyn.commons.sdk.util.TestConfiguration; -import org.eclipse.mylyn.gerrit.tests.core.GerritConnectorTest; -import org.eclipse.mylyn.gerrit.tests.core.GerritSynchronizationTest; -import org.eclipse.mylyn.gerrit.tests.core.client.GerritCapabilitiesTest; -import org.eclipse.mylyn.gerrit.tests.core.client.GerritClientTest; -import org.eclipse.mylyn.gerrit.tests.core.client.GerritVersionTest; -import org.eclipse.mylyn.gerrit.tests.core.client.OpenIdAuthenticationTest; -import org.eclipse.mylyn.gerrit.tests.core.client.compat.ChangeDetailXTest; -import org.eclipse.mylyn.gerrit.tests.core.client.compat.PatchScriptXTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.AbandonInputTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.AccountInfoTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.AddReviewerResultTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.ChangeInfoTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.ProjectInfoTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.RestoreInputTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.ReviewInfoTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.ReviewInputTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.ReviewerInfoTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.ReviewerInputTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.SubmitInfoTest; -import org.eclipse.mylyn.gerrit.tests.core.client.rest.SubmitInputTest; -import org.eclipse.mylyn.gerrit.tests.support.GerritFixture; -import org.eclipse.mylyn.gerrit.tests.ui.GerritUrlHandlerTest; -import org.eclipse.mylyn.internal.gerrit.core.remote.GerritDataLocatorTest; -import org.eclipse.mylyn.internal.gerrit.core.remote.GerritReviewRemoteFactoryTest; -import org.eclipse.mylyn.internal.gerrit.core.remote.PatchSetDetailRemoteFactoryTest; -import org.eclipse.mylyn.internal.gerrit.core.remote.PatchSetRemoteFactoryTest; -import org.eclipse.mylyn.internal.gerrit.core.remote.ReviewHarnessTest; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @author Steffen Pingel - */ -public class AllGerritTests { - - public static Test suite() { - TestSuite suite = new ManagedTestSuite(AllGerritTests.class.getName()); - addTests(suite, TestConfiguration.getDefault()); - return suite; - } - - public static Test suite(TestConfiguration configuration) { - TestSuite suite = new TestSuite(AllGerritTests.class.getName()); - addTests(suite, configuration); - return suite; - } - - private static void addTests(TestSuite suite, TestConfiguration configuration) { - suite.addTestSuite(ReviewHarnessTest.class); - suite.addTestSuite(GerritVersionTest.class); - suite.addTestSuite(AbandonInputTest.class); - suite.addTestSuite(AccountInfoTest.class); - suite.addTestSuite(AddReviewerResultTest.class); - suite.addTestSuite(ChangeInfoTest.class); - suite.addTestSuite(ProjectInfoTest.class); - suite.addTestSuite(RestoreInputTest.class); - suite.addTestSuite(ReviewerInfoTest.class); - suite.addTestSuite(ReviewerInputTest.class); - suite.addTestSuite(ReviewInfoTest.class); - suite.addTestSuite(ReviewInputTest.class); - suite.addTestSuite(SubmitInfoTest.class); - suite.addTestSuite(SubmitInputTest.class); - suite.addTestSuite(ChangeDetailXTest.class); - suite.addTestSuite(PatchScriptXTest.class); - if (!configuration.isLocalOnly()) { - // network tests - suite.addTestSuite(OpenIdAuthenticationTest.class); - List fixtures = configuration.discover(GerritFixture.class, "gerrit"); //$NON-NLS-1$ - for (GerritFixture fixture : fixtures) { - if (!fixture.isExcluded()) { - addTests(suite, fixture); - } - } - } - } - - private static void addTests(TestSuite suite, GerritFixture fixture) { - fixture.createSuite(suite); - fixture.add(GerritClientTest.class); - fixture.add(GerritConnectorTest.class); - fixture.add(GerritSynchronizationTest.class); - fixture.add(GerritDataLocatorTest.class); - fixture.add(GerritReviewRemoteFactoryTest.class); - fixture.add(PatchSetRemoteFactoryTest.class); - fixture.add(PatchSetDetailRemoteFactoryTest.class); - fixture.add(GerritUrlHandlerTest.class); - fixture.add(GerritCapabilitiesTest.class); - fixture.done(); - } - -} +/******************************************************************************* + * Copyright (c) 2012, 2016 Tasktop Technologies and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Tasktop Technologies - initial API and implementation + *******************************************************************************/ + +package org.eclipse.mylyn.gerrit.tests; + +import java.util.List; + +import org.eclipse.mylyn.commons.sdk.util.CommonTestUtil; +import org.eclipse.mylyn.commons.sdk.util.ManagedTestSuite; +import org.eclipse.mylyn.commons.sdk.util.TestConfiguration; +import org.eclipse.mylyn.gerrit.tests.core.GerritConnectorTest; +import org.eclipse.mylyn.gerrit.tests.core.GerritSynchronizationTest; +import org.eclipse.mylyn.gerrit.tests.core.client.GerritCapabilitiesTest; +import org.eclipse.mylyn.gerrit.tests.core.client.GerritClientTest; +import org.eclipse.mylyn.gerrit.tests.core.client.GerritVersionTest; +import org.eclipse.mylyn.gerrit.tests.core.client.OpenIdAuthenticationTest; +import org.eclipse.mylyn.gerrit.tests.core.client.compat.ChangeDetailXTest; +import org.eclipse.mylyn.gerrit.tests.core.client.compat.PatchScriptXTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.AbandonInputTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.AccountInfoTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.AddReviewerResultTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.ChangeInfoTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.ProjectInfoTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.RestoreInputTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.ReviewInfoTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.ReviewInputTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.ReviewerInfoTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.ReviewerInputTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.SubmitInfoTest; +import org.eclipse.mylyn.gerrit.tests.core.client.rest.SubmitInputTest; +import org.eclipse.mylyn.gerrit.tests.support.GerritFixture; +import org.eclipse.mylyn.gerrit.tests.ui.GerritUrlHandlerTest; +import org.eclipse.mylyn.internal.gerrit.core.remote.GerritDataLocatorTest; +import org.eclipse.mylyn.internal.gerrit.core.remote.GerritReviewRemoteFactoryTest; +import org.eclipse.mylyn.internal.gerrit.core.remote.PatchSetDetailRemoteFactoryTest; +import org.eclipse.mylyn.internal.gerrit.core.remote.PatchSetRemoteFactoryTest; +import org.eclipse.mylyn.internal.gerrit.core.remote.ReviewHarnessTest; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author Steffen Pingel + */ +public class AllGerritTests { + + public static Test suite() { + if (CommonTestUtil.fixProxyConfiguration()) { + CommonTestUtil.dumpSystemInfo(System.err); + } + + TestSuite suite = new ManagedTestSuite(AllGerritTests.class.getName()); + addTests(suite, TestConfiguration.getDefault()); + return suite; + } + + public static Test suite(TestConfiguration configuration) { + TestSuite suite = new TestSuite(AllGerritTests.class.getName()); + addTests(suite, configuration); + return suite; + } + + private static void addTests(TestSuite suite, TestConfiguration configuration) { + suite.addTestSuite(ReviewHarnessTest.class); + suite.addTestSuite(GerritVersionTest.class); + suite.addTestSuite(AbandonInputTest.class); + suite.addTestSuite(AccountInfoTest.class); + suite.addTestSuite(AddReviewerResultTest.class); + suite.addTestSuite(ChangeInfoTest.class); + suite.addTestSuite(ProjectInfoTest.class); + suite.addTestSuite(RestoreInputTest.class); + suite.addTestSuite(ReviewerInfoTest.class); + suite.addTestSuite(ReviewerInputTest.class); + suite.addTestSuite(ReviewInfoTest.class); + suite.addTestSuite(ReviewInputTest.class); + suite.addTestSuite(SubmitInfoTest.class); + suite.addTestSuite(SubmitInputTest.class); + suite.addTestSuite(ChangeDetailXTest.class); + suite.addTestSuite(PatchScriptXTest.class); + if (!configuration.isLocalOnly()) { + // network tests + suite.addTestSuite(OpenIdAuthenticationTest.class); + List fixtures = configuration.discover(GerritFixture.class, "gerrit"); //$NON-NLS-1$ + for (GerritFixture fixture : fixtures) { + if (!fixture.isExcluded()) { + addTests(suite, fixture); + } + } + } + } + + private static void addTests(TestSuite suite, GerritFixture fixture) { + fixture.createSuite(suite); + fixture.add(GerritClientTest.class); + fixture.add(GerritConnectorTest.class); + fixture.add(GerritSynchronizationTest.class); + fixture.add(GerritDataLocatorTest.class); + fixture.add(GerritReviewRemoteFactoryTest.class); + fixture.add(PatchSetRemoteFactoryTest.class); + fixture.add(PatchSetDetailRemoteFactoryTest.class); + fixture.add(GerritUrlHandlerTest.class); + fixture.add(GerritCapabilitiesTest.class); + fixture.done(); + } + +} -- cgit v1.2.3