Merge pull request #283 from russgold/issue_282_IntOrString_equals

Support equals() for IntOrString

Author: brendandburns

kubernetes/pom.xml

@@ -158,6 +158,12 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
     <!-- test dependencies -->
+    <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-junit</artifactId>
+        <version>2.0.0.0</version>
+        <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

kubernetes/src/main/java/io/kubernetes/client/custom/IntOrString.java

@@ -1,13 +1,14 @@
 package io.kubernetes.client.custom;
 
+import java.io.IOException;
+import java.util.Objects;
+
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
-import java.io.IOException;
-
 @JsonAdapter(IntOrString.IntOrStringAdapter.class)
 public class IntOrString {
     private final boolean isInt;
@@ -47,7 +48,22 @@ public Integer getIntValue() {
     @Override
     public String toString() {
     	return (isInt ? String.valueOf(intValue) : strValue);
-    }	    
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return this == o || (o instanceof IntOrString && equals((IntOrString) o));
+    }
+
+    private boolean equals(IntOrString o) {
+        if (isInt != o.isInt) return false;
+        return isInt ? Objects.equals(intValue, o.intValue) : Objects.equals(strValue, o.strValue);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(isInt, strValue, intValue);
+    }
 
     public static class IntOrStringAdapter extends TypeAdapter<IntOrString> {
         @Override

kubernetes/src/test/java/io/kubernetes/client/custom/IntOrStringTest.java

@@ -0,0 +1,108 @@
+package io.kubernetes.client.custom;
+
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.*;
+
+public class IntOrStringTest {
+  @Test
+  public void whenCreatedWithInt_isInteger() {
+    IntOrString intOrString = new IntOrString(17);
+
+    assertThat(intOrString.isInteger(), is(true));
+  }
+
+  @Test
+  public void whenCreatedWithInt_canRetrieveIntValue() {
+    IntOrString intOrString = new IntOrString(17);
+
+    assertThat(intOrString.getIntValue(), equalTo(17));
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void whenCreatedWithInt_cannotRetrieveStringValue() {
+    IntOrString intOrString = new IntOrString(17);
+
+    intOrString.getStrValue();
+  }
+
+  @Test
+  public void whenCreatedWithInt_equalsItself() {
+    IntOrString intOrString = new IntOrString(17);
+
+    assertThat(intOrString, equalTo(intOrString));
+  }
+
+  @Test
+  public void whenCreatedWithInt_equalsAnotherWithSameValue() {
+    IntOrString intOrString1 = new IntOrString(17);
+    IntOrString intOrString2 = new IntOrString(17);
+
+    assertThat(intOrString1, equalTo(intOrString2));
+  }
+
+  @Test
+  public void whenCreatedWithInt_notEqualAnotherWithDifferentValue() {
+    IntOrString intOrString1 = new IntOrString(17);
+    IntOrString intOrString2 = new IntOrString(13);
+
+    assertThat(intOrString1, not(equalTo(intOrString2)));
+  }
+
+  @Test
+  public void whenCreatedWithInt_notEqualOneCreatedFromString() {
+    IntOrString intOrString1 = new IntOrString(17);
+    IntOrString intOrString2 = new IntOrString("17");
+
+    assertThat(intOrString1, not(equalTo(intOrString2)));
+  }
+
+  @Test
+  public void whenCreatedWithString_isNotInteger() {
+    IntOrString intOrString = new IntOrString("17");
+
+    assertThat(intOrString.isInteger(), is(false));
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void whenCreatedWithInt_cannotRetrieveIntValue() {
+    IntOrString intOrString = new IntOrString("17");
+
+    intOrString.getIntValue();
+  }
+
+  @Test
+  public void whenCreatedWithString_canRetrieveStringValue() {
+    IntOrString intOrString = new IntOrString("17");
+
+    assertThat(intOrString.getStrValue(), equalTo("17"));
+  }
+
+  @Test
+  public void whenCreatedWithString_equalsItself() {
+    IntOrString intOrString = new IntOrString("17");
+
+    assertThat(intOrString, equalTo(intOrString));
+  }
+
+  @Test
+  public void whenCreatedWithString_equalsAnotherWithSameValue() {
+    IntOrString intOrString1 = new IntOrString("17");
+    IntOrString intOrString2 = new IntOrString("17");
+
+    assertThat(intOrString1, equalTo(intOrString2));
+  }
+
+  @Test
+  public void whenCreatedWithString_notEqualAnotherWithDifferentValue() {
+    IntOrString intOrString1 = new IntOrString("17");
+    IntOrString intOrString2 = new IntOrString("13");
+
+    assertThat(intOrString1, not(equalTo(intOrString2)));
+  }
+
+
+}