Bug 540363 - An error in the p2 test suite

Have SimpleConfiguratorUtilsExtendedTest extend the correct class
and remove a superfluous test added to the wrong test class. The
removed test is completely duplicated by "testExtensionAdded" in
the SimpleConfiguratorTestExtendedConfigured class.

Change-Id: I0f416d865ccadcae0eeb093f8e4375604b9d055d
Signed-off-by: Mat Booth <mat.booth@redhat.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorUtilsExtendedConfiguredTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorUtilsExtendedConfiguredTest.java
index c60a2b089..cac1cecb0 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorUtilsExtendedConfiguredTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorUtilsExtendedConfiguredTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2017 IBM Corporation and others.
+ * Copyright (c) 2008, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -129,14 +129,6 @@ public class SimpleConfiguratorUtilsExtendedConfiguredTest extends SimpleConfigu
 		}
 	}
 
-	//on adding extension master must be selected in order to create new profile with extensions!
-	@Override
-	public void testSharedConfigurationMasterUnmodified() throws IOException {
-		storeTimestamp(new File(masterConfguration, relativeURL.getFile()).lastModified());
-		assertEquals(sharedConfiguration[1], configurator.chooseConfigurationURL(relativeURL, sharedConfiguration));
-		assertIsPropertySet(true);
-	}
-
 	private BundleInfo getBundle(String name, List<BundleInfo> list) {
 		for (BundleInfo info : list) {
 			if (info.getSymbolicName().equals(name)) {