Fixed failing delete test. Cause: assuming deleted_at was always there or had a valid value.

simong · simong · commit 48351c7e17b1 · 2012-01-28T21:38:15.000+01:00
diff --git a/src/main/java/com/cloudapp/impl/model/CloudAppItemImpl.java b/src/main/java/com/cloudapp/impl/model/CloudAppItemImpl.java
@@ -31,8 +31,8 @@ public boolean isSubscribed() throws CloudAppException {
   }
 
   public boolean isTrashed() throws CloudAppException {
-    Date d = getDeletedAt();
-    return d != null;
+    String d = getString("deleted_at");
+    return (d == null || d == "null");
   }
 
   public String getUrl() throws CloudAppException {
diff --git a/src/test/java/com/cloudapp/impl/CloudAppItemsImplTest.java b/src/test/java/com/cloudapp/impl/CloudAppItemsImplTest.java
@@ -49,6 +49,8 @@ public void testDelete() throws JSONException, CloudAppException {
   @Test
   public void testUpload() throws CloudAppException, JSONException {
     CloudAppItem o = api.upload(file);
+    Assert.assertNotNull(o);
     assertEquals("test_file.txt", o.getName());
+    Assert.assertNotNull(o.getCreatedAt());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public boolean isSubscribed() throws CloudAppException {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public boolean isTrashed() throws CloudAppException {`
`34`		`- Date d = getDeletedAt();`
`35`		`- return d != null;`
	`34`	`+ String d = getString("deleted_at");`
	`35`	`+ return (d == null \|\| d == "null");`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public String getUrl() throws CloudAppException {`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ public void testDelete() throws JSONException, CloudAppException {`
`49`	`49`	`@Test`
`50`	`50`	`public void testUpload() throws CloudAppException, JSONException {`
`51`	`51`	`CloudAppItem o = api.upload(file);`
	`52`	`+ Assert.assertNotNull(o);`
`52`	`53`	`assertEquals("test_file.txt", o.getName());`
	`54`	`+ Assert.assertNotNull(o.getCreatedAt());`
`53`	`55`	`}`
`54`	`56`	`}`