414963: fix URL in ConnectorDiscoveryRemoteTest

Construct discovery URL from the running Mylyn version.

Bug: 414963
Change-Id: Ic64bb1706d75e388589e7bf5e8d489a730339590
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=414963
Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>

5 files changed, 21 insertions, 38 deletions

diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/DiscoveryCore.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/DiscoveryCore.java
index 70539b29..6a47b6e6 100644
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/DiscoveryCore.java
+++ b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/DiscoveryCore.java
@@ -10,13 +10,28 @@
  *******************************************************************************/
 package org.eclipse.mylyn.internal.discovery.core;
 
+import org.eclipse.mylyn.commons.core.CoreUtil;
+import org.eclipse.osgi.util.NLS;
+import org.osgi.framework.Version;
+
 /**
  * @author David Green
  */
 public abstract class DiscoveryCore {
 	public static final String ID_PLUGIN = "org.eclipse.mylyn.discovery.core"; //$NON-NLS-1$
 
+	/**
+	 * The system property to override the URL of the Mylyn discovery directory.
+	 */
+	private static final String SYSTEM_PROPERTY_DIRECTORY_URL = "mylyn.discovery.directory"; //$NON-NLS-1$
+
 	private DiscoveryCore() {
 	}
 
+	public static String getDiscoveryUrl() {
+		Version v = CoreUtil.getFrameworkVersion();
+		String defaultUrl = NLS.bind(
+				"http://www.eclipse.org/mylyn/discovery/directory-{0}.{1}.xml", v.getMajor(), v.getMinor()); //$NON-NLS-1$
+		return System.getProperty(DiscoveryCore.SYSTEM_PROPERTY_DIRECTORY_URL, defaultUrl);
+	}
 }
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/DiscoveryTestConstants.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/DiscoveryTestConstants.java
deleted file mode 100644
index 10d6d701..00000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/DiscoveryTestConstants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests;
-
-/**
- * @author David Green
- */
-public abstract class DiscoveryTestConstants {
-
-	/**
-	 * the URL of the mylyn discovery directory, may be overridden using the system property
-	 * <tt>mylyn.discovery.directory</tt>
-	 */
-	public static final String DEFAULT_MYLYN_DISCOVERY_URL = System.getProperty("mylyn.discovery.directory",
-			"http://www.eclipse.org/mylyn/discovery/directory-3.3.xml");
-
-	private DiscoveryTestConstants() {
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryRemoteTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryRemoteTest.java
index f8a8d279..fa22e03c 100644
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryRemoteTest.java
+++ b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryRemoteTest.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.mylyn.commons.core.CoreUtil;
-import org.eclipse.mylyn.discovery.tests.DiscoveryTestConstants;
+import org.eclipse.mylyn.internal.discovery.core.DiscoveryCore;
 import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDiscovery;
 import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
 import org.eclipse.mylyn.internal.discovery.core.model.RemoteBundleDiscoveryStrategy;
@@ -42,7 +42,7 @@ public class ConnectorDiscoveryRemoteTest extends TestCase {
 
 		connectorDiscovery.getDiscoveryStrategies().clear();
 		RemoteBundleDiscoveryStrategy remoteStrategy = new RemoteBundleDiscoveryStrategy();
-		remoteStrategy.setDirectoryUrl(DiscoveryTestConstants.DEFAULT_MYLYN_DISCOVERY_URL);
+		remoteStrategy.setDirectoryUrl(DiscoveryCore.getDiscoveryUrl());
 		connectorDiscovery.getDiscoveryStrategies().add(remoteStrategy);
 	}
 
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/RemoteBundleDiscoveryStrategyTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/RemoteBundleDiscoveryStrategyTest.java
index 0582a3ae..9ae10365 100644
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/RemoteBundleDiscoveryStrategyTest.java
+++ b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/RemoteBundleDiscoveryStrategyTest.java
@@ -19,7 +19,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.discovery.tests.DiscoveryTestConstants;
+import org.eclipse.mylyn.internal.discovery.core.DiscoveryCore;
 import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCategory;
 import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCertification;
 import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
@@ -35,7 +35,7 @@ public class RemoteBundleDiscoveryStrategyTest extends TestCase {
 	@Override
 	protected void setUp() throws Exception {
 		discoveryStrategy = new RemoteBundleDiscoveryStrategy();
-		discoveryStrategy.setDirectoryUrl(DiscoveryTestConstants.DEFAULT_MYLYN_DISCOVERY_URL);
+		discoveryStrategy.setDirectoryUrl(DiscoveryCore.getDiscoveryUrl());
 		discoveryStrategy.setCategories(new ArrayList<DiscoveryCategory>());
 		discoveryStrategy.setConnectors(new ArrayList<DiscoveryConnector>());
 		discoveryStrategy.setCertifications(new ArrayList<DiscoveryCertification>());
diff --git a/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/ConnectorDiscoveryWizardMainPage.java b/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/ConnectorDiscoveryWizardMainPage.java
index b049e944..10af1c3f 100644
--- a/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/ConnectorDiscoveryWizardMainPage.java
+++ b/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/ConnectorDiscoveryWizardMainPage.java
@@ -19,6 +19,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.window.IShellProvider;
 import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.mylyn.internal.discovery.core.DiscoveryCore;
 import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDescriptor;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -30,10 +31,6 @@ import org.eclipse.swt.widgets.Display;
  */
 public class ConnectorDiscoveryWizardMainPage extends WizardPage implements IShellProvider {
 
-	private static final String DEFAULT_DIRECTORY_URL = "http://www.eclipse.org/mylyn/discovery/directory-3.10.xml"; //$NON-NLS-1$
-
-	private static final String SYSTEM_PROPERTY_DIRECTORY_URL = "mylyn.discovery.directory"; //$NON-NLS-1$
-
 	private static final int MINIMUM_HEIGHT = 480;
 
 	private DiscoveryViewer viewer;
@@ -60,7 +57,7 @@ public class ConnectorDiscoveryWizardMainPage extends WizardPage implements IShe
 		});
 		viewer.createControl(parent);
 
-		String url = System.getProperty(SYSTEM_PROPERTY_DIRECTORY_URL, DEFAULT_DIRECTORY_URL);
+		String url = DiscoveryCore.getDiscoveryUrl();
 		if (url.length() > 0) {
 			viewer.setDirectoryUrl(url);
 		}