Fix SubmoduleOp tests
Patch set 31 of change I91bbdffa added an optimisation to prevent an
unnecessary call to submoduleSubscriptions().delete(), but neglected
to update the unit test mock expectations, thus causing them to fail.
Remove unneeded expect() calls in the unit tests.
Also, in future, remember to always run the unit tests again even if
"only making a trivial change" :(
Change-Id: I2d15c69028812a1a11382e854377605c404b3044
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/SubmoduleOpTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/git/SubmoduleOpTest.java
index 6de5c61..e7a219e 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/git/SubmoduleOpTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/git/SubmoduleOpTest.java
@@ -659,9 +659,6 @@
expect(subscriptions.bySubmodule(targetBranchNameKey)).andReturn(
emptySubscriptions);
- expect(schema.submoduleSubscriptions()).andReturn(subscriptions);
- subscriptions.delete(EasyMock.<Iterable<SubmoduleSubscription>>anyObject());
-
schema.close();
final PersonIdent myIdent =
@@ -770,11 +767,6 @@
expect(subscriptions.bySubmodule(targetBranchNameKey)).andReturn(
incorrectSubscriptions);
- expect(schema.submoduleSubscriptions()).andReturn(subscriptions);
- subscriptions.delete(EasyMock.<Iterable<SubmoduleSubscription>>anyObject());
- expect(schema.submoduleSubscriptions()).andReturn(subscriptions);
- subscriptions.delete(EasyMock.<Iterable<SubmoduleSubscription>>anyObject());
-
schema.close();
final PersonIdent myIdent =