RESOLVED - bug 335097: changed proxy check
https://bugs.eclipse.org/bugs/show_bug.cgi?id=335097
diff --git a/org.eclipse.mylyn.discovery.tests/.classpath b/org.eclipse.mylyn.discovery.tests/.classpath
index 7caa4f1..c5eb0e9 100644
--- a/org.eclipse.mylyn.discovery.tests/.classpath
+++ b/org.eclipse.mylyn.discovery.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="**/internal/**"/>
diff --git a/org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.jdt.core.prefs
index eac04e2..068824e 100644
--- a/org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Thu May 27 19:02:55 PDT 2010
+#Wed Jan 26 00:14:12 PST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -9,17 +9,21 @@
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -71,6 +75,7 @@
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
diff --git a/org.eclipse.mylyn.discovery.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.discovery.tests/META-INF/MANIFEST.MF
index 8fe23ca..817438c 100644
--- a/org.eclipse.mylyn.discovery.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.discovery.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@
org.eclipse.mylyn.discovery.ui;bundle-version="1.0.0",
org.junit,
org.eclipse.core.runtime;bundle-version="3.1.0",
- org.eclipse.ui;bundle-version="3.1.0"
+ org.eclipse.ui;bundle-version="3.1.0",
+ org.eclipse.mylyn.commons.net
Export-Package: org.eclipse.mylyn.discovery.tests;x-internal:=true,
org.eclipse.mylyn.discovery.tests.core;x-internal:=true,
org.eclipse.mylyn.discovery.tests.core.mock;x-internal:=true,
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 2b8a436..01bcde4 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
@@ -11,11 +11,14 @@
package org.eclipse.mylyn.discovery.tests.core;
+import java.net.Proxy;
+
import junit.framework.TestCase;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.mylyn.commons.net.WebUtil;
import org.eclipse.mylyn.discovery.tests.DiscoveryTestConstants;
import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDiscovery;
import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
@@ -52,9 +55,10 @@
assertFalse(connectorDiscovery.getConnectors().isEmpty());
}
- public void testVerifyAvailability() throws CoreException {
+ public void testVerifyAvailability() throws Exception {
// XXX e3.5 skip test
- if (System.getProperty("http.proxyHost") != null) {
+ Proxy proxy = WebUtil.getProxy("domain.test", Proxy.Type.HTTP);
+ if (proxy != null && proxy != Proxy.NO_PROXY) {
Bundle bundle = Platform.getBundle("org.eclipse.equinox.p2.engine"); //$NON-NLS-1$
if (bundle != null && new VersionRange("[1.0.0,1.1.0)").isIncluded(bundle.getVersion())) { //$NON-NLS-1$
System.err.println("Skipping test on Eclipse 3.5 due to lack of proxy support");
