chore: fix unit tests using gcloud ADC

.github/workflows/eclipse-2018-09-java8.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
   workflow_dispatch:  # Allows you to run this workflow manually from the Actions tab
 
 jobs:

plugins/com.google.cloud.tools.eclipse.appengine.deploy.test/src/com/google/cloud/tools/eclipse/appengine/deploy/util/CloudSdkProcessWrapperTest.java

@@ -17,18 +17,17 @@
 package com.google.cloud.tools.eclipse.appengine.deploy.util;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import com.google.cloud.tools.appengine.operations.AppEngineWebXmlProjectStaging;
 import com.google.cloud.tools.appengine.operations.Deployment;
 import com.google.cloud.tools.appengine.operations.cloudsdk.CloudSdkNotFoundException;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import com.google.cloud.tools.eclipse.test.util.TestAccountProvider;
+import com.google.cloud.tools.eclipse.test.util.TestAccountProvider.State;
 import org.eclipse.core.runtime.Status;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -39,34 +38,25 @@ public class CloudSdkProcessWrapperTest {
 
   private final CloudSdkProcessWrapper wrapper = new CloudSdkProcessWrapper();
 
+  @Before
+  public void setUp() {
+    TestAccountProvider.setAsDefaultProvider(State.NOT_LOGGED_IN);
+  }
+
   @Test
   public void testGetAppEngineDeployment_nullCredentialFile() throws CloudSdkNotFoundException {
     try {
-      wrapper.getAppEngineDeployment(null, null);
+      wrapper.getAppEngineDeployment(null);
       fail();
-    } catch (NullPointerException ex) {
+    } catch (IllegalStateException ex) {
       assertEquals(ex.getMessage(), "credential required for deploying");
     }
   }
 
   @Test
-  public void testGetAppEngineDeployment_nonExistingCredentialFile()
-      throws CloudSdkNotFoundException {
-    Path credential = tempFolder.getRoot().toPath().resolve("non-existing-file");
-    assertFalse(Files.exists(credential));
-
-    try {
-      wrapper.getAppEngineDeployment(credential, null);
-      fail();
-    } catch (IllegalArgumentException ex) {
-      assertEquals(ex.getMessage(), "non-existing credential file");
-    }
-  }
-
-  @Test
-  public void testGetAppEngineDeployment() throws IOException, CloudSdkNotFoundException {
-    Path credential = tempFolder.newFile().toPath();
-    Deployment deployment = wrapper.getAppEngineDeployment(credential, null);
+  public void testGetAppEngineDeployment() throws CloudSdkNotFoundException {
+    TestAccountProvider.setProviderState(State.LOGGED_IN);
+    Deployment deployment = wrapper.getAppEngineDeployment(null);
     assertNotNull(deployment);
   }
 
@@ -78,11 +68,11 @@ public void testGetAppEngineStandardStaging() throws CloudSdkNotFoundException {
 
   @Test
   public void testGetAppEngineDeployment_cannotSetUpTwice()
-      throws IOException, CloudSdkNotFoundException {
-    Path credential = tempFolder.newFile().toPath();
-    wrapper.getAppEngineDeployment(credential, null);
+      throws CloudSdkNotFoundException {
+    TestAccountProvider.setProviderState(State.LOGGED_IN);
+    wrapper.getAppEngineDeployment(null);
     try {
-      wrapper.getAppEngineDeployment(credential, null);
+      wrapper.getAppEngineDeployment(null);
       fail();
     } catch (IllegalStateException ex) {
       assertEquals(ex.getMessage(), "process wrapper already set up");

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/DeployPropertyPageTest.java

@@ -19,16 +19,20 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.fail;
+import static org.mockito.Mockito.doReturn;
 
 import com.google.cloud.tools.eclipse.googleapis.IGoogleApiFactory;
 import com.google.cloud.tools.eclipse.login.IGoogleLoginService;
+import com.google.cloud.tools.eclipse.test.util.TestAccountProvider;
 import com.google.cloud.tools.eclipse.test.util.ui.CompositeUtil;
 import com.google.cloud.tools.eclipse.test.util.ui.ShellTestResource;
+import java.util.Optional;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.forms.widgets.SharedScrolledComposite;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,6 +49,12 @@ public abstract class DeployPropertyPageTest<P extends DeployPreferencesPanel> {
   @Mock
   private IGoogleApiFactory googleApiFactory;
 
+  @Before
+  public void setup() {
+    doReturn(Optional.of(TestAccountProvider.ACCOUNT_1)).when(googleApiFactory).getAccount();
+    doReturn(Optional.of(TestAccountProvider.CREDENTIAL_ACCOUNT_1)).when(googleApiFactory).getCredential();
+  }
+
   @Test
   public void testCorrectPanelIsShownForFacetedProject() {
     DeployPropertyPage page = new DeployPropertyPage(loginService, googleApiFactory);

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/GcpProjectQueryJobTest.java

@@ -72,12 +72,6 @@ public void tearDown() {
     assertEquals(Job.NONE, queryJob.getState());
   }
 
-  @Test(expected = NullPointerException.class)
-  public void testNullCredential() {
-    new GcpProjectQueryJob(projectRepository, projectSelector,
-        dataBindingContext, isLatestQueryJob);
-  }
-
   @Test
   public void testRun_setsProjects() throws InterruptedException, ProjectRepositoryException {
     queryJob.schedule();

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/flexible/FlexDeployPreferencesDialogTest.java

@@ -17,12 +17,15 @@
 package com.google.cloud.tools.eclipse.appengine.deploy.ui.flexible;
 
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.cloud.tools.eclipse.googleapis.IGoogleApiFactory;
+import com.google.cloud.tools.eclipse.test.util.TestAccountProvider;
 import com.google.cloud.tools.eclipse.test.util.ui.CompositeUtil;
 import com.google.cloud.tools.eclipse.test.util.ui.ShellTestResource;
+import java.util.Optional;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.swt.widgets.Composite;
@@ -38,17 +41,23 @@ public class FlexDeployPreferencesDialogTest {
       + "flexible environment. Visit <a href=\"https://cloud.google.com/appengine/pricing\">"
       + "GCP Pricing</a> for pricing information.";
 
-  @Rule public ShellTestResource shellResource = new ShellTestResource();
+  @Rule
+  public ShellTestResource shellResource = new ShellTestResource();
 
   private FlexDeployPreferencesDialog dialog;
 
+  private IGoogleApiFactory googleApiFactory;
+
   @Before
   public void setUp() {
+    googleApiFactory = mock(IGoogleApiFactory.class);
+    doReturn(Optional.of(TestAccountProvider.ACCOUNT_1)).when(googleApiFactory).getAccount();
+    doReturn(Optional.of(TestAccountProvider.CREDENTIAL_ACCOUNT_1)).when(googleApiFactory)
+        .getCredential();
     IProject project = mock(IProject.class);
     when(project.getName()).thenReturn("");
     when(project.getLocation()).thenReturn(new Path("/"));
-    dialog = new FlexDeployPreferencesDialog(null, "title", project,
-        mock(IGoogleApiFactory.class));
+    dialog = new FlexDeployPreferencesDialog(null, "title", project, googleApiFactory);
   }
 
   @Test
@@ -61,8 +70,7 @@ public void testFlexPricingLabel() {
   }
 
   private static Control findGcpPricingLink(Composite dialogArea) {
-    return CompositeUtil.findControl(dialogArea,
-        control -> control instanceof Link && GCP_PRICING_MESSAGE.equals(((Link) control).getText())
-    );
+    return CompositeUtil.findControl(dialogArea, control -> control instanceof Link
+        && GCP_PRICING_MESSAGE.equals(((Link) control).getText()));
   }
 }

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/flexible/FlexDeployPreferencesPanelTest.java

@@ -21,14 +21,17 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doReturn;
 
 import com.google.cloud.tools.eclipse.appengine.deploy.ui.internal.AppYamlValidator;
 import com.google.cloud.tools.eclipse.appengine.facets.AppEngineFlexWarFacet;
 import com.google.cloud.tools.eclipse.googleapis.IGoogleApiFactory;
 import com.google.cloud.tools.eclipse.projectselector.ProjectRepository;
+import com.google.cloud.tools.eclipse.test.util.TestAccountProvider;
 import com.google.cloud.tools.eclipse.test.util.project.TestProjectCreator;
 import com.google.cloud.tools.eclipse.test.util.ui.CompositeUtil;
 import com.google.cloud.tools.eclipse.test.util.ui.ShellTestResource;
+import java.util.Optional;
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IProject;
@@ -61,6 +64,9 @@ public class FlexDeployPreferencesPanelTest {
 
   @Before
   public void setUp() {
+    doReturn(Optional.of(TestAccountProvider.ACCOUNT_1)).when(apiFactory).getAccount();
+    doReturn(Optional.of(TestAccountProvider.CREDENTIAL_ACCOUNT_1)).when(apiFactory)
+        .getCredential();
     project = projectCreator.getProject();
   }
 

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/flexible/FlexExistingArtifactDeployPreferencesPanelTest.java

@@ -21,19 +21,23 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.doReturn;
 
 import com.google.cloud.tools.eclipse.appengine.deploy.ui.AppEngineDeployPreferencesPanel;
 import com.google.cloud.tools.eclipse.appengine.deploy.ui.internal.DeployArtifactValidator;
 import com.google.cloud.tools.eclipse.googleapis.IGoogleApiFactory;
 import com.google.cloud.tools.eclipse.projectselector.ProjectRepository;
+import com.google.cloud.tools.eclipse.test.util.TestAccountProvider;
 import com.google.cloud.tools.eclipse.test.util.ui.CompositeUtil;
 import com.google.cloud.tools.eclipse.test.util.ui.ShellTestResource;
+import java.util.Optional;
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,6 +53,13 @@ public class FlexExistingArtifactDeployPreferencesPanelTest {
 
   @Rule public ShellTestResource shellResource = new ShellTestResource();
 
+  @Before
+  public void setup() {
+    doReturn(Optional.of(TestAccountProvider.ACCOUNT_1)).when(apiFactory).getAccount();
+    doReturn(Optional.of(TestAccountProvider.CREDENTIAL_ACCOUNT_1)).when(apiFactory)
+        .getCredential();
+  }
+
   @Test
   public void testDeployArtifactPathField() {
     AppEngineDeployPreferencesPanel panel = createPanel();

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/standard/DeployPropertyPageForStandardProjectTest.java

@@ -29,9 +29,9 @@ public class DeployPropertyPageForStandardProjectTest
     extends DeployPropertyPageTest<AppEngineDeployPreferencesPanel> {
 
   @Rule
-  public TestProjectCreator standardProjectCreator = new TestProjectCreator().withFacets(
-      JavaFacet.VERSION_1_8, WebFacetUtils.WEB_31,
-      AppEngineStandardFacetChangeListener.APP_ENGINE_STANDARD_JRE8);
+  public TestProjectCreator standardProjectCreator =
+      new TestProjectCreator().withFacets(JavaFacet.VERSION_1_8, WebFacetUtils.WEB_31,
+          AppEngineStandardFacetChangeListener.APP_ENGINE_STANDARD_JRE8);
 
   @Override
   protected IProject getProject() {

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/standard/StandardDeployPreferencesPanelTest.java

@@ -17,12 +17,15 @@
 package com.google.cloud.tools.eclipse.appengine.deploy.ui.standard;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.cloud.tools.eclipse.googleapis.IGoogleApiFactory;
 import com.google.cloud.tools.eclipse.projectselector.ProjectRepository;
+import com.google.cloud.tools.eclipse.test.util.TestAccountProvider;
 import com.google.cloud.tools.eclipse.test.util.ui.ShellTestResource;
+import java.util.Optional;
 import org.eclipse.core.resources.IProject;
 import org.junit.Rule;
 import org.junit.Test;
@@ -33,10 +36,14 @@ public class StandardDeployPreferencesPanelTest {
 
   @Test
   public void testGetHelpContextId() {
+    IGoogleApiFactory apiFactory = mock(IGoogleApiFactory.class);
+    doReturn(Optional.of(TestAccountProvider.ACCOUNT_1)).when(apiFactory).getAccount();
+    doReturn(Optional.of(TestAccountProvider.CREDENTIAL_ACCOUNT_1)).when(apiFactory)
+        .getCredential();
     IProject project = mock(IProject.class);
     when(project.getName()).thenReturn("");
     StandardDeployPreferencesPanel panel = new StandardDeployPreferencesPanel(
-        shellResource.getShell(), project, mock(IGoogleApiFactory.class), mock(Runnable.class),
+        shellResource.getShell(), project, apiFactory, mock(Runnable.class),
         false, mock(ProjectRepository.class));
 
     assertEquals(

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/AppEngineDeployPreferencesPanel.java

@@ -367,7 +367,7 @@ private void createProjectIdSection(IGoogleApiFactory apiFactory) {
 
     Composite linkComposite = new Composite(this, SWT.NONE);
     Link createNewProject = new Link(linkComposite, SWT.WRAP);
-    if (apiFactory.hasCredentialsSet()) {
+    if (apiFactory.getCredential().isPresent()) {
       createNewProject.setText(Messages.getString("projectselector.createproject",
           CREATE_GCP_PROJECT_URL));
       createNewProject.setToolTipText(Messages.getString("projectselector.createproject.tooltip"));
@@ -510,7 +510,7 @@ private void refreshProjectsForSelectedCredential(IGoogleApiFactory apiFactory)
     projectSelector.setProjects(Collections.<GcpProject>emptyList());
     latestGcpProjectQueryJob = null;
 
-    if (apiFactory.hasCredentialsSet()) {
+    if (apiFactory.getCredential().isPresent()) {
       Predicate<Job> isLatestQueryJob = job -> job == latestGcpProjectQueryJob;
       latestGcpProjectQueryJob = new GcpProjectQueryJob(projectRepository, 
           projectSelector, bindingContext, isLatestQueryJob);
@@ -598,7 +598,7 @@ protected IStatus validate() {
       // this access is recorded and ensures that changes are tracked, don't move it inside the if
       Object selectedProject = projectSelection.getValue();
 
-      if (!apiFactory.hasCredentialsSet()) {
+      if (!apiFactory.getCredential().isPresent()) {
         return ValidationStatus.ok();
       }
       if (projects.isEmpty()) {

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/DeployPreferencesDialog.java

@@ -102,7 +102,7 @@ protected Control createDialogArea(Composite parent) {
           @Override
           public int getMessageType(ValidationStatusProvider statusProvider) {
             int type = super.getMessageType(statusProvider);
-            setValid(type != IMessageProvider.ERROR && apiFactory.hasCredentialsSet());
+            setValid(type != IMessageProvider.ERROR && apiFactory.getCredential().isPresent());
             return type;
           }
         });

plugins/com.google.cloud.tools.eclipse.appengine.deploy/src/com/google/cloud/tools/eclipse/appengine/deploy/CloudSdkStagingHelper.java

@@ -21,10 +21,6 @@
 import com.google.cloud.tools.appengine.configuration.AppYamlProjectStageConfiguration;
 import com.google.cloud.tools.appengine.operations.AppEngineWebXmlProjectStaging;
 import com.google.cloud.tools.appengine.operations.AppYamlProjectStaging;
-import com.google.cloud.tools.appengine.operations.CloudSdk;
-import com.google.cloud.tools.eclipse.appengine.deploy.util.CloudSdkProcessWrapper;
-import java.nio.file.Path;
-import java.util.logging.Level;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;

plugins/com.google.cloud.tools.eclipse.appengine.deploy/src/com/google/cloud/tools/eclipse/appengine/deploy/util/CloudSdkProcessWrapper.java

@@ -17,7 +17,6 @@
 package com.google.cloud.tools.eclipse.appengine.deploy.util;
 
 import com.google.cloud.tools.appengine.operations.Deployment;
-import com.google.api.client.auth.oauth2.Credential;
 import com.google.cloud.tools.appengine.operations.AppCfg;
 import com.google.cloud.tools.appengine.operations.AppEngineWebXmlProjectStaging;
 import com.google.cloud.tools.appengine.operations.CloudSdk;
@@ -72,15 +71,7 @@ public class CloudSdkProcessWrapper {
    */
   public Deployment getAppEngineDeployment(MessageConsoleStream normalOutputStream) 
       throws CloudSdkNotFoundException {
-    Credential credential = null;
-    try {
-      credential = new GoogleApiFactory().getAccount().getOAuth2Credential();
-    }
-    catch (IOException ex) {
-      // will be handled in preconditions check;
-    }
-    Preconditions.checkNotNull(credential, "credentials not set");
-
+    Preconditions.checkState(new GoogleApiFactory().getCredential().isPresent(), "credential required for deploying");
     Preconditions.checkState(!initialized, "process wrapper already set up");
     initialized = true;
 

plugins/com.google.cloud.tools.eclipse.appengine.localserver.test/META-INF/MANIFEST.MF

@@ -8,7 +8,8 @@ Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
 Require-Bundle: com.google.cloud.tools.eclipse.test.dependencies
-Import-Package: com.google.cloud.tools.eclipse.swtbot,
+Import-Package: com.google.cloud.tools.eclipse.googleapis.internal,
+ com.google.cloud.tools.eclipse.swtbot,
  com.google.cloud.tools.eclipse.test.util,
  com.google.cloud.tools.eclipse.test.util.project,
  com.google.cloud.tools.eclipse.test.util.ui,