diff options
author | Robin Stocker | 2013-10-21 00:10:21 +0000 |
---|---|---|
committer | Matthias Sohn | 2013-10-22 13:38:24 +0000 |
commit | 046b472fe5224d1e4b3be713a8d488331a949586 (patch) | |
tree | c5e37a292e9f1214c03d7aaebcc7b1e56263a878 /org.eclipse.egit.ui.test/src/org/eclipse/egit/ui | |
parent | 1a03fa489d19fb3cfd85160351ae6b17abbd5af9 (diff) | |
download | egit-046b472fe5224d1e4b3be713a8d488331a949586.tar.gz egit-046b472fe5224d1e4b3be713a8d488331a949586.tar.xz egit-046b472fe5224d1e4b3be713a8d488331a949586.zip |
Change test execution to find all tests instead of using suites
There are multiple problems with using suites:
* They need to be kept up-to-date manually. There were some test classes
which were not referenced by suites and therefore never executed in
the Maven build. See parent changes for some examples. Before this
change, the output said "Tests run: 266", after: "Tests run: 311".
* When executing tests in Eclipse by selecting a project or package,
tests in suites are executed twice. In case of hierarchical
suites, it's even more than twice.
Change-Id: Iaee4b36839e4ae2b3529e82e312d84ed30175b29
Signed-off-by: Robin Stocker <robin@nibor.org>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui')
12 files changed, 0 insertions, 337 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/branch/BranchTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/branch/BranchTests.java deleted file mode 100644 index 9c2a7c0426..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/branch/BranchTests.java +++ /dev/null @@ -1,25 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2012 GitHub Inc. - * 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: - * Kevin Sawicki (GitHub Inc.) - initial API and implementation - *****************************************************************************/ -package org.eclipse.egit.ui.internal.branch; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Search unit test suite - */ -@RunWith(Suite.class) -@SuiteClasses({ BranchProjectTrackerTest.class, // -}) -public class BranchTests { - // Intentionally left blank -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/synchronize/model/AllGitModelTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/synchronize/model/AllGitModelTests.java deleted file mode 100644 index 247e27a3ad..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/synchronize/model/AllGitModelTests.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2011, Dariusz Luksza <dariusz@luksza.org> - * - * 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 - *******************************************************************************/ -package org.eclipse.egit.ui.internal.synchronize.model; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses({ GitModelBlobTest.class, - GitModelCacheFileTest.class, - GitModelCacheTest.class, - GitModelCacheTreeTest.class, - GitModelCommitTest.class, - GitModelRepositoryTest.class, - GitModelTreeTest.class, - GitModelWorkingTreeTest.class, - GitModelWorkingFileTest.class, - GitModelRootTest.class }) -public class AllGitModelTests { - // empty class, don't need anything here -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/SearchTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/SearchTests.java deleted file mode 100644 index 2ccfda39cf..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/SearchTests.java +++ /dev/null @@ -1,26 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2011 GitHub Inc. - * 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: - * Kevin Sawicki (GitHub Inc.) - initial API and implementation - *****************************************************************************/ -package org.eclipse.egit.ui.search; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Search unit test suite - */ -@RunWith(Suite.class) -@SuiteClasses({ CommitSearchDialogTest.class, // - CommitSearchQueryTest.class, // -}) -public class SearchTests { - // Intentionally left blank -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/submodule/SubmoduleTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/submodule/SubmoduleTests.java deleted file mode 100644 index 1e4b20fcaf..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/submodule/SubmoduleTests.java +++ /dev/null @@ -1,27 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2012 GitHub Inc. - * 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: - * Kevin Sawicki (GitHub Inc.) - initial API and implementation - *****************************************************************************/ -package org.eclipse.egit.ui.submodule; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Search unit test suite - */ -@RunWith(Suite.class) -@SuiteClasses({ SubmoduleAddTest.class, // - SubmoduleSyncTest.class, // - SubmoduleUpdateTest.class, // -}) -public class SubmoduleTests { - // Intentionally left blank -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllLocalTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllLocalTests.java deleted file mode 100644 index 79b95b231b..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllLocalTests.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2010, Ketan Padegaonkar <KetanPadegaonkar@gmail.com> - * - * 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 - *******************************************************************************/ -package org.eclipse.egit.ui.test; - -import org.eclipse.egit.ui.httpauth.PushTest; -import org.eclipse.egit.ui.internal.branch.BranchTests; -import org.eclipse.egit.ui.internal.dialogs.SpellcheckableMessageAreaTest; -import org.eclipse.egit.ui.operations.GitScopeUtilTest; -import org.eclipse.egit.ui.prefpages.configuration.GlobalConfigurationPageTest; -import org.eclipse.egit.ui.search.SearchTests; -import org.eclipse.egit.ui.submodule.SubmoduleTests; -import org.eclipse.egit.ui.test.commit.CommitTests; -import org.eclipse.egit.ui.test.history.HistoryViewTest; -import org.eclipse.egit.ui.test.team.actions.AllTeamActionTests; -import org.eclipse.egit.ui.test.trace.TraceConfigurationDialogTest; -import org.eclipse.egit.ui.view.repositories.AllRepositoriesViewTests; -import org.eclipse.egit.ui.view.synchronize.SynchronizeViewGitChangeSetModelTest; -import org.eclipse.egit.ui.view.synchronize.SynchronizeViewWorkspaceModelTest; -import org.eclipse.egit.ui.wizards.clone.GitCloneWizardHttpTest; -import org.eclipse.egit.ui.wizards.clone.GitCloneWizardTest; -import org.eclipse.egit.ui.wizards.share.SharingWizardTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses( { AllRepositoriesViewTests.class, // - GlobalConfigurationPageTest.class, // - GitCloneWizardTest.class, // - GitCloneWizardHttpTest.class, // - SharingWizardTest.class, // - AllTeamActionTests.class, // - HistoryViewTest.class, // - PushTest.class, - GitScopeUtilTest.class, - SpellcheckableMessageAreaTest.class, - TraceConfigurationDialogTest.class, - SynchronizeViewWorkspaceModelTest.class, - SynchronizeViewGitChangeSetModelTest.class, - CommitTests.class, - SearchTests.class, - BranchTests.class, - SubmoduleTests.class }) -public class AllLocalTests { - // empty class, don't need anything here -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllSWTAndNonSWTTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllSWTAndNonSWTTests.java deleted file mode 100644 index 7511416f7c..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllSWTAndNonSWTTests.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2011, Jens Baumgart <jens.baumgart@sap.com> - * - * 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 - *******************************************************************************/ -package org.eclipse.egit.ui.test; - -import org.eclipse.egit.ui.test.nonswt.AllNonSWTTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Test suite for running both the SWTBot tests and the Non-SWT Tests - * on maven build. - * - */ -@RunWith(Suite.class) -@SuiteClasses({ AllNonSWTTests.class, AllLocalTests.class }) - -public class AllSWTAndNonSWTTests { - // empty class, don't need anything here -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllTests.java deleted file mode 100644 index 4d898c54ab..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllTests.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2010, Ketan Padegaonkar <KetanPadegaonkar@gmail.com> - * - * 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 - *******************************************************************************/ -package org.eclipse.egit.ui.test; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses({ AllLocalTests.class // - // these need an outside connection - -}) -public class AllTests { - // empty class, don't need anything here -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitTests.java deleted file mode 100644 index eaf5ff009e..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitTests.java +++ /dev/null @@ -1,29 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2011 GitHub Inc. - * 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: - * Kevin Sawicki (GitHub Inc.) - initial API and implementation - *****************************************************************************/ -package org.eclipse.egit.ui.test.commit; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Commit unit test suite - */ -@RunWith(Suite.class) -@SuiteClasses({ CommitEditorInputFactoryTest.class, // - CommitEditorInputTest.class, // - CommitEditorTest.class, // - DiffStyleRangeFormatterTest.class, // - RepositoryCommitTest.class, // -}) -public class CommitTests { - // Intentionally left blank -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/junit/AllJUnitTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/junit/AllJUnitTests.java deleted file mode 100644 index 306c6fd7a4..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/junit/AllJUnitTests.java +++ /dev/null @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2011, Dariusz Luksza <dariusz@luksza.org> - * - * 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 - *******************************************************************************/ -package org.eclipse.egit.ui.test.junit; - -import org.eclipse.egit.ui.internal.synchronize.mapping.GitChangeSetSorterTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) @SuiteClasses({ GitChangeSetSorterTest.class }) -public class AllJUnitTests { - // Empty class -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/nonswt/AllNonSWTTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/nonswt/AllNonSWTTests.java deleted file mode 100644 index a8458685b1..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/nonswt/AllNonSWTTests.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2011, Philipp Thun <philipp.thun@sap.com> - * - * 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 - *******************************************************************************/ -package org.eclipse.egit.ui.test.nonswt; - -import org.eclipse.egit.ui.internal.actions.LinkedResourcesTest; -import org.eclipse.egit.ui.internal.decorators.DecoratableResourceAdapterTest; -import org.eclipse.egit.ui.internal.synchronize.model.AllGitModelTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses({ DecoratableResourceAdapterTest.class, - LinkedResourcesTest.class, - AllGitModelTests.class }) -public class AllNonSWTTests { - // Empty class -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/AllTeamActionTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/AllTeamActionTests.java deleted file mode 100644 index 8cf5297949..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/AllTeamActionTests.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 SAP AG 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: - * Mathias Kinzler (SAP AG) - initial implementation - *******************************************************************************/ -package org.eclipse.egit.ui.test.team.actions; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses({ BranchAndResetActionTest.class, // - TagActionTest.class, // - CommitActionTest.class, // - PushActionTest.class, // - FetchAndMergeActionTest.class, // - DisconnectConnectTest.class, // - ShowInTest.class, // - CompareActionsTest.class, // - ReplaceActionsTest.class, // - CreatePatchActionTest.class, // - MergeToolTest.class}) -public class AllTeamActionTests { - // nothing -} diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/AllRepositoriesViewTests.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/AllRepositoriesViewTests.java deleted file mode 100644 index db6afecfe8..0000000000 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/AllRepositoriesViewTests.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 SAP AG. - * 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: - * Mathias Kinzler (SAP AG) - initial implementation - *******************************************************************************/ -package org.eclipse.egit.ui.view.repositories; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses( { GitRepositoriesViewBranchHandlingTest.class,// - GitRepositoriesViewRepoHandlingTest.class,// - GitRepositoriesViewRepoDeletionTest.class,// - GitRepositoriesViewRemoteHandlingTest.class,// - GitRepositoriesViewFetchAndPushTest.class,// - GitRepositoriesViewTagHandlingTest.class,// - GitRepositoriesViewTest.class // -}) -public class AllRepositoriesViewTests { - // suite, nothing else -} |