diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2014-11-26 11:50:38 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2014-11-26 12:07:11 +0900 |
| commit | 26e5a864e130c19accd802b7a62009ff9ce616a1 (patch) | |
| tree | e400c1e4b959d82a5fcc4fb8a2664f0eeb75f8ce | |
| parent | 4ecb82d6f380104fc818781476035e18b8000700 (diff) | |
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
| -rw-r--r-- | gerrit-server/src/test/java/com/google/gerrit/server/git/SubmoduleOpTest.java | 8 |
1 files changed, 0 insertions, 8 deletions
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 6de5c61306..e7a219e78c 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 @@ public class SubmoduleOpTest extends LocalDiskRepositoryTestCase { 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 @@ public class SubmoduleOpTest extends LocalDiskRepositoryTestCase { 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 = |