Skip to content

Commit 835b26c

Browse files
FilippoULIVODIR\f.michelini
authored andcommitted
fix on test run
1 parent fea7e45 commit 835b26c

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

extensions/data-transfer/portability-data-transfer-google/src/main/java/org/datatransferproject/datatransfer/google/photos/GooglePhotosInterface.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ private HttpResponse handleHttpResponseException(
307307
}
308308
}
309309

310-
String generateParamsString(Optional<Map<String, String>> params) {
310+
private String generateParamsString(Optional<Map<String, String>> params) {
311311
Map<String, String> updatedParams = new ArrayMap<>();
312312
if (params.isPresent()) {
313313
updatedParams.putAll(params.get());

extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/photos/GooglePhotosInterfaceTest.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,14 @@
3232
import com.google.api.client.http.json.JsonHttpContent;
3333
import com.google.api.client.json.JsonFactory;
3434
import com.google.common.collect.ImmutableMap;
35+
import com.google.photos.types.proto.MediaItem;
3536
import java.io.ByteArrayInputStream;
3637
import java.io.IOException;
3738
import java.io.InputStream;
39+
import java.util.ArrayList;
3840
import java.util.HashMap;
3941
import java.util.LinkedHashMap;
42+
import java.util.List;
4043
import java.util.Map;
4144
import java.util.Optional;
4245
import org.datatransferproject.api.launcher.Monitor;
@@ -46,6 +49,7 @@
4649
import org.datatransferproject.datatransfer.google.mediaModels.GoogleAlbum;
4750
import org.datatransferproject.datatransfer.google.mediaModels.GoogleMediaItem;
4851
import org.datatransferproject.datatransfer.google.mediaModels.MediaItemSearchResponse;
52+
import org.datatransferproject.datatransfer.google.mediaModels.NewMediaItem;
4953
import org.datatransferproject.datatransfer.google.mediaModels.NewMediaItemResult;
5054
import org.datatransferproject.datatransfer.google.mediaModels.NewMediaItemUpload;
5155
import org.datatransferproject.spi.transfer.types.InvalidTokenException;
@@ -272,29 +276,30 @@ void uploadEmptyMediaContent()
272276
void createPhotos() throws Exception {
273277
BatchMediaItemResponse batchMediaItemResponse = new BatchMediaItemResponse(
274278
new NewMediaItemResult[]{});
279+
List<NewMediaItem> newMediaItem = new ArrayList<>();
280+
NewMediaItemUpload newMediaItemUpload = new NewMediaItemUpload(ALBUM_ID,newMediaItem);
275281
TypeReference<HashMap<String, Object>> typeRef = new TypeReference<HashMap<String, Object>>() {
276282
};
277-
Map<String, Object> albumMap = objectMapper.readValue(
278-
objectMapper.writeValueAsString(batchMediaItemResponse), typeRef);
279-
Map<String, Object> params = ImmutableMap.of("album", albumMap);
283+
Map<String, Object> params = objectMapper.readValue(
284+
objectMapper.writeValueAsString(newMediaItemUpload), typeRef);
280285

281286
GooglePhotosInterface photosInterfaceSpy = Mockito.spy(this.googlePhotosInterface);
282287
Mockito.doReturn(batchMediaItemResponse).when(photosInterfaceSpy)
283288
.makePostRequest(anyString(), any(), any(), any(), any());
284289

285-
BatchMediaItemResponse apiResponse = googlePhotosInterface.createPhotos(
286-
any(NewMediaItemUpload.class));
290+
BatchMediaItemResponse apiResponse = photosInterfaceSpy.createPhotos(
291+
newMediaItemUpload);
287292

288293
ArgumentCaptor<String> urlStringCaptor = ArgumentCaptor.forClass(String.class);
289294
ArgumentCaptor<JsonHttpContent> contentCaptor = ArgumentCaptor.forClass(JsonHttpContent.class);
290295
Mockito.verify(photosInterfaceSpy)
291296
.makePostRequest(urlStringCaptor.capture(), any(), any(), contentCaptor.capture(), any());
292297
assertEquals(batchMediaItemResponse, apiResponse);
293-
assertEquals(BASE_URL + "albums", urlStringCaptor.getValue());
298+
assertEquals(BASE_URL + "mediaItems:batchCreate", urlStringCaptor.getValue());
294299
assertEquals(params, contentCaptor.getValue().getData());
295300
}
296301

297-
@Test
302+
// @Test
298303
void makePostRequest() {
299304
// Discussion: I Believe this method should be kept private for the interface to make sense
300305
}

0 commit comments

Comments
 (0)