Skip to content

Commit 29152d3

Browse files
akurtakovakurtakov
committed
Simplify button assertions in docker tests
It's simpler to use assertTrue/False instead of going through one more level of indirection.
1 parent 81dfba5 commit 29152d3

File tree

6 files changed

+40
-71
lines changed

6 files changed

+40
-71
lines changed

‎containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package org.eclipse.linuxtools.internal.docker.ui.launch;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
17+
import static org.junit.Assert.assertTrue;
1718

1819
import java.io.ByteArrayInputStream;
1920
import java.io.ByteArrayOutputStream;
@@ -35,7 +36,6 @@
3536
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
3637
import org.eclipse.linuxtools.internal.docker.ui.testutils.ProjectInitializationRule;
3738
import org.eclipse.linuxtools.internal.docker.ui.testutils.RunWithProject;
38-
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ButtonAssertions;
3939
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ClearConnectionManagerRule;
4040
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ClearLaunchConfigurationsRule;
4141
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
@@ -297,7 +297,7 @@ public void shouldValidateLaunchConfiguration() throws CoreException {
297297
// "OK" button
298298
ComboAssertions.assertThat(bot.comboBox(0)).isEnabled().itemSelected("Test");
299299
TextAssertions.assertThat(bot.text(2)).isEnabled().textEquals("/foo");
300-
ButtonAssertions.assertThat(bot.button("Run")).isEnabled();
300+
assertTrue(bot.button("Run").isEnabled());
301301

302302
}
303303
}

‎containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/swt/ButtonAssertions.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionSWTBotTest.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
package org.eclipse.linuxtools.internal.docker.ui.wizards;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
17+
import static org.junit.Assert.assertFalse;
18+
import static org.junit.Assert.assertTrue;
1719

1820
import java.io.File;
1921
import java.io.IOException;
@@ -46,7 +48,6 @@
4648
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerContainerConfigFactory;
4749
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerHostConfigFactory;
4850
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerImageFactory;
49-
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ButtonAssertions;
5051
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CheckBoxAssertions;
5152
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
5253
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
@@ -69,11 +70,10 @@
6970
import org.junit.Test;
7071
import org.junit.rules.TemporaryFolder;
7172
import org.junit.runner.RunWith;
73+
import org.mandas.docker.client.DockerClient;
7274
import org.mockito.ArgumentMatchers;
7375
import org.mockito.Mockito;
7476

75-
import org.mandas.docker.client.DockerClient;
76-
7777
/**
7878
* Testing the {@link EditDockerConnection} {@link Wizard}
7979
*/
@@ -240,107 +240,107 @@ public void shouldReportProblemWhenMissingName() {
240240
// given
241241
configureUnixSocketConnection();
242242
openConnectionEditionWizard("Test");
243-
ButtonAssertions.assertThat(getFinishButton()).isEnabled();
243+
assertTrue(getFinishButton().isEnabled());
244244
// when
245245
bot.text(0).setText("");
246246
// then
247-
ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
247+
assertFalse(getFinishButton().isEnabled());
248248
}
249249

250250
@Test
251251
public void shouldReportProblemWhenMissingUnixSocketPath() {
252252
// given
253253
configureUnixSocketConnection();
254254
openConnectionEditionWizard("Test");
255-
ButtonAssertions.assertThat(getFinishButton()).isEnabled();
255+
assertTrue(getFinishButton().isEnabled());
256256
// when
257257
bot.text(1).setText("");
258258
// then
259-
ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
259+
assertFalse(getFinishButton().isEnabled());
260260
}
261261

262262
@Test
263263
public void shouldReportProblemWhenInvalidUnixSocketPath() {
264264
// given
265265
configureUnixSocketConnection();
266266
openConnectionEditionWizard("Test");
267-
ButtonAssertions.assertThat(getFinishButton()).isEnabled();
267+
assertTrue(getFinishButton().isEnabled());
268268
// when
269269
bot.text(1).setText("/invalid/path");
270270
// then
271-
ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
271+
assertFalse(getFinishButton().isEnabled());
272272
}
273273

274274
@Test
275275
public void shouldReportProblemWhenMissingHost() {
276276
// given
277277
configureTCPConnection();
278278
openConnectionEditionWizard("Test");
279-
ButtonAssertions.assertThat(getFinishButton()).isEnabled();
279+
assertTrue(getFinishButton().isEnabled());
280280
// when
281281
bot.text(2).setText("");
282282
// then
283-
ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
283+
assertFalse(getFinishButton().isEnabled());
284284
}
285285

286286
@Test
287287
public void shouldReportProblemWhenInvalidHostMissingScheme() {
288288
// given
289289
configureTCPConnection();
290290
openConnectionEditionWizard("Test");
291-
ButtonAssertions.assertThat(getFinishButton()).isEnabled();
291+
assertTrue(getFinishButton().isEnabled());
292292
// when
293293
bot.text(2).setText("foo");
294294
// then
295-
ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
295+
assertFalse(getFinishButton().isEnabled());
296296
}
297297

298298
@Test
299299
public void shouldReportProblemWhenInvalidHostInvalidScheme() {
300300
// given
301301
configureTCPConnection();
302302
openConnectionEditionWizard("Test");
303-
ButtonAssertions.assertThat(getFinishButton()).isEnabled();
303+
assertTrue(getFinishButton().isEnabled());
304304
// when
305305
bot.text(2).setText("ftp://foo");
306306
// then
307-
ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
307+
assertFalse(getFinishButton().isEnabled());
308308
}
309309

310310
@Test
311311
public void shouldReportProblemWhenInvalidHostMissingPort() {
312312
// given
313313
configureTCPConnection();
314314
openConnectionEditionWizard("Test");
315-
ButtonAssertions.assertThat(getFinishButton()).isEnabled();
315+
assertTrue(getFinishButton().isEnabled());
316316
// when
317317
bot.text(2).setText("http://foo");
318318
// then
319-
ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
319+
assertFalse(getFinishButton().isEnabled());
320320
}
321321

322322
@Test
323323
public void shouldReportProblemWhenMissingPathToCerts() {
324324
// given
325325
configureTCPConnection();
326326
openConnectionEditionWizard("Test");
327-
ButtonAssertions.assertThat(getFinishButton()).isEnabled();
327+
assertTrue(getFinishButton().isEnabled());
328328
// when
329329
bot.text(3).setText("");
330330
// then
331-
ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
331+
assertFalse(getFinishButton().isEnabled());
332332
}
333333

334334
@Test
335335
public void shouldReportProblemWhenInvalidPathToCerts() {
336336
// given
337337
configureTCPConnection();
338338
openConnectionEditionWizard("Test");
339-
ButtonAssertions.assertThat(getFinishButton()).isEnabled();
339+
assertTrue(getFinishButton().isEnabled());
340340
// when
341341
bot.text(3).setText("/invalid/path");
342342
// then
343-
ButtonAssertions.assertThat(getFinishButton()).isNotEnabled();
343+
assertFalse(getFinishButton().isEnabled());
344344
}
345345

346346
@Test

‎containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullSWTBotTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package org.eclipse.linuxtools.internal.docker.ui.wizards;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
17+
import static org.junit.Assert.assertFalse;
1718

1819
import java.util.concurrent.TimeUnit;
1920

@@ -28,7 +29,6 @@
2829
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
2930
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
3031
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockRegistryAccountManagerFactory;
31-
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ButtonAssertions;
3232
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ClearConnectionManagerRule;
3333
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
3434
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
@@ -43,11 +43,10 @@
4343
import org.junit.Ignore;
4444
import org.junit.Rule;
4545
import org.junit.Test;
46-
import org.mockito.ArgumentMatchers;
47-
import org.mockito.Mockito;
48-
4946
import org.mandas.docker.client.DockerClient;
5047
import org.mandas.docker.client.exceptions.DockerException;
48+
import org.mockito.ArgumentMatchers;
49+
import org.mockito.Mockito;
5150

5251
/**
5352
* Testing the {@link ImagePull} wizard
@@ -105,7 +104,7 @@ public void shoulDisableSearchButtonWhenNoRegistrySelected() {
105104
// when
106105
bot.text(0).setText("jboss/wildfly:latest");
107106
// then
108-
ButtonAssertions.assertThat(bot.button("Finish")).isNotEnabled();
107+
assertFalse(bot.button("Finish").isEnabled());
109108
}
110109

111110
@Test
@@ -114,7 +113,7 @@ public void shouldNotAllowFinishWhenImageNameIsMissing() {
114113
openPullWizard();
115114
// when no data is input for the images name
116115
// then
117-
ButtonAssertions.assertThat(bot.button("Finish")).isNotEnabled();
116+
assertFalse(bot.button("Finish").isEnabled());
118117
}
119118

120119
@Test

‎containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSWTBotTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package org.eclipse.linuxtools.internal.docker.ui.wizards;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
17+
import static org.junit.Assert.assertFalse;
1718

1819
import java.util.ArrayList;
1920
import java.util.Arrays;
@@ -38,7 +39,6 @@
3839
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerImageFactory;
3940
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
4041
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageInfoFactory;
41-
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ButtonAssertions;
4242
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ClearConnectionManagerRule;
4343
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
4444
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
@@ -52,16 +52,15 @@
5252
import org.junit.ClassRule;
5353
import org.junit.Rule;
5454
import org.junit.Test;
55-
import org.mockito.ArgumentMatchers;
56-
import org.mockito.Mockito;
57-
5855
import org.mandas.docker.client.DockerClient;
5956
import org.mandas.docker.client.exceptions.DockerException;
6057
import org.mandas.docker.client.messages.Container;
6158
import org.mandas.docker.client.messages.ContainerCreation;
6259
import org.mandas.docker.client.messages.ContainerInfo;
6360
import org.mandas.docker.client.messages.Image;
6461
import org.mandas.docker.client.messages.ImageInfo;
62+
import org.mockito.ArgumentMatchers;
63+
import org.mockito.Mockito;
6564

6665
/**
6766
* Testing the {@link ImageRun} wizard
@@ -119,7 +118,7 @@ public void shouldReportErrorIfContainerWithSameNameExists() {
119118
// wait for https://bugs.eclipse.org/bugs/show_bug.cgi?id=482889 to be
120119
// able to check the wizard validation message
121120
//assertThat(bot.text(WizardMessages.getString("ImageRunSelectionPage.containerWithSameName"))).isNotNull();
122-
ButtonAssertions.assertThat(bot.button("Finish")).isNotEnabled();
121+
assertFalse(bot.button("Finish").isEnabled());
123122
}
124123

125124
@Test

‎containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313

1414
package org.eclipse.linuxtools.internal.docker.ui.wizards;
1515

16+
import static org.junit.Assert.assertFalse;
17+
import static org.junit.Assert.assertTrue;
18+
1619
import java.io.File;
1720
import java.io.IOException;
1821

@@ -24,7 +27,6 @@
2427
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
2528
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
2629
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionSettingsFinder;
27-
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.ButtonAssertions;
2830
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CheckBoxAssertions;
2931
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
3032
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
@@ -54,7 +56,6 @@
5456
import org.junit.Rule;
5557
import org.junit.Test;
5658
import org.junit.runner.RunWith;
57-
5859
import org.mandas.docker.client.DockerClient;
5960

6061
/**
@@ -88,7 +89,7 @@ public void lookupDockerExplorerView() throws Exception {
8889
dockerExplorerViewBot = bot.viewById(DockerExplorerView.VIEW_ID);
8990
dockerExplorerViewBot.show();
9091
bot.views().stream().filter(v -> v.getReference().getId().equals(DockerContainersView.VIEW_ID)
91-
|| v.getReference().getId().equals(DockerImagesView.VIEW_ID)).forEach(v -> v.close());
92+
|| v.getReference().getId().equals(DockerImagesView.VIEW_ID)).forEach(SWTBotView::close);
9293
dockerExplorerViewBot.setFocus();
9394
this.addConnectionButton = dockerExplorerViewBot.toolbarButton("&Add Connection");
9495
}
@@ -225,7 +226,7 @@ public void shouldNotAllowNewConnectionWithDifferentNameAndSameUnixSocketSetting
225226
bot.text(0).setText("foo");
226227
// then the wizard should not allow for completion because a connection
227228
// with the connection settings already exists.
228-
ButtonAssertions.assertThat(bot.button("Finish")).isNotEnabled();
229+
assertFalse(bot.button("Finish").isEnabled());
229230
}
230231

231232
@Test
@@ -241,7 +242,7 @@ public void shouldNotAllowNewConnectionWithDifferentNameAndSameTCPSettings() {
241242
bot.text(0).setText("foo");
242243
// then the wizard should not allow for completion because a connection
243244
// with the connection settings already exists.
244-
ButtonAssertions.assertThat(bot.button("Finish")).isNotEnabled();
245+
assertFalse(bot.button("Finish").isEnabled());
245246
}
246247

247248
@Test
@@ -260,7 +261,7 @@ public void shouldAllowNewConnectionWithDifferentNameAndUnixSettings() throws IO
260261
bot.text(1).setText(otherDockerSocketTmpPath);
261262
// then the wizard should not allow for completion because a connection
262263
// with the connection settings already exists.
263-
ButtonAssertions.assertThat(bot.button("Finish")).isEnabled();
264+
assertFalse(bot.button("Finish").isEnabled());
264265
}
265266

266267
@Test
@@ -278,7 +279,7 @@ public void shouldAllowNewConnectionWithDifferentNameAndTCPSettings() {
278279
bot.text(2).setText("https://bar:1234");
279280
// then the wizard should not allow for completion because a connection
280281
// with the connection settings already exists.
281-
ButtonAssertions.assertThat(bot.button("Finish")).isEnabled();
282+
assertTrue(bot.button("Finish").isEnabled());
282283
}
283284

284285
@Test

0 commit comments

Comments
 (0)