Fix incorrect region tag on + move HTTP methods sample (GoogleCloudPlatform#2626)

Ace Nassri · web-flow · commit 04e463efadab · 2020-04-10T13:13:21.000-07:00
diff --git a/functions/snippets/helloworld/src/test/java/com/example/functions/helloworld/HelloWorldSnippetsTest.java b/functions/snippets/helloworld/src/test/java/com/example/functions/helloworld/HelloWorldSnippetsTest.java
@@ -17,8 +17,6 @@
 package com.example.functions.helloworld;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.powermock.api.mockito.PowerMockito.mock;
 import static org.powermock.api.mockito.PowerMockito.when;
 
@@ -33,7 +31,6 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.net.HttpURLConnection;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -162,37 +159,4 @@ public void helloHttp_bodyParamsPost() throws IOException {
 
     assertThat(responseOut.toString()).isEqualTo("Hello Jane!");
   }
-
-  @Test
-  public void functionsHelloworldMethod_shouldAcceptGet() throws IOException {
-    when(request.getMethod()).thenReturn("GET");
-
-    new HelloMethod().service(request, response);
-
-    writerOut.flush();
-    verify(response, times(1)).setStatusCode(HttpURLConnection.HTTP_OK);
-    assertThat(responseOut.toString()).isEqualTo("Hello world!");
-  }
-
-  @Test
-  public void functionsHelloworldMethod_shouldForbidPut() throws IOException {
-    when(request.getMethod()).thenReturn("PUT");
-
-    new HelloMethod().service(request, response);
-
-    writerOut.flush();
-    verify(response, times(1)).setStatusCode(HttpURLConnection.HTTP_FORBIDDEN);
-    assertThat(responseOut.toString()).isEqualTo("Forbidden!");
-  }
-
-  @Test
-  public void functionsHelloworldMethod_shouldErrorOnPost() throws IOException {
-    when(request.getMethod()).thenReturn("POST");
-
-    new HelloMethod().service(request, response);
-
-    writerOut.flush();
-    verify(response, times(1)).setStatusCode(HttpURLConnection.HTTP_BAD_METHOD);
-    assertThat(responseOut.toString()).isEqualTo("Something blew up!");
-  }
 }
diff --git a/functions/snippets/http/src/main/java/com/example/functions/http/HttpMethod.java b/functions/snippets/http/src/main/java/com/example/functions/http/HttpMethod.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.example.functions.helloworld;
+package com.example.functions.http;
 
-// [START functions_helloworld_method]
+// [START functions_http_method]
 
 import com.google.cloud.functions.HttpFunction;
 import com.google.cloud.functions.HttpRequest;
@@ -25,7 +25,7 @@
 import java.io.IOException;
 import java.net.HttpURLConnection;
 
-public class HelloMethod implements HttpFunction {
+public class HttpMethod implements HttpFunction {
   @Override
   public void service(HttpRequest request, HttpResponse response)
       throws IOException {
@@ -48,4 +48,4 @@ public void service(HttpRequest request, HttpResponse response)
     }
   }
 }
-// [END functions_helloworld_method]
+// [END functions_http_method]
diff --git a/functions/snippets/http/src/test/java/com/example/functions/http/HttpTests.java b/functions/snippets/http/src/test/java/com/example/functions/http/HttpTests.java
@@ -17,6 +17,8 @@
 package com.example.functions.http;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.powermock.api.mockito.PowerMockito.mock;
 import static org.powermock.api.mockito.PowerMockito.when;
 
@@ -30,6 +32,7 @@
 import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.net.HttpURLConnection;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Optional;
@@ -157,4 +160,37 @@ public void parseContentTypeTest_form() throws IOException {
     writerOut.flush();
     assertThat(responseOut.toString()).contains("Hello John!");
   }
+
+  @Test
+  public void functionsHelloworldMethod_shouldAcceptGet() throws IOException {
+    when(request.getMethod()).thenReturn("GET");
+
+    new HttpMethod().service(request, response);
+
+    writerOut.flush();
+    verify(response, times(1)).setStatusCode(HttpURLConnection.HTTP_OK);
+    assertThat(responseOut.toString()).isEqualTo("Hello world!");
+  }
+
+  @Test
+  public void functionsHelloworldMethod_shouldForbidPut() throws IOException {
+    when(request.getMethod()).thenReturn("PUT");
+
+    new HttpMethod().service(request, response);
+
+    writerOut.flush();
+    verify(response, times(1)).setStatusCode(HttpURLConnection.HTTP_FORBIDDEN);
+    assertThat(responseOut.toString()).isEqualTo("Forbidden!");
+  }
+
+  @Test
+  public void functionsHelloworldMethod_shouldErrorOnPost() throws IOException {
+    when(request.getMethod()).thenReturn("POST");
+
+    new HttpMethod().service(request, response);
+
+    writerOut.flush();
+    verify(response, times(1)).setStatusCode(HttpURLConnection.HTTP_BAD_METHOD);
+    assertThat(responseOut.toString()).isEqualTo("Something blew up!");
+  }
 }
