Merge pull request GoogleCloudPlatform#23 from GoogleCloudPlatform/monitoring

jerjou · jerjou · commit ba5d859186a9 · 2015-07-22T17:26:56.000-07:00
Java main args don't include the command name.
diff --git a/monitoring/src/main/java/CloudMonitoringAuthSample.java b/monitoring/src/main/java/CloudMonitoringAuthSample.java
@@ -80,12 +80,13 @@ private static CloudMonitoring authenticate()
    * @throws Exception if something goes wrong.
    */
   public static void main(final String[] args) throws Exception {
-    if (args.length != 2) {
-      System.err.println(String.format("Usage: %s <project-name>", args[0]));
+    if (args.length != 1) {
+      System.err.println(String.format("Usage: %s <project-name>",
+            CloudMonitoringAuthSample.class.getSimpleName()));
       return;
     }
 
-    String project = args[1];
+    String project = args[0];
 
     // Create an authorized API client
     CloudMonitoring cloudmonitoring = authenticate();
diff --git a/monitoring/src/test/java/CloudMonitoringAuthSampleTest.java b/monitoring/src/test/java/CloudMonitoringAuthSampleTest.java
@@ -48,13 +48,13 @@ public void tearDown() {
 
   @Test
   public void testUsage() throws Exception {
-    CloudMonitoringAuthSample.main(new String[] { "command-name" });
-    assertEquals("Usage: command-name <project-name>\n", stderr.toString());
+    CloudMonitoringAuthSample.main(new String[] { });
+    assertEquals("Usage: CloudMonitoringAuthSample <project-name>\n", stderr.toString());
   }
 
   @Test
   public void testListTimeSeries() throws Exception {
-    CloudMonitoringAuthSample.main(new String[] { "", "cloud-samples-tests" });
+    CloudMonitoringAuthSample.main(new String[] { "cloud-samples-tests" });
     String out = stdout.toString();
     assertThat(out, containsPattern("Timeseries.list raw response:"));
     assertThat(out, containsPattern("\\{\\s*\"kind\" *: *\"cloudmonitoring#listTimeseriesResponse\","));
