Update failing tests and make more robust · JavaLeaks/Flickr4Java@5ead0bb · GitHub
Skip to content

Commit 5ead0bb

Browse files
author
boncey
committed
Update failing tests and make more robust
1 parent ce8e4e4 commit 5ead0bb

6 files changed

Lines changed: 29 additions & 27 deletions

File tree

‎Flickr4Java/src/examples/java/AuthExample.java‎

Lines changed: 2 additions & 1 deletion

‎Flickr4Java/src/test/java/com/flickr4java/flickr/test/GroupsInterfaceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ public void testJoinLeave() throws FlickrException {
115115
iface.leave(TEST_JOIN_GROUP, false);
116116
group = iface.getInfo(TEST_JOIN_GROUP);
117117
int cntAfterLeave = group.getMembers();
118-
assertTrue("Member count decreasted by 1", cntAfterLeave == cntBeforeJoin);
118+
assertTrue("Member count decreased by 1", cntAfterLeave == cntBeforeJoin);
119119
}
120120
}

‎Flickr4Java/src/test/java/com/flickr4java/flickr/test/PeopleInterfaceTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.flickr4java.flickr.people.PersonTag;
1414
import com.flickr4java.flickr.people.PersonTagList;
1515
import com.flickr4java.flickr.people.User;
16-
import com.flickr4java.flickr.people.UserList;
1716
import com.flickr4java.flickr.photos.Photo;
1817
import com.flickr4java.flickr.photos.PhotoList;
1918

@@ -107,14 +106,16 @@ public void testGetPhotosOf() throws FlickrException {
107106
@Test
108107
public void testAddDelete() throws FlickrException {
109108
PeopleInterface iface = flickr.getPeopleInterface();
110-
iface.add(testProperties.getPhotoId(), testProperties.getNsid(), null);
111109
PersonTagList<PersonTag> usrs = iface.getList(testProperties.getPhotoId());
112-
assertNotNull(usrs);
113-
assertEquals(1, usrs.size());
114-
iface.delete(testProperties.getPhotoId(), testProperties.getNsid());
115-
usrs = iface.getList(testProperties.getPhotoId());
116-
assertNotNull(usrs);
117-
assertEquals(0, usrs.size());
110+
int size = usrs.size();
111+
try {
112+
iface.add(testProperties.getPhotoId(), testProperties.getNsid(), null);
113+
} finally {
114+
iface.delete(testProperties.getPhotoId(), testProperties.getNsid());
115+
usrs = iface.getList(testProperties.getPhotoId());
116+
assertNotNull(usrs);
117+
assertEquals(size, usrs.size());
118+
}
118119
}
119120

120121
@Test

‎Flickr4Java/src/test/java/com/flickr4java/flickr/test/PhotosInterfaceTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ public void testGetThumbnailImage() throws FlickrException, IOException {
336336
Photo photo = iface.getInfo(photoId, null);
337337
BufferedImage image = iface.getImage(photo, Size.THUMB);
338338
assertNotNull(image);
339-
assertTrue(67==image.getWidth() || 68==image.getWidth());
339+
assertTrue(67 == image.getWidth() || 68 == image.getWidth());
340340
assertEquals(100, image.getHeight());
341341
ImageIO.write(image, "jpg", thumbnailFile);
342342
}
@@ -504,19 +504,19 @@ public void testSetSizes() {
504504
p.setOriginalSecret("osecret");
505505
p.setFarm("1");
506506

507-
assertEquals("http://farm1.static.flickr.com/server/id_secret_m.jpg", p.getSmallUrl());
508-
assertEquals("http://farm1.static.flickr.com/server/id_secret_s.jpg", p.getSmallSquareUrl());
509-
assertEquals("http://farm1.static.flickr.com/server/id_secret_t.jpg", p.getThumbnailUrl());
510-
assertEquals("http://farm1.static.flickr.com/server/id_secret.jpg", p.getMediumUrl());
511-
assertEquals("http://farm1.static.flickr.com/server/id_secret_b.jpg", p.getLargeUrl());
512-
assertEquals("http://farm1.static.flickr.com/server/id_secret_q.jpg", p.getSquareLargeUrl());
513-
assertEquals("http://farm1.static.flickr.com/server/id_secret_n.jpg", p.getSmall320Url());
514-
assertEquals("http://farm1.static.flickr.com/server/id_secret_z.jpg", p.getMedium640Url());
515-
assertEquals("http://farm1.static.flickr.com/server/id_secret_c.jpg", p.getMedium800Url());
516-
assertEquals("http://farm1.static.flickr.com/server/id_secret_h.jpg", p.getLarge1600Url());
517-
assertEquals("http://farm1.static.flickr.com/server/id_secret_k.jpg", p.getLarge2048Url());
507+
assertEquals("https://farm1.static.flickr.com/server/id_secret_m.jpg", p.getSmallUrl());
508+
assertEquals("https://farm1.static.flickr.com/server/id_secret_s.jpg", p.getSmallSquareUrl());
509+
assertEquals("https://farm1.static.flickr.com/server/id_secret_t.jpg", p.getThumbnailUrl());
510+
assertEquals("https://farm1.static.flickr.com/server/id_secret.jpg", p.getMediumUrl());
511+
assertEquals("https://farm1.static.flickr.com/server/id_secret_b.jpg", p.getLargeUrl());
512+
assertEquals("https://farm1.static.flickr.com/server/id_secret_q.jpg", p.getSquareLargeUrl());
513+
assertEquals("https://farm1.static.flickr.com/server/id_secret_n.jpg", p.getSmall320Url());
514+
assertEquals("https://farm1.static.flickr.com/server/id_secret_z.jpg", p.getMedium640Url());
515+
assertEquals("https://farm1.static.flickr.com/server/id_secret_c.jpg", p.getMedium800Url());
516+
assertEquals("https://farm1.static.flickr.com/server/id_secret_h.jpg", p.getLarge1600Url());
517+
assertEquals("https://farm1.static.flickr.com/server/id_secret_k.jpg", p.getLarge2048Url());
518518
try {
519-
assertEquals("http://farm1.static.flickr.com/server/id_osecret_o.jpg", p.getOriginalUrl());
519+
assertEquals("https://farm1.static.flickr.com/server/id_osecret_o.jpg", p.getOriginalUrl());
520520
} catch (FlickrException ex) {
521521
}
522522
// setSizes() to override the generated URLs.

‎Flickr4Java/src/test/java/com/flickr4java/flickr/test/PhotosetsInterfaceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public void testGetPhotos() throws FlickrException {
122122
PhotoList<Photo> photos = iface.getPhotos(testProperties.getPhotosetId(), 10, 1);
123123
assertNotNull(photos);
124124
assertTrue(photos.size() >= 1);
125-
assertEquals(testProperties.getDisplayname(), photos.get(0).getOwner().getUsername());
125+
assertEquals(testProperties.getUsername(), photos.get(0).getOwner().getUsername());
126126
assertEquals(testProperties.getNsid(), photos.get(0).getOwner().getId());
127127
}
128128

‎Flickr4Java/src/test/java/com/flickr4java/flickr/test/PlacesInterfaceTest.java‎

Lines changed: 3 additions & 3 deletions

0 commit comments

Comments
 (0)