chore: Add junit timeout rule to unittests folder (GoogleCloudPlatform#5587)

kurtisvg · web-flow · commit 4a488d7b13f0 · 2021-07-09T20:28:22.000Z
May help fix GoogleCloudPlatform#5575, or at least hopefully narrow down which test is causing the issue.
diff --git a/unittests/src/test/java/com/google/appengine/samples/AuthenticationTest.java b/unittests/src/test/java/com/google/appengine/samples/AuthenticationTest.java
@@ -28,7 +28,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class AuthenticationTest {
+public class AuthenticationTest extends BaseTestConfiguration {
 
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(new LocalUserServiceTestConfig())
diff --git a/unittests/src/test/java/com/google/appengine/samples/BaseTestConfiguration.java b/unittests/src/test/java/com/google/appengine/samples/BaseTestConfiguration.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.appengine.samples;
+
+import java.util.concurrent.TimeUnit;
+import org.junit.Rule;
+import org.junit.rules.Timeout;
+
+public abstract class BaseTestConfiguration {
+  @Rule public Timeout testTimeout = new Timeout(5, TimeUnit.MINUTES);
+}
diff --git a/unittests/src/test/java/com/google/appengine/samples/DeferredTaskTest.java b/unittests/src/test/java/com/google/appengine/samples/DeferredTaskTest.java
@@ -30,7 +30,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class DeferredTaskTest {
+public class DeferredTaskTest extends BaseTestConfiguration {
 
   // Unlike CountDownLatch, TaskCountDownlatch lets us reset.
   private final LocalTaskQueueTestConfig.TaskCountDownLatch latch =
diff --git a/unittests/src/test/java/com/google/appengine/samples/LocalCustomPolicyHighRepDatastoreTest.java b/unittests/src/test/java/com/google/appengine/samples/LocalCustomPolicyHighRepDatastoreTest.java
@@ -33,7 +33,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class LocalCustomPolicyHighRepDatastoreTest {
+public class LocalCustomPolicyHighRepDatastoreTest extends BaseTestConfiguration {
   private static final class CustomHighRepJobPolicy implements HighRepJobPolicy {
     static int newJobCounter = 0;
     static int existingJobCounter = 0;
diff --git a/unittests/src/test/java/com/google/appengine/samples/LocalDatastoreTest.java b/unittests/src/test/java/com/google/appengine/samples/LocalDatastoreTest.java
@@ -31,7 +31,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class LocalDatastoreTest {
+public class LocalDatastoreTest extends BaseTestConfiguration {
 
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(new LocalDatastoreServiceTestConfig());
diff --git a/unittests/src/test/java/com/google/appengine/samples/LocalHighRepDatastoreTest.java b/unittests/src/test/java/com/google/appengine/samples/LocalHighRepDatastoreTest.java
@@ -33,7 +33,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class LocalHighRepDatastoreTest {
+public class LocalHighRepDatastoreTest extends BaseTestConfiguration {
 
   // Maximum eventual consistency.
   private final LocalServiceTestHelper helper =
diff --git a/unittests/src/test/java/com/google/appengine/samples/LocalMemcacheTest.java b/unittests/src/test/java/com/google/appengine/samples/LocalMemcacheTest.java
@@ -31,7 +31,7 @@
 // [END imports]
 
 // [START NameAndHelper]
-public class LocalMemcacheTest {
+public class LocalMemcacheTest extends BaseTestConfiguration {
 
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(new LocalMemcacheServiceTestConfig());
diff --git a/unittests/src/test/java/com/google/appengine/samples/LocalUrlFetchTest.java b/unittests/src/test/java/com/google/appengine/samples/LocalUrlFetchTest.java
@@ -33,7 +33,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class LocalUrlFetchTest {
+public class LocalUrlFetchTest extends BaseTestConfiguration {
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(new LocalURLFetchServiceTestConfig());
 
diff --git a/unittests/src/test/java/com/google/appengine/samples/MyFirstTest.java b/unittests/src/test/java/com/google/appengine/samples/MyFirstTest.java
@@ -22,7 +22,7 @@
 
 import org.junit.Test;
 
-public class MyFirstTest {
+public class MyFirstTest extends BaseTestConfiguration {
   @Test
   public void testAddition() {
     assertEquals(4, 2 + 2);
diff --git a/unittests/src/test/java/com/google/appengine/samples/ShortTest.java b/unittests/src/test/java/com/google/appengine/samples/ShortTest.java
@@ -32,7 +32,7 @@
 import org.junit.After;
 import org.junit.Test;
 
-public class ShortTest {
+public class ShortTest extends BaseTestConfiguration {
   private LocalServiceTestHelper helper;
 
   @After
diff --git a/unittests/src/test/java/com/google/appengine/samples/TaskQueueConfigTest.java b/unittests/src/test/java/com/google/appengine/samples/TaskQueueConfigTest.java
@@ -28,7 +28,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class TaskQueueConfigTest {
+public class TaskQueueConfigTest extends BaseTestConfiguration {
   // [START LocalServiceTestHelper]
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(new LocalTaskQueueTestConfig()
diff --git a/unittests/src/test/java/com/google/appengine/samples/TaskQueueTest.java b/unittests/src/test/java/com/google/appengine/samples/TaskQueueTest.java
@@ -30,7 +30,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class TaskQueueTest {
+public class TaskQueueTest extends BaseTestConfiguration {
 
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(new LocalTaskQueueTestConfig());
