Simplify button assertions in docker tests

It's simpler to use assertTrue/False instead of going through one more level of indirection.
eclipse-linuxtools · Sep 4, 2024 · 29152d3 · 29152d3
1 parent 81dfba5
commit 29152d3
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 71 deletions.
diff --git a/...i.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java b/...i.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java
@@ -14,6 +14,7 @@
 package org.eclipse.linuxtools.internal.docker.ui.launch;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -35,7 +36,6 @@
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.ProjectInitializationRule;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.RunWithProject;
-import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ButtonAssertions;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ClearConnectionManagerRule;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ClearLaunchConfigurationsRule;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
@@ -297,7 +297,7 @@ public void shouldValidateLaunchConfiguration() throws CoreException {
 		// "OK" button
 		ComboAssertions.assertThat(bot.comboBox(0)).isEnabled().itemSelected("Test");
 		TextAssertions.assertThat(bot.text(2)).isEnabled().textEquals("/foo");
-		ButtonAssertions.assertThat(bot.button("Run")).isEnabled();
+		assertTrue(bot.button("Run").isEnabled());
 
 	}
 }
diff --git a/...i.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/ButtonAssertions.java b/...i.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/ButtonAssertions.java
diff --git a/...src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionSWTBotTest.java b/...src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionSWTBotTest.java
@@ -14,6 +14,8 @@
 package org.eclipse.linuxtools.internal.docker.ui.wizards;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -46,7 +48,6 @@
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerContainerConfigFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerHostConfigFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerImageFactory;
-import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ButtonAssertions;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CheckBoxAssertions;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
@@ -69,11 +70,10 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
+import org.mandas.docker.client.DockerClient;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
-import org.mandas.docker.client.DockerClient;
-
 /**
  * Testing the {@link EditDockerConnection} {@link Wizard}
  */
@@ -240,107 +240,107 @@ public void shouldReportProblemWhenMissingName() {
 		// given
 		configureUnixSocketConnection();
 		openConnectionEditionWizard("Test");
-		ButtonAssertions.assertThat(getFinishButton()).isEnabled();
+		assertTrue(getFinishButton().isEnabled());
 		// when
 		bot.text(0).setText("");
 		// then
-		ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
+		assertFalse(getFinishButton().isEnabled());
 	}
 
 	@Test
 	public void shouldReportProblemWhenMissingUnixSocketPath() {
 		// given
 		configureUnixSocketConnection();
 		openConnectionEditionWizard("Test");
-		ButtonAssertions.assertThat(getFinishButton()).isEnabled();
+		assertTrue(getFinishButton().isEnabled());
 		// when
 		bot.text(1).setText("");
 		// then
-		ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
+		assertFalse(getFinishButton().isEnabled());
 	}
 
 	@Test
 	public void shouldReportProblemWhenInvalidUnixSocketPath() {
 		// given
 		configureUnixSocketConnection();
 		openConnectionEditionWizard("Test");
-		ButtonAssertions.assertThat(getFinishButton()).isEnabled();
+		assertTrue(getFinishButton().isEnabled());
 		// when
 		bot.text(1).setText("/invalid/path");
 		// then
-		ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
+		assertFalse(getFinishButton().isEnabled());
 	}
 
 	@Test
 	public void shouldReportProblemWhenMissingHost() {
 		// given
 		configureTCPConnection();
 		openConnectionEditionWizard("Test");
-		ButtonAssertions.assertThat(getFinishButton()).isEnabled();
+		assertTrue(getFinishButton().isEnabled());
 		// when
 		bot.text(2).setText("");
 		// then
-		ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
+		assertFalse(getFinishButton().isEnabled());
 	}
 
 	@Test
 	public void shouldReportProblemWhenInvalidHostMissingScheme() {
 		// given
 		configureTCPConnection();
 		openConnectionEditionWizard("Test");
-		ButtonAssertions.assertThat(getFinishButton()).isEnabled();
+		assertTrue(getFinishButton().isEnabled());
 		// when
 		bot.text(2).setText("foo");
 		// then
-		ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
+		assertFalse(getFinishButton().isEnabled());
 	}
 
 	@Test
 	public void shouldReportProblemWhenInvalidHostInvalidScheme() {
 		// given
 		configureTCPConnection();
 		openConnectionEditionWizard("Test");
-		ButtonAssertions.assertThat(getFinishButton()).isEnabled();
+		assertTrue(getFinishButton().isEnabled());
 		// when
 		bot.text(2).setText("ftp://foo");
 		// then
-		ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
+		assertFalse(getFinishButton().isEnabled());
 	}
 
 	@Test
 	public void shouldReportProblemWhenInvalidHostMissingPort() {
 		// given
 		configureTCPConnection();
 		openConnectionEditionWizard("Test");
-		ButtonAssertions.assertThat(getFinishButton()).isEnabled();
+		assertTrue(getFinishButton().isEnabled());
 		// when
 		bot.text(2).setText("http://foo");
 		// then
-		ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
+		assertFalse(getFinishButton().isEnabled());
 	}
 
 	@Test
 	public void shouldReportProblemWhenMissingPathToCerts() {
 		// given
 		configureTCPConnection();
 		openConnectionEditionWizard("Test");
-		ButtonAssertions.assertThat(getFinishButton()).isEnabled();
+		assertTrue(getFinishButton().isEnabled());
 		// when
 		bot.text(3).setText("");
 		// then
-		ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
+		assertFalse(getFinishButton().isEnabled());
 	}
 
 	@Test
 	public void shouldReportProblemWhenInvalidPathToCerts() {
 		// given
 		configureTCPConnection();
 		openConnectionEditionWizard("Test");
-		ButtonAssertions.assertThat(getFinishButton()).isEnabled();
+		assertTrue(getFinishButton().isEnabled());
 		// when
 		bot.text(3).setText("/invalid/path");
 		// then
-		ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
+		assertFalse(getFinishButton().isEnabled());
 	}
 
 	@Test

diff --git a/...r.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullSWTBotTest.java b/...r.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullSWTBotTest.java
@@ -14,6 +14,7 @@
 package org.eclipse.linuxtools.internal.docker.ui.wizards;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertFalse;
 
 import java.util.concurrent.TimeUnit;
 
@@ -28,7 +29,6 @@
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockRegistryAccountManagerFactory;
-import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ButtonAssertions;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ClearConnectionManagerRule;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
@@ -43,11 +43,10 @@
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
-
 import org.mandas.docker.client.DockerClient;
 import org.mandas.docker.client.exceptions.DockerException;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
 
 /**
  * Testing the {@link ImagePull} wizard
@@ -105,7 +104,7 @@ public void shoulDisableSearchButtonWhenNoRegistrySelected() {
 		// when
 		bot.text(0).setText("jboss/wildfly:latest");
 		// then
-		ButtonAssertions.assertThat(bot.button("Finish")).isNotEnabled();
+		assertFalse(bot.button("Finish").isEnabled());
 	}
 
 	@Test
@@ -114,7 +113,7 @@ public void shouldNotAllowFinishWhenImageNameIsMissing() {
 		openPullWizard();
 		// when no data is input for the images name
 		// then
-		ButtonAssertions.assertThat(bot.button("Finish")).isNotEnabled();
+		assertFalse(bot.button("Finish").isEnabled());
 	}
 
 	@Test

diff --git a/...er.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSWTBotTest.java b/...er.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSWTBotTest.java
@@ -14,6 +14,7 @@
 package org.eclipse.linuxtools.internal.docker.ui.wizards;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertFalse;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,7 +39,6 @@
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerImageFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageInfoFactory;
-import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ButtonAssertions;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ClearConnectionManagerRule;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
@@ -52,16 +52,15 @@
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
-
 import org.mandas.docker.client.DockerClient;
 import org.mandas.docker.client.exceptions.DockerException;
 import org.mandas.docker.client.messages.Container;
 import org.mandas.docker.client.messages.ContainerCreation;
 import org.mandas.docker.client.messages.ContainerInfo;
 import org.mandas.docker.client.messages.Image;
 import org.mandas.docker.client.messages.ImageInfo;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
 
 /**
  * Testing the {@link ImageRun} wizard
@@ -119,7 +118,7 @@ public void shouldReportErrorIfContainerWithSameNameExists() {
 		// wait for https://bugs.eclipse.org/bugs/show_bug.cgi?id=482889 to be
 		// able to check the wizard validation message
 		//assertThat(bot.text(WizardMessages.getString("ImageRunSelectionPage.containerWithSameName"))).isNotNull();
-		ButtonAssertions.assertThat(bot.button("Finish")).isNotEnabled();
+		assertFalse(bot.button("Finish").isEnabled());
 	}
 
 	@Test

diff --git a/.../src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java b/.../src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java
@@ -13,6 +13,9 @@
 
 package org.eclipse.linuxtools.internal.docker.ui.wizards;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -24,7 +27,6 @@
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionSettingsFinder;
-import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ButtonAssertions;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CheckBoxAssertions;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
@@ -54,7 +56,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.mandas.docker.client.DockerClient;
 
 /**
@@ -88,7 +89,7 @@ public void lookupDockerExplorerView() throws Exception {
 		dockerExplorerViewBot = bot.viewById(DockerExplorerView.VIEW_ID);
 		dockerExplorerViewBot.show();
 		bot.views().stream().filter(v -> v.getReference().getId().equals(DockerContainersView.VIEW_ID)
-				|| v.getReference().getId().equals(DockerImagesView.VIEW_ID)).forEach(v -> v.close());
+				|| v.getReference().getId().equals(DockerImagesView.VIEW_ID)).forEach(SWTBotView::close);
 		dockerExplorerViewBot.setFocus();
 		this.addConnectionButton = dockerExplorerViewBot.toolbarButton("&Add Connection");
 	}
@@ -225,7 +226,7 @@ public void shouldNotAllowNewConnectionWithDifferentNameAndSameUnixSocketSetting
 		bot.text(0).setText("foo");
 		// then the wizard should not allow for completion because a connection
 		// with the connection settings already exists.
-		ButtonAssertions.assertThat(bot.button("Finish")).isNotEnabled();
+		assertFalse(bot.button("Finish").isEnabled());
 	}
 
 	@Test
@@ -241,7 +242,7 @@ public void shouldNotAllowNewConnectionWithDifferentNameAndSameTCPSettings() {
 		bot.text(0).setText("foo");
 		// then the wizard should not allow for completion because a connection
 		// with the connection settings already exists.
-		ButtonAssertions.assertThat(bot.button("Finish")).isNotEnabled();
+		assertFalse(bot.button("Finish").isEnabled());
 	}
 
 	@Test
@@ -260,7 +261,7 @@ public void shouldAllowNewConnectionWithDifferentNameAndUnixSettings() throws IO
 		bot.text(1).setText(otherDockerSocketTmpPath);
 		// then the wizard should not allow for completion because a connection
 		// with the connection settings already exists.
-		ButtonAssertions.assertThat(bot.button("Finish")).isEnabled();
+		assertFalse(bot.button("Finish").isEnabled());
 	}
 
 	@Test
@@ -278,7 +279,7 @@ public void shouldAllowNewConnectionWithDifferentNameAndTCPSettings() {
 		bot.text(2).setText("https://bar:1234");
 		// then the wizard should not allow for completion because a connection
 		// with the connection settings already exists.
-		ButtonAssertions.assertThat(bot.button("Finish")).isEnabled();
+		assertTrue(bot.button("Finish").isEnabled());
 	}
 
 	@Test