diff options
3 files changed, 15 insertions, 18 deletions
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java index 7f4c638b..66c40aad 100644 --- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java +++ b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java @@ -251,8 +251,10 @@ public class WebUtilTest extends TestCase { GetMethod method = new GetMethod("/"); try { int statusCode = client.executeMethod(hostConfiguration, method); - fail("Expected SSLHandshakeException, got status: " + statusCode); + fail("Expected SSLHandshakeException or connection reset, got status: " + statusCode); } catch (SSLHandshakeException e) { + } catch (SocketException e) { + assertEquals("Connection reset", e.getMessage()); } assertFalse(testProxy.hasRequest()); 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 5c31526a..6d9408a1 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 @@ -45,16 +45,16 @@ public class RemoteBundleDiscoveryStrategyTest extends TestCase { discoveryStrategy.performDiscovery(new NullProgressMonitor()); assertFalse(discoveryStrategy.getCategories().isEmpty()); for (DiscoveryCategory category : discoveryStrategy.getCategories()) { - System.out.println(String.format("%s: %s: %s", category.getId(), category.getName(), - category.getDescription())); +// System.out.println(String.format("%s: %s: %s", category.getId(), category.getName(), +// category.getDescription())); assertNotNull(category.getId()); assertNotNull(category.getName()); assertNotNull(category.getDescription()); } assertFalse(discoveryStrategy.getConnectors().isEmpty()); for (DiscoveryConnector connector : discoveryStrategy.getConnectors()) { - System.out.println(String.format("%s: %s: %s", connector.getId(), connector.getName(), - connector.getDescription())); +// System.out.println(String.format("%s: %s: %s", connector.getId(), connector.getName(), +// connector.getDescription())); assertNotNull(connector.getId()); assertNotNull(connector.getKind()); assertNotNull(connector.getName()); @@ -63,7 +63,7 @@ public class RemoteBundleDiscoveryStrategyTest extends TestCase { // we _know_ that the bundle must have a plugin.xml... so verify that the source is working correctly assertNotNull(connector.getSource()); URL pluginXmlUrl = connector.getSource().getResource("plugin.xml"); - System.out.println("URL: " + pluginXmlUrl); +// System.out.println("URL: " + pluginXmlUrl); InputStream in = pluginXmlUrl.openStream(); assertNotNull(in); in.close(); diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java index 18fadd72..4f4fa27d 100644 --- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java +++ b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java @@ -25,7 +25,6 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; -import org.eclipse.mylyn.commons.core.CoreUtil; import org.eclipse.mylyn.commons.core.StatusHandler; import org.eclipse.mylyn.monitor.core.IInteractionEventListener; import org.eclipse.mylyn.monitor.core.InteractionEvent; @@ -141,17 +140,13 @@ public class MonitorUiPlugin extends AbstractUIPlugin { this.activityContextManager = new ActivityContextManager(new ArrayList<AbstractUserActivityMonitor>(0)); - if (CoreUtil.TEST_MODE) { - init(); - } else { - // FIXME: use UIJob - // delay initialization until workbench is realized - PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { - public void run() { - init(); - } - }); - } + // FIXME: use UIJob + // delay initialization until workbench is realized + PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + public void run() { + init(); + } + }); } @Override |