Skip to content

Commit 0e4d37a

Browse files
SineaggiSineaggi
committed
Replace deprecated match methods
1 parent e836b59 commit 0e4d37a

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

‎docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@
2626
import static org.hamcrest.MatcherAssert.assertThat;
2727
import static org.hamcrest.Matchers.equalTo;
2828
import static org.hamcrest.Matchers.hasItem;
29+
import static org.hamcrest.Matchers.hasSize;
2930
import static org.hamcrest.Matchers.is;
3031
import static org.hamcrest.Matchers.emptyString;
31-
import static org.hamcrest.Matchers.isOneOf;
3232
import static org.hamcrest.Matchers.not;
3333
import static org.hamcrest.Matchers.notNullValue;
34+
import static org.hamcrest.Matchers.oneOf;
3435
import static org.hamcrest.Matchers.startsWith;
3536
import static org.junit.Assert.assertEquals;
3637
import static org.testinfected.hamcrest.jpa.PersistenceMatchers.hasField;
@@ -161,8 +162,8 @@ public void testNameFilter() {
161162
.exec();
162163

163164
assertThat(filteredContainers.size(), is(2));
164-
assertThat(filteredContainers.get(0).getId(), isOneOf(id1, id2));
165-
assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2));
165+
assertThat(filteredContainers.get(0).getId(), is(oneOf(id1, id2)));
166+
assertThat(filteredContainers.get(1).getId(), is(oneOf(id1, id2)));
166167
}
167168

168169
@Test
@@ -184,8 +185,8 @@ public void testIdsFilter() {
184185
.exec();
185186

186187
assertThat(filteredContainers.size(), is(2));
187-
assertThat(filteredContainers.get(0).getId(), isOneOf(id1, id2));
188-
assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2));
188+
assertThat(filteredContainers.get(0).getId(), is(oneOf(id1, id2)));
189+
assertThat(filteredContainers.get(1).getId(), is(oneOf(id1, id2)));
189190
}
190191

191192
@Test
@@ -209,8 +210,8 @@ public void testStatusFilter() {
209210
.withStatusFilter(singletonList("created"))
210211
.exec();
211212

212-
assertThat(filteredContainers.size(), is(2));
213-
assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2));
213+
assertThat(filteredContainers, hasSize(2));
214+
assertThat(filteredContainers.get(1).getId(), is(oneOf(id1, id2)));
214215

215216
dockerRule.getClient().startContainerCmd(id1).exec();
216217

@@ -220,7 +221,7 @@ public void testStatusFilter() {
220221
.withStatusFilter(singletonList("running"))
221222
.exec();
222223

223-
assertThat(filteredContainers.size(), is(1));
224+
assertThat(filteredContainers, hasSize(1));
224225
assertThat(filteredContainers.get(0).getId(), is(id1));
225226

226227
dockerRule.getClient().pauseContainerCmd(id1).exec();
@@ -231,7 +232,7 @@ public void testStatusFilter() {
231232
.withStatusFilter(singletonList("paused"))
232233
.exec();
233234

234-
assertThat(filteredContainers.size(), is(1));
235+
assertThat(filteredContainers, hasSize(1));
235236
assertThat(filteredContainers.get(0).getId(), is(id1));
236237

237238
dockerRule.getClient().unpauseContainerCmd(id1).exec();
@@ -246,7 +247,7 @@ public void testStatusFilter() {
246247
.withStatusFilter(singletonList("exited"))
247248
.exec();
248249

249-
assertThat(filteredContainers.size(), is(1));
250+
assertThat(filteredContainers, hasSize(1));
250251
assertThat(filteredContainers.get(0).getId(), is(id1));
251252
}
252253

@@ -275,7 +276,7 @@ public void testVolumeFilter() {
275276
.withVolumeFilter(singletonList("TestFilterVolume"))
276277
.exec();
277278

278-
assertThat(filteredContainers.size(), is(1));
279+
assertThat(filteredContainers, hasSize(1));
279280
assertThat(filteredContainers.get(0).getId(), is(id));
280281
}
281282

0 commit comments

Comments
 (0)