Linus12
diff --git a/‎Flickr4Java/src/test/java/com/flickr4java/flickr/test/GroupsInterfaceTest.java‎
Lines changed: 25 additions & 13 deletions b/‎Flickr4Java/src/test/java/com/flickr4java/flickr/test/GroupsInterfaceTest.java‎
Lines changed: 25 additions & 13 deletions
diff --git a/‎Flickr4Java/src/test/java/com/flickr4java/flickr/test/UploaderTest.java‎
Lines changed: 47 additions & 12 deletions b/‎Flickr4Java/src/test/java/com/flickr4java/flickr/test/UploaderTest.java‎
Lines changed: 47 additions & 12 deletions
@@ -22,8 +22,6 @@
  */
 public class GroupsInterfaceTest extends Flickr4JavaTest {
 
-    public static final String TEST_JOIN_GROUP = "2173840@N20";
-
     public void deprecatedBrowse() throws FlickrException {
         GroupsInterface iface = flickr.getGroupsInterface();
         Category cat = iface.browse(null);
@@ -102,19 +100,33 @@ public void testSearchPage() throws FlickrException {
 
     @Test
     public void testJoinLeave() throws FlickrException {
-
         GroupsInterface iface = flickr.getGroupsInterface();
 
-        Group group = iface.getInfo(TEST_JOIN_GROUP);
+        Group group = iface.getInfo(testProperties.getGroupId());
         int cntBeforeJoin = group.getMembers();
-        iface.join(TEST_JOIN_GROUP, null);
-        group = iface.getInfo(TEST_JOIN_GROUP);
-        int cntAfterJoin = group.getMembers();
-        assertTrue("Member count increased by 1", cntBeforeJoin + 1 == cntAfterJoin);
-
-        iface.leave(TEST_JOIN_GROUP, false);
-        group = iface.getInfo(TEST_JOIN_GROUP);
-        int cntAfterLeave = group.getMembers();
-        assertTrue("Member count decreased by 1", cntAfterLeave == cntBeforeJoin);
+        try {
+            iface.join(testProperties.getGroupId(), null);
+            group = iface.getInfo(testProperties.getGroupId());
+            int cntAfterJoin = group.getMembers();
+            assertTrue("Member count increased by 1", cntBeforeJoin + 1 == cntAfterJoin);
+        } catch (FlickrException e) {
+            // Ignore if user is already in group
+            if (!e.getErrorCode().equals("4")) {
+                throw e;
+            }
+        }
+
+        try {
+            iface.leave(testProperties.getGroupId(), false);
+            group = iface.getInfo(testProperties.getGroupId());
+            int cntAfterLeave = group.getMembers();
+            assertTrue("Member count decreased by 1", cntAfterLeave == cntBeforeJoin);
+        } catch (FlickrException e) {
+            // Ignore if user doesn't have delete permissions
+            if (!e.getErrorCode().equals("99")) {
+                throw e;
+            }
+        }
+
     }
 }
@@ -4,20 +4,20 @@
 
 import static org.junit.Assert.assertNotNull;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.junit.Test;
-
 import com.flickr4java.flickr.FlickrException;
 import com.flickr4java.flickr.photos.PhotosInterface;
 import com.flickr4java.flickr.uploader.UploadMetaData;
 import com.flickr4java.flickr.uploader.Uploader;
 import com.flickr4java.flickr.util.IOUtilities;
 
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
  * @author Anthony Eden
  */
@@ -49,7 +49,15 @@ public void testUploadByteArray() throws IOException, FlickrException {
             metaData.setTitle("óöä");
             String photoId = uploader.upload(out.toByteArray(), metaData);
             assertNotNull(photoId);
-            pint.delete(photoId);
+            try {
+                pint.delete(photoId);
+            } catch (FlickrException e) {
+                // Ignore if user doesn't have delete permissions
+                // This will leave a *private* photo in the test account's photostream!
+                if (!e.getErrorCode().equals("99")) {
+                    throw e;
+                }
+            }
         } finally {
             IOUtilities.close(in);
             IOUtilities.close(out);
@@ -77,7 +85,16 @@ public void testUploadInputStream() throws IOException, FlickrException {
             metaData.setTitle("óöä");
             String photoId = uploader.upload(in, metaData);
             assertNotNull(photoId);
-            pint.delete(photoId);
+            try {
+                pint.delete(photoId);
+            } catch (FlickrException e) {
+                // Ignore if user doesn't have delete permissions
+                // This will leave a *private* photo in the test account's photostream!
+                if (!e.getErrorCode().equals("99")) {
+                    throw e;
+                }
+            }
+
         } finally {
             IOUtilities.close(in);
         }
@@ -119,7 +136,16 @@ public void testReplaceInputStream() throws IOException, FlickrException {
                     throw e;
                 }
             }
-            pint.delete(photoId);
+            try {
+                pint.delete(photoId);
+            } catch (FlickrException e) {
+                // Ignore if user doesn't have delete permissions
+                // This will leave a *private* photo in the test account's photostream!
+                if (!e.getErrorCode().equals("99")) {
+                    throw e;
+                }
+            }
+
         } finally {
             IOUtilities.close(replaceIS);
         }
@@ -161,7 +187,16 @@ public void testReplaceByteArray() throws IOException, FlickrException {
                 }
             }
 
-            pint.delete(photoId);
+            try {
+                pint.delete(photoId);
+            } catch (FlickrException e) {
+                // Ignore if user doesn't have delete permissions
+                // This will leave a *private* photo in the test account's photostream!
+                if (!e.getErrorCode().equals("99")) {
+                    throw e;
+                }
+            }
+
         } finally {
             IOUtilities.close(in);
         }