Fixes from running functional tests

boncey · boncey · commit fc0a32c38d98 · 2020-05-02T18:41:12.000+01:00
diff --git a/README.md b/README.md
@@ -57,3 +57,15 @@ Flickr4Java is available on Maven Central so the above settings should be all yo
 ### Testing
 The tests now run against captured responses from Flickr (see `src/test/resources/payloads`) and don't contact the Flickr API at all.  
 This means there is no longer any need to create a test account and populate a properties file.
+
+#### Functional testing against the Flickr API.
+This is the setup to run the tests against the Flickr API.  
+*Not for the faint-hearted. Only do this to test large refactorings etc.*  
+
+Create up a `setup.properties` file (see `src/test/resources/setup.properties.example`) with details of a real account on Flickr (I recommend setting up a test account for this purpose).  
+Run tests as follows.  
+
+    mvn -DsetupPropertiesPath=/path/to/your/setup.properties clean install
+
+Expect lots of failures and general flakiness as data has changed on Flickr and the tests or data need updating.
+
diff --git a/src/main/java/com/flickr4java/flickr/REST.java b/src/main/java/com/flickr4java/flickr/REST.java
@@ -204,9 +204,9 @@ public com.flickr4java.flickr.Response postMultiPart(String path, UploadMetaData
         // Ensure all parameters (including oauth) are added to payload so signature matches
         uploadParameters.putAll(request.getOauthParameters());
 
-        request.addFileByteArrayBodyPartPayloadInMultipartPayload(metaData.getFilemimetype(), payload.getPayload());
+        request.addFileByteArrayBodyPartPayloadInMultipartPayload(payload.getPayload(), "photo", metaData.getFilename());
         uploadParameters.entrySet().forEach(e ->
-                request.addFileByteArrayBodyPartPayloadInMultipartPayload(null, e.getValue().getBytes()));
+                request.addFileByteArrayBodyPartPayloadInMultipartPayload(null, e.getValue().getBytes(), e.getKey()));
 
         try {
             return handleResponse(request, service);
diff --git a/src/test/java/com/flickr4java/flickr/test/MachinetagsInterfaceTest.java b/src/test/java/com/flickr4java/flickr/test/MachinetagsInterfaceTest.java
@@ -93,15 +93,15 @@ public void testGetValues() throws FlickrException {
     @Test
     public void testGetRecentValues() throws FlickrException {
         MachinetagsInterface machinetagsInterface = flickr.getMachinetagsInterface();
-        String namespace = "ceramics";
-        String predicate = "material";
+        String namespace = "filmdev";
+        String predicate = "recipe";
         Calendar addedSince = Calendar.getInstance();
         addedSince.add(Calendar.YEAR, -10);
         NamespacesList<Value> list = machinetagsInterface.getRecentValues(namespace, predicate, addedSince.getTime());
         assertTrue(list.size() >= 3);
         boolean contentFound = false;
         for (Value value : list) {
-            if (value.getValue().equals("mixed_media")) {
+            if (value.getValue().equals("8040")) {
                 contentFound = true;
             }
         }
diff --git a/src/test/java/com/flickr4java/flickr/test/OAuthUtilitiesTest.java b/src/test/java/com/flickr4java/flickr/test/OAuthUtilitiesTest.java
@@ -34,7 +34,7 @@ public void testCreateOAuthService() {
     @Test
     public void testSignRequest() {
         // No proxy credentials
-        OAuth10aService service = new ServiceBuilder("foo").build(FlickrApi.instance());
+        OAuth10aService service = new ServiceBuilder("foo").apiSecret("bar").build(FlickrApi.instance());
         OAuthRequest request = new OAuthRequest(Verb.GET, "http://foobar");
         assertTrue(request.getOauthParameters().isEmpty());
         OAuthUtilities.signRequest(service, request, null);
diff --git a/src/test/java/com/flickr4java/flickr/test/UploaderTest.java b/src/test/java/com/flickr4java/flickr/test/UploaderTest.java
@@ -98,7 +98,7 @@ public void testUploadInputStream() throws IOException, FlickrException {
      * @throws FlickrException if there was a problem connecting to Flickr
      */
     @Test
-    public void testReplaceInputStream() throws IOException, FlickrException {
+    public void testReplaceInputStream() throws IOException, FlickrException, InterruptedException {
         Uploader uploader = flickr.getUploader();
         PhotosInterface pint = flickr.getPhotosInterface();
         File imageFile = new File(testProperties.getImageFile());
@@ -112,6 +112,9 @@ public void testReplaceInputStream() throws IOException, FlickrException {
                 photoId = uploader.upload(uploadIS, metaData);
             }
 
+            // Fix some odd timing issue
+            Thread.sleep(1500);
+
             try (InputStream replaceIS = new FileInputStream(imageFile)) {
 
                 try {
@@ -148,7 +151,7 @@ public void testReplaceInputStream() throws IOException, FlickrException {
      * @throws FlickrException if there was a problem connecting to Flickr
      */
     @Test
-    public void testReplaceByteArray() throws IOException, FlickrException {
+    public void testReplaceByteArray() throws IOException, FlickrException, InterruptedException {
         File imageFile = new File(testProperties.getImageFile());
         Uploader uploader = flickr.getUploader();
         PhotosInterface pint = flickr.getPhotosInterface();
@@ -159,6 +162,9 @@ public void testReplaceByteArray() throws IOException, FlickrException {
             UploadMetaData metaData = buildPrivatePhotoMetadata();
             String photoId = uploader.upload(Files.readAllBytes(imageFile.toPath()), metaData);
 
+            // Fix some odd timing issue
+            Thread.sleep(1500);
+
             try {
                 photoId = uploader.replace(Files.readAllBytes(imageFile.toPath()), photoId, false);
                 assertNotNull(photoId);
diff --git a/src/test/resources/payloads/get/flickr.machinetags.getRecentValues.xml b/src/test/resources/payloads/get/flickr.machinetags.getRecentValues.xml
