Cause CloudToolsInfo.getToolsVersion() to return feature version (#1489)

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.util.test/src/com/google/cloud/tools/eclipse/util/CloudToolsInfoTest.java

@@ -16,18 +16,46 @@
 
 package com.google.cloud.tools.eclipse.util;
 
+import org.eclipse.core.runtime.IBundleGroup;
+import org.eclipse.core.runtime.IBundleGroupProvider;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class CloudToolsInfoTest {
+  @Mock
+  public IBundleGroupProvider bundleGroupProvider;
+  @Mock
+  public IBundleGroup bundleGroup;
 
   @Test
-  public void testGetToolsVersion() {
-    Assert.assertTrue(CloudToolsInfo.getToolsVersion().startsWith("0.1.0."));
+  public void testGetToolsVersion_featureId() {
+    Assert.assertEquals("com.google.cloud.tools.eclipse.suite.e45.feature",
+        CloudToolsInfo.CLOUD_TOOLS_FOR_ECLIPSE_FEATURE_ID);
+  }
+
+  @Test
+  public void testGetToolsVersion_noFeature() {
+    Assert.assertEquals("0.0.0", CloudToolsInfo.getToolsVersion(new IBundleGroupProvider[0]));
+  }
+
+  @Test
+  public void testGetToolsVersion_hasFeature() {
+    Mockito.when(bundleGroupProvider.getBundleGroups())
+        .thenReturn(new IBundleGroup[] {bundleGroup});
+    Mockito.when(bundleGroup.getIdentifier())
+        .thenReturn(CloudToolsInfo.CLOUD_TOOLS_FOR_ECLIPSE_FEATURE_ID);
+    Mockito.when(bundleGroup.getVersion()).thenReturn("123.456.789");
+    Assert.assertEquals("123.456.789",
+        CloudToolsInfo.getToolsVersion(new IBundleGroupProvider[] {bundleGroupProvider}));
   }
 
   @Test
   public void testUserAgent() {
-    Assert.assertTrue(CloudToolsInfo.USER_AGENT.startsWith("gcloud-eclipse-tools/0.1.0"));
+    Assert.assertTrue(CloudToolsInfo.USER_AGENT.startsWith("gcloud-eclipse-tools/"));
   }
 }

plugins/com.google.cloud.tools.eclipse.util.test/src/com/google/cloud/tools/eclipse/util/io/HttpUtilWithServerTest.java

@@ -43,7 +43,7 @@ public void testSendPostMultipart() throws IOException {
     assertEquals(200, HttpUtil.sendPostMultipart(server.getAddress(), parameters));
     assertEquals("POST", server.getRequestMethod());
     assertTrue(server.getRequestHeaders().get("User-Agent")
-        .startsWith("gcloud-eclipse-tools/0.1.0."));
+        .startsWith("gcloud-eclipse-tools/"));
     assertTrue(server.getRequestHeaders().get("Content-Type")
         .startsWith("multipart/form-data; boundary="));
 

plugins/com.google.cloud.tools.eclipse.util/src/com/google/cloud/tools/eclipse/util/CloudToolsInfo.java

@@ -16,20 +16,48 @@
 
 package com.google.cloud.tools.eclipse.util;
 
-import org.osgi.framework.FrameworkUtil;
+import com.google.common.annotations.VisibleForTesting;
+import java.util.logging.Logger;
+import org.eclipse.core.runtime.IBundleGroup;
+import org.eclipse.core.runtime.IBundleGroupProvider;
+import org.eclipse.core.runtime.Platform;
 
 /**
  * Provides generic information about the plug-in, such as a name to be used for usage
  * reporting and the current version, etc.
  */
 public class CloudToolsInfo {
+  private static final Logger logger = Logger.getLogger(CloudToolsInfo.class.getName());
+
+  /**
+   * Our main feature identifier, used for branding.
+   */
+  @VisibleForTesting
+  static final String CLOUD_TOOLS_FOR_ECLIPSE_FEATURE_ID =
+      "com.google.cloud.tools.eclipse.suite.e45.feature";
 
   // Don't change the value; this name is used as an originating "application" of usage metrics.
-  public static String METRICS_NAME = "gcloud-eclipse-tools";
+  public static final String METRICS_NAME = "gcloud-eclipse-tools";
 
-  public static String USER_AGENT = METRICS_NAME + "/" + getToolsVersion();
+  public static final String USER_AGENT = METRICS_NAME + "/" + getToolsVersion();
 
+  /** Return the version of associated Cloud Tools for Eclipse feature, or 0.0.0 if unknown. */
   public static String getToolsVersion() {
-    return FrameworkUtil.getBundle(CloudToolsInfo.class).getVersion().toString();
+    return getToolsVersion(Platform.getBundleGroupProviders());
+  }
+
+  @VisibleForTesting
+  static String getToolsVersion(IBundleGroupProvider[] bundleGroupProviders) {
+    for (IBundleGroupProvider provider : bundleGroupProviders) {
+      for (IBundleGroup feature : provider.getBundleGroups()) {
+        if (CLOUD_TOOLS_FOR_ECLIPSE_FEATURE_ID.equals(feature.getIdentifier())) {
+          return feature.getVersion();
+        }
+      }
+    }
+    // May not have been installed with via a feature. Although we could report the bundle version,
+    // that may result in a confusing versions.
+    logger.fine("Feature not found: " + CLOUD_TOOLS_FOR_ECLIPSE_FEATURE_ID);
+    return "0.0.0";
   }
 }