[RW-706] fix integration test (#894)

* fix integration test
all-of-us · Jun 4, 2018 · 0253003 · 0253003
1 parent f12b2d9
commit 0253003
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...src/integration/java/org/pmiops/workbench/google/DirectoryServiceImplIntegrationTest.java b/...src/integration/java/org/pmiops/workbench/google/DirectoryServiceImplIntegrationTest.java
@@ -13,6 +13,7 @@
 import org.pmiops.workbench.config.WorkbenchConfig;
 import org.pmiops.workbench.test.Providers;
 import org.springframework.retry.backoff.NoBackOffPolicy;
+import org.mockito.Mockito;
 
 public class DirectoryServiceImplIntegrationTest {
   private DirectoryServiceImpl service;
@@ -41,10 +42,12 @@ public void testDirectoryServiceUsernameIsTaken() {
   @Test
   public void testCreateAndDeleteTestUser() {
     String userName = String.format("integration.test.%d", Clock.systemUTC().millis());
-    service.createUser("Integration", "Test", userName, "notasecret");
-    assertThat(service.isUsernameTaken(userName)).isTrue();
-    service.deleteUser(userName);
-    assertThat(service.isUsernameTaken(userName)).isFalse();
+    DirectoryServiceImpl serviceSpy = Mockito.spy(service);
+    Mockito.doNothing().when(serviceSpy).sendPasswordEmail(Mockito.anyString(), Mockito.anyString(), Mockito.any());
+    serviceSpy.createUser("Integration", "Test", userName, "notasecret");
+    assertThat(serviceSpy.isUsernameTaken(userName)).isTrue();
+    serviceSpy.deleteUser(userName);
+    assertThat(serviceSpy.isUsernameTaken(userName)).isFalse();
   }
 
   private static GoogleCredential getGoogleCredential() {

diff --git a/api/src/main/java/org/pmiops/workbench/google/DirectoryServiceImpl.java b/api/src/main/java/org/pmiops/workbench/google/DirectoryServiceImpl.java
@@ -154,7 +154,7 @@ private String randomString(){
       collect(Collectors.joining(""));
   }
 
-  private void sendPasswordEmail(String contactEmail, String password, User user) {
+  protected void sendPasswordEmail(String contactEmail, String password, User user) {
     WorkbenchConfig workbenchConfig = configProvider.get();
     Properties props = new Properties();
     Session session = Session.getDefaultInstance(props, null);