{@link #initialize(LocalServerEnvironment, Clock)} must be called before the first invocation diff --git a/api_dev/src/main/java/com/google/appengine/api/users/dev/LocalUserService.java b/api_dev/src/main/java/com/google/appengine/api/users/dev/LocalUserService.java index dc7e81d40..021319404 100644 --- a/api_dev/src/main/java/com/google/appengine/api/users/dev/LocalUserService.java +++ b/api_dev/src/main/java/com/google/appengine/api/users/dev/LocalUserService.java @@ -33,7 +33,7 @@ import java.util.Map; /** - * {@local LocalUserService} creates URLs that point to {@link + * {@link LocalUserService} creates URLs that point to {@link * LocalLoginServlet} and {@link LocalLogoutServlet} when used within * the Development AppServer environment. * diff --git a/api_dev/src/main/java/com/google/appengine/tools/development/ContainerService.java b/api_dev/src/main/java/com/google/appengine/tools/development/ContainerService.java index a2b8f7436..1043590f4 100644 --- a/api_dev/src/main/java/com/google/appengine/tools/development/ContainerService.java +++ b/api_dev/src/main/java/com/google/appengine/tools/development/ContainerService.java @@ -71,7 +71,7 @@ LocalServerEnvironment configure(String devAppServerVersion, String address, int *
* Note that this provides access to the original delegate which was established by
* the {@link DevAppServer}. Though this delegate is usually available by calling
- * {@Link ApiProxy#getDelegate()} the delegate can be changed by the application so
+ * {@link ApiProxy#getDelegate()} the delegate can be changed by the application so
* we keep this reference to the original.
*
* @param apiProxyDelegate
diff --git a/api_dev/src/main/java/com/google/appengine/tools/development/testing/LocalCapabilitiesServiceTestConfig.java b/api_dev/src/main/java/com/google/appengine/tools/development/testing/LocalCapabilitiesServiceTestConfig.java
index 405e7656a..c1ccfedd6 100644
--- a/api_dev/src/main/java/com/google/appengine/tools/development/testing/LocalCapabilitiesServiceTestConfig.java
+++ b/api_dev/src/main/java/com/google/appengine/tools/development/testing/LocalCapabilitiesServiceTestConfig.java
@@ -51,7 +51,7 @@ public void tearDown() {
* Controls the state of a capability in testing mode.
*
* @param capability the {@link Capability} to change the status of
- * @param status the {@CapabilityStatus} to set for the given Capability
+ * @param status the {@link CapabilityStatus} to set for the given Capability
* @return {@code this} (for chaining)
*/
public LocalCapabilitiesServiceTestConfig setCapabilityStatus(Capability capability,
diff --git a/api_dev/src/test/java/com/google/appengine/api/blobstore/BlobstoreServiceImplTest.java b/api_dev/src/test/java/com/google/appengine/api/blobstore/BlobstoreServiceImplTest.java
index bf0403fdf..eb0c7c66d 100644
--- a/api_dev/src/test/java/com/google/appengine/api/blobstore/BlobstoreServiceImplTest.java
+++ b/api_dev/src/test/java/com/google/appengine/api/blobstore/BlobstoreServiceImplTest.java
@@ -163,9 +163,6 @@ public void testDelete_multiSuccess() throws Exception {
DeleteBlobRequest requestProto =
DeleteBlobRequest.newBuilder().addBlobKey("_foo1").addBlobKey("_foo2").build();
- when(delegate.makeSyncCall(any(), any(), any(), any())).thenReturn(new byte[0]);
-
- new BlobstoreServiceImpl().delete(new BlobKey("_foo1"), new BlobKey("_foo2"));
when(delegate.makeSyncCall(
same(ApiProxy.getCurrentEnvironment()),
eq(BlobstoreServiceImpl.PACKAGE),
@@ -173,6 +170,8 @@ public void testDelete_multiSuccess() throws Exception {
eq(requestProto.toByteArray())))
.thenReturn(new byte[0]);
+ new BlobstoreServiceImpl().delete(new BlobKey("_foo1"), new BlobKey("_foo2"));
+
verify(delegate)
.makeSyncCall(
same(ApiProxy.getCurrentEnvironment()),
diff --git a/api_dev/src/test/java/com/google/appengine/api/datastore/AdminDatastoreServiceTest.java b/api_dev/src/test/java/com/google/appengine/api/datastore/AdminDatastoreServiceTest.java
index 0942e81aa..2a3f1149c 100644
--- a/api_dev/src/test/java/com/google/appengine/api/datastore/AdminDatastoreServiceTest.java
+++ b/api_dev/src/test/java/com/google/appengine/api/datastore/AdminDatastoreServiceTest.java
@@ -21,6 +21,7 @@
import static com.google.common.util.concurrent.Futures.immediateFuture;
import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.notNull;
import static org.mockito.Mockito.when;
@@ -89,7 +90,7 @@ public void setUp() throws Exception {
new AsyncDatastoreServiceFactory() {
@Override
public AsyncDatastoreService getInstance(DatastoreServiceConfig config) {
- when(delegate.getDatastoreServiceConfig()).thenReturn(config);
+ lenient().when(delegate.getDatastoreServiceConfig()).thenReturn(config);
return delegate;
}
diff --git a/api_dev/src/test/java/com/google/appengine/api/datastore/DatastoreCallbacksTest.java b/api_dev/src/test/java/com/google/appengine/api/datastore/DatastoreCallbacksTest.java
index 516e86508..60f30ed19 100644
--- a/api_dev/src/test/java/com/google/appengine/api/datastore/DatastoreCallbacksTest.java
+++ b/api_dev/src/test/java/com/google/appengine/api/datastore/DatastoreCallbacksTest.java
@@ -1412,7 +1412,6 @@ public void testPostLoad_Get_Batch_RollbackTxn() throws Exception {
datastore.get(ImmutableList.of(yar.getKey(), yarChild.getKey()));
verifyNoMoreInteractions(mock);
// postLoad callback doesn't run until we call get() on the future.
- assertThat(result.get()).containsExactly(yar.getKey(), yar, yarChild.getKey(), yarChild);
doAnswer(checkContext(new PostLoadContext(txnProvider, txn, ImmutableList.of(yar, yarChild))))
.when(mock)
.postLoad(any());
diff --git a/appengine_jsr107/src/test/java/com/google/appengine/api/memcache/jsr107cache/GCacheTest.java b/appengine_jsr107/src/test/java/com/google/appengine/api/memcache/jsr107cache/GCacheTest.java
index c7eff80aa..b62c99126 100644
--- a/appengine_jsr107/src/test/java/com/google/appengine/api/memcache/jsr107cache/GCacheTest.java
+++ b/appengine_jsr107/src/test/java/com/google/appengine/api/memcache/jsr107cache/GCacheTest.java
@@ -207,7 +207,7 @@ public void testPutAll_addIfNotPresent_throws() {
properties.put(GCacheFactory.THROW_ON_PUT_FAILURE, Boolean.TRUE);
properties.put(GCacheFactory.SET_POLICY, ADD_ONLY_IF_NOT_PRESENT);
Cache cache = new GCache(properties);
- when(service.putAll(map, null, REPLACE_ONLY_IF_PRESENT)).thenReturn(failureSet);
+ when(service.putAll(map, null, ADD_ONLY_IF_NOT_PRESENT)).thenReturn(failureSet);
assertThrows(GCacheException.class, () -> cache.putAll(map));
}
diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml
index af9da780c..37bd357fb 100644
--- a/appengine_testing_tests/pom.xml
+++ b/appengine_testing_tests/pom.xml
@@ -68,6 +68,12 @@