Working upload of photos (individual and zip)

[photos] / src / test / java / org / wamblee / photos / model / AlbumTest.java

diff --git a/src/test/java/org/wamblee/photos/model/AlbumTest.java b/src/test/java/org/wamblee/photos/model/AlbumTest.java
index a0c4d07dbdf2306574f4b7efa21755fe8ac6e59c..5d4c7aacf9507b7c94e15db3605451de32af18d3 100644 (file)
--- a/src/test/java/org/wamblee/photos/model/AlbumTest.java
+++ b/src/test/java/org/wamblee/photos/model/AlbumTest.java
@@ -40,9 +40,6 @@ import static org.junit.Assert.*;
  */
 public class AlbumTest {
 
-    private static final String ADDED_METHOD = "photoAdded";
-    private static final String REMOVED_METHOD = "photoRemoved";
-
     private static final String TEST_RESOURCES = "src/test/resources/albumdata";
 
     private String resourcesPath;
@@ -68,7 +65,6 @@ public class AlbumTest {
         assertTrue(path.startsWith("file:"));
         path = path.substring("file:".length());
         resourcesPath = path + "../../" + TEST_RESOURCES;
-        System.out.println(resourcesPath);
     }
 
     private void copyDir(File aSource) {
@@ -99,6 +95,11 @@ public class AlbumTest {
         return new File(_testData.getRoot(), "data");
     }
 
+    protected Album createAlbum(File aDir, String aPath, Cache<String, ArrayList<PhotoEntry>> aCache)
+            throws IOException {
+        return new FileSystemAlbum(aDir, aPath, aCache);
+    }
+
     /**
      * Verifies that a non-existing album cannot be opened.
      */
@@ -106,7 +107,7 @@ public class AlbumTest {
     public void testNonExistingAlbum() {
         File dir = new File(_testData.getRoot(), "NonExisting");
         try {
-            Album album = new FileSystemAlbum(dir, "", _cache);
+            Album album = createAlbum(dir, "", _cache);
         }
         catch (IOException e) {
             return; // ok
@@ -124,7 +125,7 @@ public class AlbumTest {
 
         File dir = getTestOutputDir();
         copyDir(_dir);
-        Album album = new FileSystemAlbum(dir, "/", _cache);
+        Album album = createAlbum(dir, "/", _cache);
 
         int nentries = album.size();
         assertEquals(3, nentries);
@@ -177,7 +178,7 @@ public class AlbumTest {
 
         File dir = getTestOutputDir();
         copyDir(_dir);
-        Album album = new FileSystemAlbum(dir, "/", _cache);
+        Album album = createAlbum(dir, "/", _cache);
         assertEquals(0, album.size());
     }
 
@@ -190,7 +191,7 @@ public class AlbumTest {
 
         File dir = getTestOutputDir();
         copyDir(_dir);
-        Album album = new FileSystemAlbum(dir, "/", _cache);
+        Album album = createAlbum(dir, "/", _cache);
         assertEquals(0, album.size());
     }
 
@@ -202,7 +203,7 @@ public class AlbumTest {
         File _dir = new File(getTestAlbumData(), "AlbumPhotoMissing");
         File dir = getTestOutputDir();
         copyDir(_dir);
-        Album album = new FileSystemAlbum(dir, "/", _cache);
+        Album album = createAlbum(dir, "/", _cache);
         assertEquals(0, album.size());
     }
 
@@ -222,13 +223,13 @@ public class AlbumTest {
         assertTrue(new File(dir, FileSystemAlbum.PHOTOS_DIR).mkdir());
         assertTrue(new File(dir, FileSystemAlbum.THUMBNAILS_DIR).mkdir());
 
-        Album album = new FileSystemAlbum(dir, "/", _cache);
+        Album album = createAlbum(dir, "/", _cache);
 
         File image = new File(getTestAlbumData(), "a.jpg");
         album.addImage("xyz", getImage(image));
         assertTrue(album.getEntry("/xyz") != null);
 
-        Album album2 = new FileSystemAlbum(dir, "/", new ForeverCache<String, ArrayList<PhotoEntry>>());
+        Album album2 = createAlbum(dir, "/", new ForeverCache<String, ArrayList<PhotoEntry>>());
         assertTrue(album2.getEntry("/xyz") != null);
     }
 
@@ -243,7 +244,7 @@ public class AlbumTest {
         assertTrue(new File(dir, FileSystemAlbum.PHOTOS_DIR).mkdir());
         assertTrue(new File(dir, FileSystemAlbum.THUMBNAILS_DIR).mkdir());
 
-        Album album = new FileSystemAlbum(dir, "/", _cache);
+        Album album = createAlbum(dir, "/", _cache);
 
         File image = new File(getTestAlbumData(), "a.jpg");
         album.addImage("xyz", getImage(image));
@@ -269,7 +270,7 @@ public class AlbumTest {
         assertTrue(new File(dir, FileSystemAlbum.PHOTOS_DIR).mkdir());
         assertTrue(new File(dir, FileSystemAlbum.THUMBNAILS_DIR).mkdir());
 
-        Album album = new FileSystemAlbum(dir, "/", _cache);
+        Album album = createAlbum(dir, "/", _cache);
 
         File sub = new File(dir, "sub");
         album.addAlbum("sub");
@@ -278,7 +279,7 @@ public class AlbumTest {
         assertTrue(new File(sub, FileSystemAlbum.PHOTOS_DIR).isDirectory());
         assertTrue(new File(sub, FileSystemAlbum.THUMBNAILS_DIR).isDirectory());
 
-        Album album2 = new FileSystemAlbum(dir, "/", new ForeverCache<String, ArrayList<PhotoEntry>>());
+        Album album2 = createAlbum(dir, "/", new ForeverCache<String, ArrayList<PhotoEntry>>());
         PhotoEntry entry = album2.getEntry("/sub");
 
         assertTrue(entry != null);
@@ -296,7 +297,7 @@ public class AlbumTest {
         assertTrue(new File(dir, FileSystemAlbum.PHOTOS_DIR).mkdir());
         assertTrue(new File(dir, FileSystemAlbum.THUMBNAILS_DIR).mkdir());
 
-        Album album = new FileSystemAlbum(dir, "/", _cache);
+        Album album = createAlbum(dir, "/", _cache);
 
         File sub = new File(dir, "sub");
         album.addAlbum("sub");
@@ -321,7 +322,7 @@ public class AlbumTest {
         File dir = getTestOutputDir();
         File origDir = new File(getTestAlbumData(), "AlbumRemove");
         copyDir(origDir);
-        Album album = new FileSystemAlbum(dir, "/", _cache);
+        Album album = createAlbum(dir, "/", _cache);
         try {
             album.removeEntry("Nested");
         }