From 672b7082c48a7a8a91788d4e7ecc8d199b7b309b Mon Sep 17 00:00:00 2001
From: Laurie White <lauriewhite@google.com>
Date: Fri, 22 Apr 2016 16:17:55 -0700
Subject: [PATCH] Added files via upload

---
 appengine/requests/pom.xml                          | 10 +---------
 .../appengine/requests/LoggingServletTest.java      |  8 --------
 .../appengine/requests/RequestsServletTest.java     | 13 +------------
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/appengine/requests/pom.xml b/appengine/requests/pom.xml
index 37ed7e3f61d..68dd81c2cd3 100644
--- a/appengine/requests/pom.xml
+++ b/appengine/requests/pom.xml
@@ -93,15 +93,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
+
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
diff --git a/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java b/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java
index b251436b1c4..e84c3d1db19 100644
--- a/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java
+++ b/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java
@@ -19,8 +19,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -42,9 +40,6 @@
  */
 @RunWith(JUnit4.class)
 public class LoggingServletTest {
-  // Set up a helper so that the ApiProxy returns a valid environment for local testing.
-  private final LocalServiceTestHelper helper = new LocalServiceTestHelper();
-
   // To capture and restore stderr
   private final ByteArrayOutputStream stderr = new ByteArrayOutputStream();
   private static final PrintStream REAL_ERR = System.err;
@@ -60,7 +55,6 @@ public void setUp() throws Exception {
     System.setErr(new PrintStream(stderr));
 
     MockitoAnnotations.initMocks(this);
-    helper.setUp();
 
     // Set up a fake HTTP response.
     responseWriter = new StringWriter();
@@ -73,8 +67,6 @@ public void setUp() throws Exception {
   public void tearDown() {
     //  Restore stderr  
     System.setErr(LoggingServletTest.REAL_ERR);
-
-    helper.tearDown();
   }
 
   @Test
diff --git a/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java b/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java
index 4af808a0586..4e27eebbb3b 100644
--- a/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java
+++ b/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java
@@ -19,9 +19,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,9 +37,6 @@
  */
 @RunWith(JUnit4.class)
 public class RequestsServletTest {
-  // Set up a helper so that the ApiProxy returns a valid environment for local testing.
-  private final LocalServiceTestHelper helper = new LocalServiceTestHelper();
-
   @Mock private HttpServletRequest mockRequest;
   @Mock private HttpServletResponse mockResponse;
   private StringWriter responseWriter;
@@ -51,7 +45,6 @@ public class RequestsServletTest {
   @Before
   public void setUp() throws Exception {
     MockitoAnnotations.initMocks(this);
-    helper.setUp();
 
     // Set up a fake HTTP response.
     responseWriter = new StringWriter();
@@ -59,11 +52,7 @@ public void setUp() throws Exception {
 
     servletUnderTest = new RequestsServlet();
   }
-
-  @After public void tearDown() {
-    helper.tearDown();
-  }
-
+ 
   @Test
   public void doGet_writesResponse() throws Exception {
     servletUnderTest.doGet(mockRequest, mockResponse);