Tidy up updateUserIdentityTest to esnure it cleans up on failure

Author: stephenc

src/main/java/org/zendesk/client/v2/model/Identity.java

@@ -105,4 +105,19 @@ public Date getUpdatedAt() {
     public void setUpdatedAt(Date updatedAt) {
         this.updatedAt = updatedAt;
     }
+
+    @Override
+    public String toString() {
+        return "Identity{" +
+                "id=" + id +
+                ", url='" + url + '\'' +
+                ", userId=" + userId +
+                ", type='" + type + '\'' +
+                ", value='" + value + '\'' +
+                ", verified=" + verified +
+                ", primary=" + primary +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                '}';
+    }
 }

src/test/java/org/zendesk/client/v2/RealSmokeTest.java

@@ -375,14 +375,18 @@ public void updateUserIdentity() throws Exception {
         identity.setValue("first@test.com");
 
         Identity createdIdentity = instance.createUserIdentity(user, identity);
-        assertThat(createdIdentity.getValue(), is("first@test.com"));
-
-        createdIdentity.setValue("second@test.com");
-        Identity updatedIdentity = instance.updateUserIdentity(user, createdIdentity);
+        try {
+            assertThat(createdIdentity.getValue(), is("first@test.com"));
 
-        assertThat(updatedIdentity.getValue(), is("second@test.com"));
+            createdIdentity.setValue("second@test.com");
+            Identity updatedIdentity = instance.updateUserIdentity(user, createdIdentity);
 
-        instance.deleteUserIdentity(user, identity);
+            assertThat(updatedIdentity.getValue(), is("second@test.com"));
+        } finally {
+            if (createdIdentity != null) {
+                instance.deleteUserIdentity(user, createdIdentity.getId());
+            }
+        }
     }
 
     @Test