From f42ea56510fcab708458d52b491fa3d54f14b526 Mon Sep 17 00:00:00 2001
From: ZhenyuYu1 <zhenyu.yu123@gmail.com>
Date: Wed, 19 Jul 2023 10:13:24 -0700
Subject: [PATCH 1/6] added the verify part

---
 .../google/mail/GoogleMailImporterTest.java   | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
index 7e8e55d87..1fd14476a 100644
--- a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
+++ b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
@@ -43,6 +43,7 @@
 import org.datatransferproject.spi.transfer.idempotentexecutor.IdempotentImportExecutor;
 import org.datatransferproject.spi.transfer.provider.ImportResult;
 import org.datatransferproject.test.types.FakeIdempotentImportExecutor;
+import org.datatransferproject.types.common.models.mail.MailContainerModel;
 import org.datatransferproject.types.common.models.mail.MailContainerResource;
 import org.datatransferproject.types.common.models.mail.MailMessageModel;
 import org.junit.jupiter.api.BeforeEach;
@@ -52,6 +53,8 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import javax.mail.Folder;
+
 @ExtendWith(MockitoExtension.class)
 public class GoogleMailImporterTest {
 
@@ -64,12 +67,25 @@ public class GoogleMailImporterTest {
   private static final MailMessageModel MESSAGE_MODEL =
       new MailMessageModel(MESSAGE_RAW, MESSAGE_LABELS);
 
+  private static final String FOLDER_ID = "folder_id1";
+
+  private static final String FOLDER_NAME = "folder_name1";
+
+  private static final MailContainerModel FOLDER1 = new MailContainerModel(FOLDER_ID, FOLDER_NAME);
+
+  private static final MailContainerModel FOLDER2 = new MailContainerModel("folder_id2", "folder_name2");
+
+  private static final List<MailContainerModel> FOLDERS = ImmutableList.of(FOLDER1, FOLDER2);
+
   @Mock
   private Gmail gmail;
   @Mock
   private Users users;
   @Mock
   private Messages messages;
+
+  @Mock
+  private Folder folders;
   @Mock
   private Insert insert;
   @Mock
@@ -111,9 +127,9 @@ public void setUp() throws IOException {
   }
 
   @Test
-  public void importMessage() throws Exception {
+  public void importMessageAndLabels() throws Exception {
     MailContainerResource resource =
-        new MailContainerResource(null, Collections.singletonList(MESSAGE_MODEL));
+        new MailContainerResource(FOLDERS, Collections.singletonList(MESSAGE_MODEL));
 
     ImportResult result = googleMailImporter.importItem(JOB_ID, executor, null, resource);
 
@@ -124,5 +140,12 @@ public void importMessage() throws Exception {
     verify(messages).insert(eq(GoogleMailImporter.USER), messageArgumentCaptor.capture());
     assertThat(messageArgumentCaptor.getValue().getRaw()).isEqualTo(MESSAGE_RAW);
     // TODO(olsona): test labels
+    assertThat(messageArgumentCaptor.getValue().getLabelIds()).isEqualTo(MESSAGE_LABELS);
+
+    ArgumentCaptor<Label> labelArgumentCaptor = ArgumentCaptor.forClass(Label.class);
+    verify(labels, times(4)).create(eq(GoogleMailImporter.USER), labelArgumentCaptor.capture());
+    assertThat(labelArgumentCaptor.getValue()).isEqualTo(MESSAGE_LABELS);
+
+    ArgumentCaptor<Folder> folderArgumentCaptor = ArgumentCaptor.forClass(Folder.class);
   }
 }

From ab86e104cd39e42b80fc6ba46e65cb94efeb5053 Mon Sep 17 00:00:00 2001
From: EdmondLee958 <edmondlee958@gmail.com>
Date: Mon, 31 Jul 2023 11:08:20 -0700
Subject: [PATCH 2/6] Added test for labels

---
 .../datatransfer/google/mail/GoogleMailImporterTest.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
index 1fd14476a..a0a91e7d6 100644
--- a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
+++ b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
@@ -51,6 +51,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import javax.mail.Folder;
@@ -143,9 +144,9 @@ public void importMessageAndLabels() throws Exception {
     assertThat(messageArgumentCaptor.getValue().getLabelIds()).isEqualTo(MESSAGE_LABELS);
 
     ArgumentCaptor<Label> labelArgumentCaptor = ArgumentCaptor.forClass(Label.class);
-    verify(labels, times(4)).create(eq(GoogleMailImporter.USER), labelArgumentCaptor.capture());
-    assertThat(labelArgumentCaptor.getValue()).isEqualTo(MESSAGE_LABELS);
+    verify(labels, Mockito.times(4)).create(eq(GoogleMailImporter.USER), labelArgumentCaptor.capture());
+    assertThat(labelArgumentCaptor.getAllValues()).hasSize(4);
+    assertThat(labelArgumentCaptor.getAllValues().stream().map(arg->arg.getName()).collect(ImmutableList.toImmutableList())).containsExactlyElementsIn(ImmutableList.of("label2","folder_name2","DTP-migrated","folder_name1"));
 
-    ArgumentCaptor<Folder> folderArgumentCaptor = ArgumentCaptor.forClass(Folder.class);
   }
 }

From 72ada28da5d5acc09968e430f043ec94480febe5 Mon Sep 17 00:00:00 2001
From: ZhenyuYu1 <zhenyu.yu123@gmail.com>
Date: Tue, 15 Aug 2023 16:58:09 -0700
Subject: [PATCH 3/6] added tests for runtime errors and branching

---
 .../google/mail/GoogleMailExporterTest.java    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailExporterTest.java b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailExporterTest.java
index e6308b459..095f9eb2f 100644
--- a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailExporterTest.java
+++ b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailExporterTest.java
@@ -92,15 +92,13 @@ public void setup() throws IOException {
     when(gmail.users()).thenReturn(users);
     when(users.messages()).thenReturn(messages);
     when(messages.list(anyString())).thenReturn(messageListRequest);
-    when(messageListRequest.setMaxResults(anyLong())).thenReturn(messageListRequest);
-    when(messages.get(anyString(), anyString())).thenReturn(get);
-    when(get.setFormat(anyString())).thenReturn(get);
 
     verifyNoInteractions(googleCredentialFactory);
   }
 
   @Test
   public void exportMessagesFirstSet() throws IOException {
+    additionalSetup();
     setUpSingleMessageResponse();
 
     // Looking at first page, with at least one page after it
@@ -136,9 +134,23 @@ public void exportMessagesFirstSet() throws IOException {
         actualMail.stream().map(MailMessageModel::getContainerIds).collect(Collectors.toList()))
         .containsExactly(MESSAGE_LABELS);
   }
+  @Test
+  public void errorTest() throws IOException{
+    when(gmail.users()).thenReturn(users);
+    when(users.messages()).thenReturn(messages);
+    when(messages.list(anyString())).thenThrow(new IOException());
+    ExportResult<MailContainerResource> result =
+            googleMailExporter.export(JOB_ID, null, Optional.empty());
+  }
 
+  public void additionalSetup() throws IOException{
+    when(messageListRequest.setMaxResults(anyLong())).thenReturn(messageListRequest);
+    when(messages.get(anyString(), anyString())).thenReturn(get);
+    when(get.setFormat(anyString())).thenReturn(get);
+  }
   @Test
   public void exportMessagesSubsequentSet() throws IOException {
+    additionalSetup();
     setUpSingleMessageResponse();
 
     // Looking at subsequent page, with no page after it

From 2a29a8dd8eab2ff52ca86301450d623c322142f0 Mon Sep 17 00:00:00 2001
From: ZhenyuYu1 <zhenyu.yu123@gmail.com>
Date: Tue, 15 Aug 2023 17:02:04 -0700
Subject: [PATCH 4/6] added tests for labels and runtime errors

---
 .../google/mail/GoogleMailImporterTest.java   | 68 +++++++++++++------
 1 file changed, 47 insertions(+), 21 deletions(-)

diff --git a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
index 1fd14476a..41d6b8be8 100644
--- a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
+++ b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
@@ -17,13 +17,11 @@
 package org.datatransferproject.datatransfer.google.mail;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import com.google.api.services.gmail.Gmail;
 import com.google.api.services.gmail.Gmail.Users;
@@ -46,6 +44,7 @@
 import org.datatransferproject.types.common.models.mail.MailContainerModel;
 import org.datatransferproject.types.common.models.mail.MailContainerResource;
 import org.datatransferproject.types.common.models.mail.MailMessageModel;
+import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -67,13 +66,17 @@ public class GoogleMailImporterTest {
   private static final MailMessageModel MESSAGE_MODEL =
       new MailMessageModel(MESSAGE_RAW, MESSAGE_LABELS);
 
-  private static final String FOLDER_ID = "folder_id1";
+  private static final String FOLDER_ID1 = "folder_id1";
 
-  private static final String FOLDER_NAME = "folder_name1";
+  private static final String FOLDER_NAME1 = "folder_name1";
 
-  private static final MailContainerModel FOLDER1 = new MailContainerModel(FOLDER_ID, FOLDER_NAME);
+  private static final MailContainerModel FOLDER1 = new MailContainerModel(FOLDER_ID1, FOLDER_NAME1);
 
-  private static final MailContainerModel FOLDER2 = new MailContainerModel("folder_id2", "folder_name2");
+  private static final String FOLDER_ID2 = "folder_id2";
+
+  private static final String FOLDER_NAME2 = "folder_name2";
+
+  private static final MailContainerModel FOLDER2 = new MailContainerModel(FOLDER_ID2, FOLDER_NAME2);
 
   private static final List<MailContainerModel> FOLDERS = ImmutableList.of(FOLDER1, FOLDER2);
 
@@ -96,38 +99,34 @@ public class GoogleMailImporterTest {
   private Labels.Create labelsCreate;
   @Mock
   private GoogleCredentialFactory googleCredentialFactory;
-
+  @Mock
+  private GoogleCredentialFactory googleCredentialFactory1;
   private ListLabelsResponse labelsListResponse;
   private GoogleMailImporter googleMailImporter;
+  private GoogleMailImporter googleMailImporter1;
   private IdempotentImportExecutor executor;
 
   @BeforeEach
   public void setUp() throws IOException {
-    Label label = new Label();
-    label.setId(LABEL1);
-    label.setName(LABEL1);
-    labelsListResponse = new ListLabelsResponse().setLabels(Collections.singletonList(label));
 
     Monitor monitor = new Monitor() {
     };
+    Monitor monitor1 = new Monitor() {
+    };
     googleMailImporter = new GoogleMailImporter(googleCredentialFactory, gmail, monitor);
+    googleMailImporter1 = new GoogleMailImporter(googleCredentialFactory1, monitor1);
     executor = new FakeIdempotentImportExecutor();
 
     when(gmail.users()).thenReturn(users);
-    when(users.messages()).thenReturn(messages);
-    when(messages.insert(anyString(), any(Message.class))).thenReturn(insert);
-    when(insert.execute()).thenReturn(new Message().setId("fooBar"));
     when(users.labels()).thenReturn(labels);
     when(labels.list(anyString())).thenReturn(labelsList);
-    when(labelsList.execute()).thenReturn(labelsListResponse);
-    when(labels.create(anyString(), any(Label.class))).thenReturn(labelsCreate);
-    when(labelsCreate.execute()).thenReturn(label);
 
     verifyNoInteractions(googleCredentialFactory);
   }
 
   @Test
   public void importMessageAndLabels() throws Exception {
+    additionalSetup();
     MailContainerResource resource =
         new MailContainerResource(FOLDERS, Collections.singletonList(MESSAGE_MODEL));
 
@@ -144,8 +143,35 @@ public void importMessageAndLabels() throws Exception {
 
     ArgumentCaptor<Label> labelArgumentCaptor = ArgumentCaptor.forClass(Label.class);
     verify(labels, times(4)).create(eq(GoogleMailImporter.USER), labelArgumentCaptor.capture());
-    assertThat(labelArgumentCaptor.getValue()).isEqualTo(MESSAGE_LABELS);
+    assertThat(labelArgumentCaptor.getAllValues()).hasSize(4);
+    ImmutableList<String> labelNames = labelArgumentCaptor.getAllValues().stream().map(arg->
+            arg.getName()).collect(ImmutableList.toImmutableList());
+    assertThat(labelNames).
+            containsExactlyElementsIn(ImmutableList.of(LABEL2, FOLDER2.getName(), GoogleMailImporter.LABEL, FOLDER1.getName()));
+  }
+
+  public void additionalSetup() throws IOException {
+    Label label = new Label();
+    label.setId(LABEL1);
+    label.setName(LABEL1);
+    labelsListResponse = new ListLabelsResponse().setLabels(Collections.singletonList(label));
+
+    when(users.messages()).thenReturn(messages);
+    when(messages.insert(anyString(), any(Message.class))).thenReturn(insert);
+    when(insert.execute()).thenReturn(new Message().setId("fooBar"));
+    when(labelsList.execute()).thenReturn(labelsListResponse);
+    when(labels.create(anyString(), any(Label.class))).thenReturn(labelsCreate);
+    when(labelsCreate.execute()).thenReturn(label);
+  }
+  @Test
+  public void runtimeExceptionErrorTest() throws Exception {
+    MailContainerResource resource =
+            new MailContainerResource(FOLDERS, Collections.singletonList(MESSAGE_MODEL));
+
+    when(labelsList.execute()).thenThrow(new IOException("Error"));
 
-    ArgumentCaptor<Folder> folderArgumentCaptor = ArgumentCaptor.forClass(Folder.class);
+    assertThrows(RuntimeException.class, () -> {
+      ImportResult result = googleMailImporter.importItem(JOB_ID, executor, null, resource);
+    });
   }
 }

From 439d29f46be745e8311dccae3ad9a46a6c7d8192 Mon Sep 17 00:00:00 2001
From: ZhenyuYu1 <zhenyu.yu123@gmail.com>
Date: Tue, 15 Aug 2023 17:05:18 -0700
Subject: [PATCH 5/6] removed unused variables

---
 .../google/mail/GoogleMailImporterTest.java      | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
index 6edfdb7d4..b5b89a053 100644
--- a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
+++ b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
@@ -50,7 +50,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import javax.mail.Folder;
@@ -65,7 +64,7 @@ public class GoogleMailImporterTest {
   private static final String LABEL2 = "label2";
   private static final List<String> MESSAGE_LABELS = ImmutableList.of(LABEL1, LABEL2);
   private static final MailMessageModel MESSAGE_MODEL =
-      new MailMessageModel(MESSAGE_RAW, MESSAGE_LABELS);
+          new MailMessageModel(MESSAGE_RAW, MESSAGE_LABELS);
 
   private static final String FOLDER_ID1 = "folder_id1";
 
@@ -104,7 +103,6 @@ public class GoogleMailImporterTest {
   private GoogleCredentialFactory googleCredentialFactory1;
   private ListLabelsResponse labelsListResponse;
   private GoogleMailImporter googleMailImporter;
-  private GoogleMailImporter googleMailImporter1;
   private IdempotentImportExecutor executor;
 
   @BeforeEach
@@ -115,7 +113,6 @@ public void setUp() throws IOException {
     Monitor monitor1 = new Monitor() {
     };
     googleMailImporter = new GoogleMailImporter(googleCredentialFactory, gmail, monitor);
-    googleMailImporter1 = new GoogleMailImporter(googleCredentialFactory1, monitor1);
     executor = new FakeIdempotentImportExecutor();
 
     when(gmail.users()).thenReturn(users);
@@ -129,7 +126,7 @@ public void setUp() throws IOException {
   public void importMessageAndLabels() throws Exception {
     additionalSetup();
     MailContainerResource resource =
-        new MailContainerResource(FOLDERS, Collections.singletonList(MESSAGE_MODEL));
+            new MailContainerResource(FOLDERS, Collections.singletonList(MESSAGE_MODEL));
 
     ImportResult result = googleMailImporter.importItem(JOB_ID, executor, null, resource);
 
@@ -143,7 +140,6 @@ public void importMessageAndLabels() throws Exception {
     assertThat(messageArgumentCaptor.getValue().getLabelIds()).isEqualTo(MESSAGE_LABELS);
 
     ArgumentCaptor<Label> labelArgumentCaptor = ArgumentCaptor.forClass(Label.class);
-<<<<<<< HEAD
     verify(labels, times(4)).create(eq(GoogleMailImporter.USER), labelArgumentCaptor.capture());
     assertThat(labelArgumentCaptor.getAllValues()).hasSize(4);
     ImmutableList<String> labelNames = labelArgumentCaptor.getAllValues().stream().map(arg->
@@ -175,11 +171,5 @@ public void runtimeExceptionErrorTest() throws Exception {
     assertThrows(RuntimeException.class, () -> {
       ImportResult result = googleMailImporter.importItem(JOB_ID, executor, null, resource);
     });
-=======
-    verify(labels, Mockito.times(4)).create(eq(GoogleMailImporter.USER), labelArgumentCaptor.capture());
-    assertThat(labelArgumentCaptor.getAllValues()).hasSize(4);
-    assertThat(labelArgumentCaptor.getAllValues().stream().map(arg->arg.getName()).collect(ImmutableList.toImmutableList())).containsExactlyElementsIn(ImmutableList.of("label2","folder_name2","DTP-migrated","folder_name1"));
-
->>>>>>> 338c420f58ee51aebd64d244a7b7b133b872839e
   }
-}
+}
\ No newline at end of file

From 5356a0af48807503cfd6779e329a94f8a297b4bc Mon Sep 17 00:00:00 2001
From: ZhenyuYu1 <zhenyu.yu123@gmail.com>
Date: Tue, 15 Aug 2023 17:07:52 -0700
Subject: [PATCH 6/6] removed more unused variables

---
 .../datatransfer/google/mail/GoogleMailImporterTest.java      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
index b5b89a053..15be96211 100644
--- a/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
+++ b/extensions/data-transfer/portability-data-transfer-google/src/test/java/org/datatransferproject/datatransfer/google/mail/GoogleMailImporterTest.java
@@ -110,8 +110,6 @@ public void setUp() throws IOException {
 
     Monitor monitor = new Monitor() {
     };
-    Monitor monitor1 = new Monitor() {
-    };
     googleMailImporter = new GoogleMailImporter(googleCredentialFactory, gmail, monitor);
     executor = new FakeIdempotentImportExecutor();
 
@@ -172,4 +170,4 @@ public void runtimeExceptionErrorTest() throws Exception {
       ImportResult result = googleMailImporter.importItem(JOB_ID, executor, null, resource);
     });
   }
-}
\ No newline at end of file
+}