Merge branch 'Vlatombe-filters-implements-equals-hashcode't push origin master

Marcus Linke · Marcus Linke · commit bf3b40977935 · 2015-10-16T22:03:00.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@ Change Log
 ===
 Latest SNAPSHOT version
 ---
+* [#335] (https://github.com/docker-java/docker-java/pull/335) Improve backward-compatibility support for older API versions
 * [#333] (https://github.com/docker-java/docker-java/pull/333) Adding support for withPidMode 
 
 v2.1.1
diff --git a/pom.xml b/pom.xml
@@ -62,7 +62,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.1.0</logback.version>
-		<testng.version>5.12.1</testng.version>
+		<testng.version>6.1.1</testng.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.6</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>
diff --git a/src/main/java/com/github/dockerjava/api/model/Filters.java b/src/main/java/com/github/dockerjava/api/model/Filters.java
@@ -92,6 +92,24 @@ private static List<String> labelsMapToList(Map<String, String> labels) {
         return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+
+        Filters filters1 = (Filters) o;
+
+        return filters.equals(filters1.filters);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return filters.hashCode();
+    }
+
     @Override
     public String toString() {
         try {
@@ -100,4 +118,5 @@ public String toString() {
             throw new RuntimeException(e);
         }
     }
+
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/FiltersTest.java b/src/test/java/com/github/dockerjava/api/model/FiltersTest.java
@@ -0,0 +1,58 @@
+package com.github.dockerjava.api.model;
+
+import com.google.common.collect.Maps;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+import static org.testng.Assert.*;
+
+/**
+ * @author Vincent Latombe <vincent@latombe.net>
+ */
+public class FiltersTest {
+
+    @Test
+    public void newFiltersShouldBeEquals() {
+        assertEquals(new Filters(), new Filters());
+    }
+
+    @Test
+    public void newFiltersShouldHaveEqualHashcode() {
+        assertEquals(new Filters().hashCode(), new Filters().hashCode());
+    }
+
+    @Test
+    public void filtersWithEqualContentShouldBeEquals() {
+        assertEquals(new Filters().withContainers("foo"), new Filters().withContainers("foo"));
+        assertEquals(new Filters().withLabels("alpha=val"), new Filters().withLabels("alpha=val"));
+    }
+
+    @Test
+    public void filtersWithEqualContentShouldHaveEqualHashcode() {
+        assertEquals(new Filters().withContainers("foo").hashCode(), new Filters().withContainers("foo").hashCode());
+        assertEquals(new Filters().withLabels("alpha=val").hashCode(), new Filters().withLabels("alpha=val").hashCode());
+    }
+
+    @Test
+    public void withLabelsMapShouldBeEqualsToVarargs() {
+        Map<String, String> map = Maps.newHashMap();
+        map.put("alpha", "val");
+        assertEquals(new Filters().withLabels("alpha=val"), new Filters().withLabels(map));
+
+        map = Maps.newHashMap();
+        map.put("alpha", "val");
+        map.put("beta", "val1");
+        assertEquals(new Filters().withLabels("alpha=val", "beta=val1"), new Filters().withLabels(map));
+    }
+
+    @Test
+    public void filtersWithDifferentContentShouldntBeEquals() {
+        assertNotEquals(new Filters().withContainers("foo"), new Filters().withContainers("bar"));
+    }
+
+    @Test
+    public void filtersWithDifferentContentShouldntHaveEqualHashcode() {
+        assertNotEquals(new Filters().withContainers("foo").hashCode(), new Filters().withContainers("bar").hashCode());
+    }
+}
