Merge pull request #11 from brianmuse/feature/user-org-touchups

Feature: Adding equals/hashcode methods and test coverage to UserOrg model

Author: Chris Mark

src/main/java/com/robinpowered/sdk/model/UserAccess.java

@@ -1,9 +1,14 @@
 package com.robinpowered.sdk.model;
 
+import com.google.common.base.Objects;
+
+/**
+ * Defines a users level of access with a {@link UserOrganization}.
+ */
 public class UserAccess {
 
-    private Integer managementLevel;
-    private Boolean isOwner;
+    private final Integer managementLevel;
+    private final Boolean isOwner;
 
     public UserAccess(Integer managementLevel, Boolean isOwner) {
         this.managementLevel = managementLevel;
@@ -18,6 +23,20 @@ public Boolean getOwner() {
         return isOwner;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        UserAccess that = (UserAccess) o;
+        return Objects.equal(managementLevel, that.managementLevel) &&
+                Objects.equal(isOwner, that.isOwner);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(managementLevel, isOwner);
+    }
+
     @Override
     public String toString() {
         return "UserAccess{" +

src/main/java/com/robinpowered/sdk/model/UserOrganization.java

@@ -1,9 +1,10 @@
 package com.robinpowered.sdk.model;
 
+import com.google.common.base.Objects;
 import org.joda.time.DateTime;
 
 /**
- * An {@link Organization} containing {@link UserAccess} data.
+ * An {@link Organization} entity that represents a user's membership, containing the {@link UserAccess} model.
  */
 public class UserOrganization extends Organization {
 
@@ -18,7 +19,7 @@ public class UserOrganization extends Organization {
      * Properties
      */
 
-    private UserAccess userAccess;
+    private final UserAccess userAccess;
 
 
     /**
@@ -32,17 +33,31 @@ public UserOrganization(int id, String slug, boolean isOrganization, DateTime cr
         this.userAccess = userAccess;
     }
 
+    public UserAccess getUserAccess() {
+        return userAccess;
+    }
+
     @Override
     public String getMimeType() {
         return MIME_TYPE;
     }
 
     @Override
-    public String toString() {
-        return super.toString() + " " + userAccess.toString();
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        UserOrganization that = (UserOrganization) o;
+        return Objects.equal(userAccess, that.userAccess);
     }
 
-    public UserAccess getUserAccess() {
-        return userAccess;
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(super.hashCode(), userAccess);
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + " " + userAccess.toString();
     }
 }

src/test/java/com/robinpowered/sdk/model/UserAccessTest.java

@@ -0,0 +1,14 @@
+package com.robinpowered.sdk.model;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import org.junit.Test;
+
+public class UserAccessTest {
+
+    @Test
+    public void testEqualsAndHashcode() {
+        EqualsVerifier.forClass(UserAccess.class)
+                .usingGetClass()
+                .verify();
+    }
+}

src/test/java/com/robinpowered/sdk/model/UserOrganizationTest.java

@@ -0,0 +1,14 @@
+package com.robinpowered.sdk.model;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import org.junit.Test;
+
+public class UserOrganizationTest {
+
+    @Test
+    public void testEqualsAndHashcode() {
+        EqualsVerifier.forClass(UserOrganization.class)
+                .usingGetClass()
+                .verify();
+    }
+}