Skip to content

Fix parameter order in assertEquals #2066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eddumelendez merged 3 commits into from
Feb 9, 2023
Merged

Fix parameter order in assertEquals #2066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c3e5dd
Fix parameter order in `assertEquals`
albers Feb 9, 2023
d5cff12
Remove unused imports from tests
albers Feb 9, 2023
5b2fc79
Remove unneccessary throws declarations from tests
albers Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.github.dockerjava.api.model.ResponseItem;
import com.google.common.reflect.ClassPath.ClassInfo;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.hamcrest.MatcherAssert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
28 changes: 14 additions & 14 deletions ...er-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ public void roundTrip_full() throws IOException {
final InspectContainerResponse response = responses[0];

// Check volumes: https://github.com/docker-java/docker-java/issues/211
assertEquals(response.getVolumes().length, 2);
assertEquals(response.getVolumesRW().length, 2);
assertEquals(response.getVolumes()[1].getContainerPath(), "/bar/foo/myvol2");
assertEquals(response.getVolumes()[1].getHostPath(), "/path2");
assertEquals(response.getVolumesRW()[1].getVolume().getPath(), "/bar/foo/myvol2");
assertEquals(2, response.getVolumes().length);
assertEquals(2, response.getVolumesRW().length);
assertEquals("/bar/foo/myvol2" ,response.getVolumes()[1].getContainerPath());
assertEquals("/path2", response.getVolumes()[1].getHostPath());
assertEquals("/bar/foo/myvol2", response.getVolumesRW()[1].getVolume().getPath());
assertFalse(response.getVolumesRW()[1].getAccessMode().toBoolean());
assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean());
assertThat(response.getLogPath(), is("/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log"));
Expand All @@ -76,11 +76,11 @@ public void roundTrip_full_healthcheck() throws IOException {
type
);

assertEquals(response.getState().getHealth().getStatus(), "healthy");
assertEquals(response.getState().getHealth().getFailingStreak(), new Integer(0));
assertEquals(response.getState().getHealth().getLog().size(), 2);
assertEquals(response.getState().getHealth().getLog().get(0).getOutput(), "Hello");
assertEquals(response.getState().getHealth().getLog().get(1).getOutput(), "World");
assertEquals("healthy", response.getState().getHealth().getStatus());
assertEquals(new Integer(0), response.getState().getHealth().getFailingStreak());
assertEquals(2, response.getState().getHealth().getLog().size());
assertEquals("Hello", response.getState().getHealth().getLog().get(0).getOutput());
assertEquals("World", response.getState().getHealth().getLog().get(1).getOutput());
}

@Test
Expand Down Expand Up @@ -108,11 +108,11 @@ public void roundTrip_1_26a_full() throws IOException {
final InspectContainerResponse response = responses[0];

final List<InspectContainerResponse.Mount> mounts = response.getMounts();
assertEquals(mounts.size(), 1);
assertEquals(1, mounts.size());

final InspectContainerResponse.Mount mount = mounts.get(0);
final Volume volume = mount.getDestination();
assertEquals(volume.getPath(), "/var/lib/postgresql/data");
assertEquals("/var/lib/postgresql/data", volume.getPath());
}

@Test
Expand All @@ -124,11 +124,11 @@ public void roundTrip_1_26b_full() throws IOException {
final InspectContainerResponse response = responses[0];

final List<InspectContainerResponse.Mount> mounts = response.getMounts();
assertEquals(mounts.size(), 1);
assertEquals(1, mounts.size());

final InspectContainerResponse.Mount mount = mounts.get(0);
final Volume volume = mount.getDestination();
assertEquals(volume.getPath(), "/srv/test");
assertEquals("/srv/test", volume.getPath());
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ public class AccessModeTest {

@Test
public void defaultAccessMode() {
assertEquals(AccessMode.DEFAULT, rw);
assertEquals(rw, AccessMode.DEFAULT);
}

@Test
public void stringify() {
assertEquals(AccessMode.rw.toString(), "rw");
assertEquals("rw", AccessMode.rw.toString());
}

@Test
public void fromString() {
assertEquals(AccessMode.valueOf("rw"), rw);
assertEquals(rw, AccessMode.valueOf("rw"));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
public class AuthConfigTest {

@Test
public void defaultServerAddress() throws Exception {
public void defaultServerAddress() {
assertEquals(new AuthConfig().getRegistryAddress(), "https://index.docker.io/v1/");
}

Expand Down
4 changes: 2 additions & 2 deletions docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ public class CapabilityTest {
@Test
public void serializeCapability() throws Exception {
String json = JSONTestHelper.getMapper().writeValueAsString(Capability.ALL);
assertEquals(json, "\"ALL\"");
assertEquals("\"ALL\"", json);
}

@Test
public void deserializeCapability() throws Exception {
Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class);
assertEquals(capability, Capability.ALL);
assertEquals(Capability.ALL, capability);
}

@Test(expected = JsonMappingException.class)
Expand Down
2 changes: 1 addition & 1 deletion docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class DeviceTest {
}};

@Test
public void testParse() throws Exception {
public void testParse() {
assertThat(Device.parse("/dev/sda:/dev/xvdc:r"),
equalTo(new Device("r", "/dev/xvdc", "/dev/sda")));

Expand Down
6 changes: 3 additions & 3 deletions docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ public class ExposedPortTest {
@Test
public void parsePortAndProtocol() {
ExposedPort exposedPort = ExposedPort.parse("80/tcp");
assertEquals(exposedPort, new ExposedPort(80, TCP));
assertEquals(new ExposedPort(80, TCP), exposedPort);
}

@Test
public void parsePortOnly() {
ExposedPort exposedPort = ExposedPort.parse("80");
assertEquals(exposedPort, new ExposedPort(80, DEFAULT));
assertEquals(new ExposedPort(80, DEFAULT), exposedPort);
}

@Test
Expand All @@ -43,7 +43,7 @@ public void parseNull() {

@Test
public void stringify() {
assertEquals(ExposedPort.parse("80/tcp").toString(), "80/tcp");
assertEquals("80/tcp", ExposedPort.parse("80/tcp").toString());
}

}
2 changes: 1 addition & 1 deletion docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void usesFromJson() throws Exception {
}

@Test
public void usesFromJsonWithDuplicate() throws Exception {
public void usesFromJsonWithDuplicate() {
ExposedPorts ports = new ExposedPorts(
new ExposedPort(80, InternetProtocol.UDP),
new ExposedPort(80),
Expand Down
2 changes: 1 addition & 1 deletion docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
public class HostConfigTest {

@Test
public void testNewObjectsEqual() throws Exception {
public void testNewObjectsEqual() {
assertThat(HostConfig.newHostConfig(),
equalTo(HostConfig.newHostConfig()));
}
Expand Down
18 changes: 9 additions & 9 deletions docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@ public void testFromCompoundString() throws Exception {
Identifier i3A = Identifier.fromCompoundString("10.0.0.1:123/jim:latest");

assertTrue(!i1.tag.isPresent());
assertEquals(i1.repository.name, "10.0.0.1/jim");
assertEquals("10.0.0.1/jim", i1.repository.name);

assertTrue(i2.tag.isPresent());
assertEquals(i2.tag.get(), "123");
assertEquals(i2.repository.name, "10.0.0.1/jim");
assertEquals("123", i2.tag.get());
assertEquals("10.0.0.1/jim", i2.repository.name);

assertTrue(i3.tag.isPresent());
assertEquals(i3.tag.get(), "124");
assertEquals(i3.repository.name, "10.0.0.1:123/jim");
assertEquals(i3.repository.getURL().getPort(), 123);
assertEquals(i3A.tag.get(), "latest");
assertEquals("124", i3.tag.get());
assertEquals("10.0.0.1:123/jim", i3.repository.name);
assertEquals(123, i3.repository.getURL().getPort());
assertEquals("latest", i3A.tag.get());

Identifier i4 = Identifier.fromCompoundString("centos:latest");
assertTrue(i4.tag.isPresent());
assertEquals(i4.tag.get(), "latest");
assertEquals("latest", i4.tag.get());

Identifier i5 = Identifier.fromCompoundString("busybox");
assertTrue(!i5.tag.isPresent());

Identifier i6 = Identifier.fromCompoundString("10.0.0.1:5000/my-test-image:1234");
assertEquals(i6.repository.getPath(), "my-test-image");
assertEquals("my-test-image", i6.repository.getPath());
}
}
8 changes: 4 additions & 4 deletions docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ public class InternetProtocolTest {

@Test
public void defaultProtocol() {
assertEquals(InternetProtocol.DEFAULT, TCP);
assertEquals(TCP, InternetProtocol.DEFAULT);
}

@Test
public void stringify() {
assertEquals(TCP.toString(), "tcp");
assertEquals("tcp", TCP.toString());
}

@Test
public void parseUpperCase() {
assertEquals(InternetProtocol.parse("TCP"), TCP);
assertEquals(TCP, InternetProtocol.parse("TCP"));
}

@Test
public void parseLowerCase() {
assertEquals(InternetProtocol.parse("tcp"), TCP);
assertEquals(TCP, InternetProtocol.parse("tcp"));
}

@Test
Expand Down
10 changes: 5 additions & 5 deletions docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ public class LinkTest {
@Test
public void parse() {
Link link = Link.parse("name:alias");
assertEquals(link.getName(), "name");
assertEquals(link.getAlias(), "alias");
assertEquals("name", link.getName());
assertEquals("alias", link.getAlias());
}

@Test
public void parseWithContainerNames() {
Link link = Link.parse("/name:/conatiner/alias");
assertEquals(link.getName(), "name");
assertEquals(link.getAlias(), "alias");
assertEquals("name", link.getName());
assertEquals("alias", link.getAlias());
}

@Test
Expand All @@ -43,7 +43,7 @@ public void parseNull() {

@Test
public void stringify() {
assertEquals(Link.parse("name:alias").toString(), "name:alias");
assertEquals("name:alias", Link.parse("name:alias").toString());
}

}
10 changes: 5 additions & 5 deletions docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,27 @@ public void fullDefinition() {

@Test
public void noProtocol() {
assertEquals(PortBinding.parse("127.0.0.1:80:8080"), new PortBinding(Binding.bindIpAndPort("127.0.0.1", 80), TCP_8080));
assertEquals(new PortBinding(Binding.bindIpAndPort("127.0.0.1", 80), TCP_8080), PortBinding.parse("127.0.0.1:80:8080"));
}

@Test
public void noHostIp() {
assertEquals(PortBinding.parse("80:8080/tcp"), new PortBinding(Binding.bindPort(80), TCP_8080));
assertEquals(new PortBinding(Binding.bindPort(80), TCP_8080), PortBinding.parse("80:8080/tcp"));
}

@Test
public void portsOnly() {
assertEquals(PortBinding.parse("80:8080"), new PortBinding(Binding.bindPort(80), TCP_8080));
assertEquals(new PortBinding(Binding.bindPort(80), TCP_8080), PortBinding.parse("80:8080"));
}

@Test
public void exposedPortOnly() {
assertEquals(PortBinding.parse("8080"), new PortBinding(Binding.empty(), TCP_8080));
assertEquals(new PortBinding(Binding.empty(), TCP_8080), PortBinding.parse("8080"));
}

@Test
public void dynamicHostPort() {
assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(Binding.bindIp("127.0.0.1"), TCP_8080));
assertEquals(new PortBinding(Binding.bindIp("127.0.0.1"), TCP_8080), PortBinding.parse("127.0.0.1::8080"));
}

@Test
Expand Down
12 changes: 6 additions & 6 deletions docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ public void addTwoBindingsForDifferentExposedPorts() {

Map<ExposedPort, Binding[]> bindings = ports.getBindings();
// two keys with one value each
assertEquals(bindings.size(), 2);
assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080});
assertArrayEquals(bindings.get(TCP_90), new Binding[] {BINDING_9090});
assertEquals(2, bindings.size());
assertArrayEquals(new Binding[] {BINDING_8080}, bindings.get(TCP_80));
assertArrayEquals(new Binding[] {BINDING_9090}, bindings.get(TCP_90));
}

@Test
Expand All @@ -47,16 +47,16 @@ public void addTwoBindingsForSameExposedPort() {

Map<ExposedPort, Binding[]> bindings = ports.getBindings();
// one key with two values
assertEquals(bindings.size(), 1);
assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080, BINDING_9090});
assertEquals(1, bindings.size());
assertArrayEquals(new Binding[] {BINDING_8080, BINDING_9090}, bindings.get(TCP_80));
}

@Test
public void addNullBindings() {
ports.add(new PortBinding(null, TCP_80));
Map<ExposedPort, Binding[]> bindings = ports.getBindings();
// one key with two values
assertEquals(bindings.size(), 1);
assertEquals(1, bindings.size());
assertNull(bindings.get(TCP_80));
}
}
16 changes: 8 additions & 8 deletions docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,33 @@ public class PortsSerializingTest {
public void deserializingPortWithMultipleBindings() throws Exception {
Ports ports = JSONTestHelper.getMapper().readValue(jsonWithDoubleBindingForOnePort, Ports.class);
Map<ExposedPort, Binding[]> map = ports.getBindings();
assertEquals(map.size(), 1);
assertEquals(1, map.size());

Binding[] bindings = map.get(ExposedPort.tcp(80));
assertEquals(bindings.length, 2);
assertEquals(bindings[0], new Binding("10.0.0.1", "80"));
assertEquals(bindings[1], new Binding("10.0.0.2", "80"));
assertEquals(2, bindings.length);
assertEquals(new Binding("10.0.0.1", "80"), bindings[0]);
assertEquals(new Binding("10.0.0.2", "80"), bindings[1]);
}

@Test
public void serializingPortWithMultipleBindings() throws Exception {
Ports ports = new Ports();
ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", "80"));
ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", "80"));
assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithDoubleBindingForOnePort);
assertEquals(jsonWithDoubleBindingForOnePort, JSONTestHelper.getMapper().writeValueAsString(ports));
}

@Test
public void serializingEmptyBinding() throws Exception {
Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null));
assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}");
assertEquals("{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}", JSONTestHelper.getMapper().writeValueAsString(ports));
}

@Test
public void deserializingPortWithNullBindings() throws Exception {
Ports ports = JSONTestHelper.getMapper().readValue(jsonWithNullBindingForOnePort, Ports.class);
Map<ExposedPort, Binding[]> map = ports.getBindings();
assertEquals(map.size(), 1);
assertEquals(1, map.size());

assertNull(map.get(ExposedPort.tcp(80)));
}
Expand All @@ -54,6 +54,6 @@ public void deserializingPortWithNullBindings() throws Exception {
public void serializingWithNullBindings() throws Exception {
Ports ports = new Ports();
ports.bind(ExposedPort.tcp(80), null);
assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithNullBindingForOnePort);
assertEquals(jsonWithNullBindingForOnePort, JSONTestHelper.getMapper().writeValueAsString(ports));
}
}
Loading