Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2016-08-23 19:49:04 +0000
committerAlexander Kurtakov2016-08-23 20:12:52 +0000
commit9c43c40facb6532c0caee9095324e321e3e39567 (patch)
tree07a7c54b4005f18b59ee05275ce38cdeeeda0ddb
parentdfc26ceaafe0fb0957c8821f6081b9699ad29657 (diff)
downloadorg.eclipse.linuxtools-9c43c40facb6532c0caee9095324e321e3e39567.tar.gz
org.eclipse.linuxtools-9c43c40facb6532c0caee9095324e321e3e39567.tar.xz
org.eclipse.linuxtools-9c43c40facb6532c0caee9095324e321e3e39567.zip
docker: Cleanups.
* Remove useless throws. * Remove useless suppress warnings. Change-Id: I4f8715764f55a2246d5cfaf566a2e39235930d35 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-on: https://git.eclipse.org/r/79559 Tested-by: Hudson CI
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionTest.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java16
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerConnectionSettingsFinder.java10
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/MenuAssertion.java4
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/ProjectExplorerViewRule.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/SWTUtils.java1
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java6
7 files changed, 14 insertions, 27 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionTest.java
index deb87087b0..dd053f5683 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionTest.java
@@ -85,7 +85,7 @@ public class DockerConnectionTest {
}
@Test
- public void shouldBeClosedWhenInvalidPathToCerts() throws DockerException {
+ public void shouldBeClosedWhenInvalidPathToCerts() {
// given
final DockerConnection dockerConnection = new DockerConnection.Builder().name("foo")
.tcpConnection(new TCPConnectionSettings("https://1.2.3.4:1234", "/invalid/path"));
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java
index 9a0dc78ab2..8455013ec1 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java
@@ -139,13 +139,9 @@ public class DockerComposeSWTBotTest {
Mockito.when(mockProcessLauncher.processBuilder(Matchers.anyString(),
Matchers.eq(DockerCompose.getDockerComposeCommandName()), CustomMatchers.arrayContains("stop"))
.workingDir(Matchers.anyString()).start()).thenReturn(mockDockerComposeStopProcess);
- Mockito.when(mockDockerComposeStopProcess.waitFor()).then(new Answer<Object>() {
-
- @Override
- public Object answer(InvocationOnMock invocation) throws Throwable {
- latch.countDown();
- return 0;
- }
+ Mockito.when(mockDockerComposeStopProcess.waitFor()).then(invocation -> {
+ latch.countDown();
+ return 0;
});
}
@@ -187,7 +183,7 @@ public class DockerComposeSWTBotTest {
@Test
@RunWithProject("foo")
- public void shouldStartDockerComposeFromScratch() throws CoreException, InterruptedException {
+ public void shouldStartDockerComposeFromScratch() throws CoreException {
// given
final DockerClient client = MockDockerClientFactory.build();
final DockerConnection dockerConnection = MockDockerConnectionFactory.from("Test", client)
@@ -233,7 +229,7 @@ public class DockerComposeSWTBotTest {
@Test
@RunWithProject("foo")
- public void shouldStopDockerCompose() throws CoreException, InterruptedException {
+ public void shouldStopDockerCompose() throws CoreException {
// given
shouldStartDockerComposeFromScratch();
// when
@@ -250,7 +246,7 @@ public class DockerComposeSWTBotTest {
@Test
@RunWithProject("foo")
- public void shouldRestartDockerCompose() throws CoreException, InterruptedException, DockerException {
+ public void shouldRestartDockerCompose() throws InterruptedException, DockerException {
// given
final DockerClient client = MockDockerClientFactory.build();
final DockerConnection dockerConnection = MockDockerConnectionFactory.from("Test", client)
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerConnectionSettingsFinder.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerConnectionSettingsFinder.java
index c2f8a8d2ee..43d3843c86 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerConnectionSettingsFinder.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerConnectionSettingsFinder.java
@@ -11,7 +11,6 @@
package org.eclipse.linuxtools.internal.docker.ui.testutils;
-import java.io.IOException;
import java.util.Collections;
import org.eclipse.linuxtools.docker.core.DockerConnectionManager;
@@ -41,21 +40,16 @@ public class MockDockerConnectionSettingsFinder {
/**
* Configures the {@link DockerConnectionManager} singleton to being able to
* detect a <strong>valid Unix Socket</strong> to a Docker daemon.
- *
- * @throws IOException
*/
- public static void validUnixSocketConnectionAvailable() throws IOException {
+ public static void validUnixSocketConnectionAvailable() {
validUnixSocketConnectionAvailable("mock", "unix:///var/run/docker.sock");
}
/**
* Configures the {@link DockerConnectionManager} singleton to being able to
* detect a <strong>valid Unix Socket</strong> to a Docker daemon.
- *
- * @throws IOException
*/
- public static void validUnixSocketConnectionAvailable(final String connectionName, final String unixSocketPath)
- throws IOException {
+ public static void validUnixSocketConnectionAvailable(final String connectionName, final String unixSocketPath) {
final IDockerConnectionSettingsFinder validUnixSocketConnectionAvailable = Mockito
.mock(IDockerConnectionSettingsFinder.class);
final UnixSocketConnectionSettings unixSocketConnectionSettings = new UnixSocketConnectionSettings(
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/MenuAssertion.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/MenuAssertion.java
index c353cd29b0..b750c4beb4 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/MenuAssertion.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/MenuAssertion.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015 Red Hat.
+ * Copyright (c) 2015, 2016 Red Hat 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
@@ -28,7 +28,6 @@ public class MenuAssertion extends AbstractSWTBotAssertion<MenuAssertion, SWTBot
return new MenuAssertion(actual);
}
- @SuppressWarnings("unchecked")
public MenuAssertion isVisible() {
notNullValue();
if (!actual.isEnabled()) {
@@ -37,7 +36,6 @@ public class MenuAssertion extends AbstractSWTBotAssertion<MenuAssertion, SWTBot
return this;
}
- @SuppressWarnings("unchecked")
public MenuAssertion isNotVisible() {
notNullValue();
if (actual.isEnabled()) {
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/ProjectExplorerViewRule.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/ProjectExplorerViewRule.java
index b0de77ffb0..7ee264260d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/ProjectExplorerViewRule.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/ProjectExplorerViewRule.java
@@ -28,7 +28,7 @@ public class ProjectExplorerViewRule extends ExternalResource {
public static final String PROJECT_EXPLORER_VIEW_ID = "org.eclipse.ui.navigator.ProjectExplorer";
@Override
- protected void before() throws Throwable {
+ protected void before() {
final SWTWorkbenchBot bot = new SWTWorkbenchBot();
SWTUtils.syncExec(() -> {
try {
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/SWTUtils.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/SWTUtils.java
index 372e22c7b9..283b3edf4c 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/SWTUtils.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/SWTUtils.java
@@ -436,7 +436,6 @@ public class SWTUtils {
return treeItem;
}
- @SuppressWarnings("unchecked")
public static SWTBotView getSWTBotView(final SWTWorkbenchBot bot, final String viewId) {
return bot.views().stream().filter(v -> v.getViewReference().getId().equals(viewId)).findFirst().orElse(null);
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java
index edf3e24fbc..b57042f944 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015 Red Hat.
+ * Copyright (c) 2015, 2016 Red Hat 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
@@ -18,8 +18,8 @@ import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionSettingsFinder;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CheckBoxAssertion;
-import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
+import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.RadioAssertion;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.SWTBotTreeItemAssertions;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.SWTUtils;
@@ -107,7 +107,7 @@ public class NewDockerConnectionSWTBotTest {
}
@Test
- public void shouldShowDefaultUnixSocketConnectionSettingsWithValidConnectionAvailable() throws IOException {
+ public void shouldShowDefaultUnixSocketConnectionSettingsWithValidConnectionAvailable() {
// given
MockDockerConnectionSettingsFinder.validUnixSocketConnectionAvailable();
// when

Back to the top