Fix gmail snippet tests

sqrrrl · sqrrrl · commit 27508a50c8ef · 2022-03-07T17:05:05.000-07:00
diff --git a/gmail/snippets/build.gradle b/gmail/snippets/build.gradle
@@ -13,5 +13,6 @@ dependencies {
     implementation 'org.apache.commons:commons-csv:1.1'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
-    testImplementation 'org.mockito:mockito-core:4.2.0'
+    //testImplementation 'org.mockito:mockito-core:4.2.0'
+    testImplementation 'org.mockito:mockito-inline:4.3.1'
 }
diff --git a/gmail/snippets/files/certs.csv b/gmail/snippets/files/certs.csv
@@ -0,0 +1,4 @@
+UserId,Certificate File Path,Certificate Password
+user1@example.com,files/cert.p12,password
+user2@example.com,files/cert.p12,
+user3@example.com,files/notfound.p12,
diff --git a/gmail/snippets/src/main/java/CreateDraft.java b/gmail/snippets/src/main/java/CreateDraft.java
@@ -52,9 +52,9 @@ public static Draft createDraftMessage(String fromEmailAddress,
         // Load pre-authorized user credentials from the environment.
         // TODO(developer) - See https://developers.google.com/identity for
         // guides on implementing OAuth2 for your application.
-        GoogleCredentials credentials = GoogleCredentials.getApplicationDefault().createScoped(Collections.singletonList(GmailScopes.GMAIL_COMPOSE));
-        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(
-                credentials);
+        GoogleCredentials credentials = GoogleCredentials.getApplicationDefault()
+                .createScoped(GmailScopes.GMAIL_COMPOSE);
+        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);
 
         // Create the gmail API client
         Gmail service = new Gmail.Builder(new NetHttpTransport(),
diff --git a/gmail/snippets/src/main/java/CreateDraftWithAttachment.java b/gmail/snippets/src/main/java/CreateDraftWithAttachment.java
@@ -61,9 +61,9 @@ public static Draft createDraftMessageWithAttachment(String fromEmailAddress,
         // Load pre-authorized user credentials from the environment.
         // TODO(developer) - See https://developers.google.com/identity for
         // guides on implementing OAuth2 for your application.
-        GoogleCredentials credentials = GoogleCredentials.getApplicationDefault().createScoped(Collections.singletonList(GmailScopes.GMAIL_COMPOSE));
-        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(
-                credentials);
+        GoogleCredentials credentials = GoogleCredentials.getApplicationDefault().createScoped(
+                GmailScopes.GMAIL_COMPOSE);
+        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);
 
         // Create the gmail API client
         Gmail service = new Gmail.Builder(new NetHttpTransport(),
diff --git a/gmail/snippets/src/main/java/CreateFilter.java b/gmail/snippets/src/main/java/CreateFilter.java
@@ -39,16 +39,15 @@ public class CreateFilter {
      */
     public static String createNewFilter(String realLabelId) throws IOException {
         // TODO(developer) - Replace with your email address.
-        String USER_EMAIL_ADDRESS = "gduser1@workspacesamples.dev";
+        String userEmail = "ci-test01@workspacesamples.dev";
 
         /* Load pre-authorized user credentials from the environment.
            TODO(developer) - See https://developers.google.com/identity for
             guides on implementing OAuth2 for your application. */
         GoogleCredentials credentials = GoogleCredentials.getApplicationDefault()
-                .createScoped(Arrays.asList(GmailScopes.GMAIL_SETTINGS_BASIC, GmailScopes.GMAIL_LABELS))
-                .createDelegated(USER_EMAIL_ADDRESS);
-        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(
-                credentials);
+                .createScoped(GmailScopes.GMAIL_SETTINGS_BASIC, GmailScopes.GMAIL_LABELS)
+                .createDelegated(userEmail);
+        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);
 
          // Create the gmail API client
         Gmail service = new Gmail.Builder(new NetHttpTransport(),
diff --git a/gmail/snippets/src/main/java/EnableAutoReply.java b/gmail/snippets/src/main/java/EnableAutoReply.java
@@ -39,16 +39,15 @@ public class EnableAutoReply {
      */
     public static VacationSettings autoReply() throws IOException{
         // TODO(developer) - Replace with your email address.
-        String USER_EMAIL_ADDRESS = "gduser1@workspacesamples.dev";
+        String userEmail = "ci-test01@workspacesamples.dev";
 
         /* Load pre-authorized user credentials from the environment.
            TODO(developer) - See https://developers.google.com/identity for
             guides on implementing OAuth2 for your application. */
         GoogleCredentials credentials = GoogleCredentials.getApplicationDefault()
                 .createScoped(Collections.singleton(GmailScopes.GMAIL_SETTINGS_BASIC))
-                .createDelegated(USER_EMAIL_ADDRESS);
-        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(
-                credentials);
+                .createDelegated(userEmail);
+        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);
 
         // Create the gmail API client
         Gmail service = new Gmail.Builder(new NetHttpTransport(),
diff --git a/gmail/snippets/src/main/java/EnableForwarding.java b/gmail/snippets/src/main/java/EnableForwarding.java
@@ -38,16 +38,15 @@ public class EnableForwarding {
      */
     public static AutoForwarding enableAutoForwarding(String forwardingEmail) throws IOException{
         // TODO(developer) - Replace with your email address.
-        String USER_EMAIL_ADDRESS = "gduser1@workspacesamples.dev";
+        String userEmail = "ci-test01@workspacesamples.dev";
 
         /* Load pre-authorized user credentials from the environment.
            TODO(developer) - See https://developers.google.com/identity for
             guides on implementing OAuth2 for your application. */
         GoogleCredentials credentials = GoogleCredentials.getApplicationDefault()
-                .createScoped(Collections.singletonList(GmailScopes.GMAIL_SETTINGS_SHARING))
-                .createDelegated(USER_EMAIL_ADDRESS);
-        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(
-                credentials);
+                .createScoped(GmailScopes.GMAIL_SETTINGS_SHARING)
+                .createDelegated(userEmail);
+        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);
 
         // Create the gmail API client
         Gmail service = new Gmail.Builder(new NetHttpTransport(),
diff --git a/gmail/snippets/src/main/java/SendEmail.java b/gmail/snippets/src/main/java/SendEmail.java
@@ -1,7 +1,7 @@
-import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64;
 import com.google.api.services.gmail.Gmail;
 import com.google.api.services.gmail.model.Draft;
 import com.google.api.services.gmail.model.Message;
+import org.apache.commons.codec.binary.Base64;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/gmail/snippets/src/main/java/SendMessage.java b/gmail/snippets/src/main/java/SendMessage.java
@@ -52,9 +52,9 @@ public static Message sendEmail(String fromEmailAddress,
         // Load pre-authorized user credentials from the environment.
         // TODO(developer) - See https://developers.google.com/identity for
         // guides on implementing OAuth2 for your application.
-        GoogleCredentials credentials = GoogleCredentials.getApplicationDefault().createScoped(Collections.singletonList(GmailScopes.GMAIL_SEND));
-        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(
-                credentials);
+        GoogleCredentials credentials = GoogleCredentials.getApplicationDefault()
+                .createScoped(GmailScopes.GMAIL_SEND);
+        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);
 
         // Create the gmail API client
         Gmail service = new Gmail.Builder(new NetHttpTransport(),
diff --git a/gmail/snippets/src/main/java/SendMessageWithAttachment.java b/gmail/snippets/src/main/java/SendMessageWithAttachment.java
@@ -61,9 +61,9 @@ public static Message sendEmailWithAttachment(String fromEmailAddress,
         // Load pre-authorized user credentials from the environment.
         // TODO(developer) - See https://developers.google.com/identity for
         // guides on implementing OAuth2 for your application.
-        GoogleCredentials credentials = GoogleCredentials.getApplicationDefault().createScoped(Collections.singletonList(GmailScopes.GMAIL_SEND));
-        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(
-                credentials);
+        GoogleCredentials credentials = GoogleCredentials.getApplicationDefault()
+                .createScoped(GmailScopes.GMAIL_SEND);
+        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);
 
         // Create the gmail API client
         Gmail service = new Gmail.Builder(new NetHttpTransport(),
diff --git a/gmail/snippets/src/main/java/SmimeSnippets.java b/gmail/snippets/src/main/java/SmimeSnippets.java
@@ -1,10 +1,10 @@
 import com.google.api.services.gmail.Gmail;
 import com.google.api.services.gmail.model.*;
 import com.google.api.services.gmail.model.SmimeInfo;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -31,28 +31,15 @@ public static SmimeInfo createSmimeInfo(String filename, String password) {
     InputStream in = null;
 
     try {
-      File file = new File(filename);
-      in = new FileInputStream(file);
-      byte fileContent[] = new byte[(int) file.length()];
-      in.read(fileContent);
-
+      byte[] fileContent = Files.readAllBytes(Paths.get(filename));
       smimeInfo = new SmimeInfo();
       smimeInfo.setPkcs12(Base64.getUrlEncoder().encodeToString(fileContent));
       if (password != null && password.length() > 0) {
         smimeInfo.setEncryptedKeyPassword(password);
       }
     } catch (Exception e) {
       System.out.printf("An error occured while reading the certificate file: %s\n", e);
-    } finally {
-      try {
-        if (in != null) {
-          in.close();
-        }
-      } catch (IOException ioe) {
-        System.out.printf("An error occured while closing the input stream: %s\n", ioe);
-      }
     }
-
     return smimeInfo;
   }
   // [END create_smime_info]
@@ -115,19 +102,17 @@ public interface GmailServiceBuilder {
   public static void insertCertFromCsv(GmailServiceBuilder serviceBuilder, String csvFilename) {
     try {
       File csvFile = new File(csvFilename);
-      CSVParser parser =
-          CSVParser.parse(csvFile, java.nio.charset.StandardCharsets.UTF_8, CSVFormat.DEFAULT);
+      CSVParser parser = CSVParser.parse(csvFile, java.nio.charset.StandardCharsets.UTF_8, CSVFormat.DEFAULT);
       for (CSVRecord record : parser) {
         String userId = record.get(0);
         String certFilename = record.get(1);
         String certPassword = record.get(2);
         SmimeInfo smimeInfo = createSmimeInfo(certFilename, certPassword);
-        if (smimeInfo != null) {
-          insertSmimeInfo(
-              serviceBuilder.buildGmailServiceFromUserId(userId), userId, userId, smimeInfo);
-        } else {
+        if (smimeInfo == null) {
           System.err.printf("Unable to read certificate file for userId: %s\n", userId);
+          continue;
         }
+        insertSmimeInfo(serviceBuilder.buildGmailServiceFromUserId(userId), userId, userId, smimeInfo);
       }
     } catch (Exception e) {
       System.err.printf("An error occured while reading the CSV file: %s", e);
@@ -188,8 +173,7 @@ public static String updateSmimeCerts(
         if (isDefaultCert) {
           defaultCertId = certId;
         }
-        LocalDateTime exp =
-            LocalDateTime.ofInstant(
+        LocalDateTime exp = LocalDateTime.ofInstant(
                 Instant.ofEpochMilli(smimeInfo.getExpiration()), ZoneId.systemDefault());
         if (exp.isAfter(expireTime)) {
           if (exp.isAfter(bestCertExpire)) {
diff --git a/gmail/snippets/src/main/java/UpdateSignature.java b/gmail/snippets/src/main/java/UpdateSignature.java
@@ -37,16 +37,15 @@ public class UpdateSignature {
      */
     public static String updateGmailSignature() throws IOException {
         // TODO(developer) - Replace with your email address.
-        String USER_EMAIL_ADDRESS = "gduser1@workspacesamples.dev";
+        String userEmail = "gduser1@workspacesamples.dev";
 
         /* Load pre-authorized user credentials from the environment.
            TODO(developer) - See https://developers.google.com/identity for
             guides on implementing OAuth2 for your application. */
         GoogleCredentials credentials = GoogleCredentials.getApplicationDefault()
-                .createScoped(Collections.singleton(GmailScopes.GMAIL_SETTINGS_BASIC))
-                .createDelegated(USER_EMAIL_ADDRESS);
-        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(
-                credentials);
+                .createScoped(GmailScopes.GMAIL_SETTINGS_BASIC)
+                .createDelegated(userEmail);
+        HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);
 
         // Create the gmail API client
         Gmail service = new Gmail.Builder(new NetHttpTransport(),
diff --git a/gmail/snippets/src/test/java/BaseTest.java b/gmail/snippets/src/test/java/BaseTest.java
@@ -1,13 +1,21 @@
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.gmail.Gmail;
 import com.google.api.services.gmail.GmailScopes;
+import com.google.auth.http.HttpCredentialsAdapter;
+import com.google.auth.oauth2.GoogleCredentials;
+import org.junit.After;
 import org.junit.Before;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.security.GeneralSecurityException;
+import java.io.InputStream;
 import java.util.*;
 import java.util.logging.Handler;
 import java.util.logging.Level;
@@ -16,9 +24,10 @@
 
 public class BaseTest {
 
-    public static final String TEST_USER = "gdtest1@appsrocks.com";
-    public static final String RECIPIENT = "gdtest2@appsrocks.com";
-    public static final String FORWARDING_ADDRESS = "gdtest2@appsrocks.com";
+
+    public static final String TEST_USER = "ci-test01@workspacesamples.dev";
+    public static final String RECIPIENT = "gduser01@workspacesamples.dev";
+    public static final String FORWARDING_ADDRESS = "gduser01@workspacesamples.dev";
 
     static {
         enableLogging();
@@ -50,32 +59,41 @@ public void publish(LogRecord record) {
         });
     }
 
-    public GoogleCredential getCredential() throws IOException {
-        GoogleCredential defaultCredentials = GoogleCredential.getApplicationDefault();
-        return new GoogleCredential.Builder()
-                .setServiceAccountId(defaultCredentials.getServiceAccountId())
-                .setServiceAccountPrivateKey(defaultCredentials.getServiceAccountPrivateKey())
-                .setServiceAccountPrivateKeyId(defaultCredentials.getServiceAccountPrivateKeyId())
-                .setServiceAccountUser(TEST_USER)
-                .setJsonFactory(defaultCredentials.getJsonFactory())
-                .setTransport(defaultCredentials.getTransport())
-                .setServiceAccountScopes(Arrays.asList(GmailScopes.GMAIL_COMPOSE, GmailScopes.GMAIL_SEND, GmailScopes.GMAIL_LABELS, GmailScopes.GMAIL_SETTINGS_BASIC, GmailScopes.GMAIL_SETTINGS_SHARING))
-                .build();
-    }
-
-    public Gmail buildService() throws IOException, GeneralSecurityException {
-        GoogleCredential credential = getCredential();
-        return new Gmail.Builder(
-                new NetHttpTransport(),
-                JacksonFactory.getDefaultInstance(),
-                credential)
-                .setApplicationName("Drive API Snippets")
-                .build();
+    public Gmail buildService() throws IOException {
+        String serviceAccountPath = System.getenv("SERVICE_ACCOUNT_CREDENTIALS");
+        try (InputStream stream = new FileInputStream(serviceAccountPath)) {
+            GoogleCredentials credentials = GoogleCredentials.fromStream(stream);
+            credentials = credentials.createScoped(
+                    "email",
+                    GmailScopes.MAIL_GOOGLE_COM,
+                    GmailScopes.GMAIL_SETTINGS_BASIC,
+                    GmailScopes.GMAIL_COMPOSE,
+                    GmailScopes.GMAIL_SETTINGS_SHARING,
+                    GmailScopes.GMAIL_LABELS).createDelegated(TEST_USER);
+            HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);
+            return new Gmail.Builder(
+                    new NetHttpTransport(),
+                    GsonFactory.getDefaultInstance(),
+                    requestInitializer)
+                    .setApplicationName("Gmail API Snippets")
+                    .build();
+        }
     }
 
     @Before
-    public void setup() throws IOException, GeneralSecurityException {
+    public void setupService() throws IOException {
         this.service = buildService();
     }
 
+    public MockedStatic<GoogleCredentials> useServiceAccount() throws IOException {
+        MockedStatic<GoogleCredentials> mockedGoogleCredentials;
+        String serviceAccountPath = System.getenv("SERVICE_ACCOUNT_CREDENTIALS");
+        try (InputStream stream = new FileInputStream(serviceAccountPath)) {
+            GoogleCredentials credentials = GoogleCredentials.fromStream(stream);
+            mockedGoogleCredentials = Mockito.mockStatic(GoogleCredentials.class);
+            mockedGoogleCredentials.when(GoogleCredentials::getApplicationDefault).thenReturn(credentials);
+            return mockedGoogleCredentials;
+        }
+    }
+
 }
diff --git a/gmail/snippets/src/test/java/SettingsSnippetsTest.java b/gmail/snippets/src/test/java/SettingsSnippetsTest.java
@@ -62,11 +62,16 @@ public void createFilter() throws IOException, GeneralSecurityException {
 
     @Test
     public void enableAutoForwarding() throws IOException, GeneralSecurityException {
+        try {
+            AutoForwarding forwarding = new AutoForwarding().setEnabled(false);
+            this.service.users().settings().updateAutoForwarding("me", forwarding).execute();
+            this.service.users().settings().forwardingAddresses().delete("me", FORWARDING_ADDRESS).execute();
+        } catch (Exception e) {
+            // Ignore - resources might not exist
+            e.printStackTrace();
+        }
         AutoForwarding forwarding = this.snippets.enableForwarding(FORWARDING_ADDRESS);
         assertNotNull(forwarding);
-        forwarding = new AutoForwarding().setEnabled(false);
-        this.service.users().settings().updateAutoForwarding("me", forwarding).execute();
-        this.service.users().settings().forwardingAddresses().delete("me", FORWARDING_ADDRESS).execute();
     }
 
     @Test
diff --git a/gmail/snippets/src/test/java/SmimeSnippetsTest.java b/gmail/snippets/src/test/java/SmimeSnippetsTest.java
diff --git a/gmail/snippets/src/test/java/TestCreateFilter.java b/gmail/snippets/src/test/java/TestCreateFilter.java
diff --git a/gmail/snippets/src/test/java/TestEnableAutoReply.java b/gmail/snippets/src/test/java/TestEnableAutoReply.java
diff --git a/gmail/snippets/src/test/java/TestEnableForwarding.java b/gmail/snippets/src/test/java/TestEnableForwarding.java
diff --git a/gmail/snippets/src/test/java/TestUpdateSignature.java b/gmail/snippets/src/test/java/TestUpdateSignature.java

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ dependencies {`
`13`	`13`	`implementation 'org.apache.commons:commons-csv:1.1'`
`14`	`14`	`testImplementation 'junit:junit:4.13.2'`
`15`	`15`	`testImplementation 'org.hamcrest:hamcrest-all:1.3'`
`16`		`- testImplementation 'org.mockito:mockito-core:4.2.0'`
	`16`	`+ //testImplementation 'org.mockito:mockito-core:4.2.0'`
	`17`	`+ testImplementation 'org.mockito:mockito-inline:4.3.1'`
`17`	`18`	`}`