Update git submodules
* Update plugins/replication from branch 'master'
to f1e84b0738b60d89d8bd710e58ebba4eac61b770
- Migrate from easymock to mockito
Mockito naturally uses equals() for argument matching, so we can
remove the argument matcher classes that were implemented for Easymock
and instead just add equals() methods on the classes being matched.
Bug: Issue 5057
Change-Id: Ib9befe36b248529262ccedc0a24d63b54b43020b
- Merge branch 'stable-3.0'
* stable-3.0:
PushOneTest: Remove unused mock ReplicationQueue
ReplicationStateTest: Remove unused mock ReplicationTasksStorage
Wrap calls to createProject in a utility method
ReplicationIT: stop using EasyMock
Change-Id: I72e4b0bccfdf69fc2d3bcb21e8d85fab0a58a369
- DestinationConfiguration: Format with google-java-format
Change-Id: I1a7aab6cc2e4da8fe7c20c84e0ad580646d88577
- Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
PushOneTest: Remove unused mock ReplicationQueue
ReplicationStateTest: Remove unused mock ReplicationTasksStorage
Wrap calls to createProject in a utility method
ReplicationIT: stop using EasyMock
Change-Id: Idb3bb64f6073509a39fd961bf19e89898f8f6688
- PushOneTest: Remove unused mock ReplicationQueue
Change-Id: I162fb33059ef954b437d230cef05f732752dc137
- ReplicationStateTest: Remove unused mock ReplicationTasksStorage
Change-Id: I285805381512d76437ad740764697784b8f39c9e
- Wrap calls to createProject in a utility method
The createProject method is removed in stable-3.0, and creating a test
project must be done with the ProjectOperations class. This means that
when a new test is added in stable-2.16 and uses createProject, there
is a conflict when merging it up to stable-3.0.
Wrap all the calls to createProject in a new utility method and call
that instead in the tests. This commit will conflict on the next merge
up to stable-3.0, but then there will be no more conflicts in future.
Change-Id: I271d0d55cd07c25eb4c6f8acc47d144b47600356
- ReplicationIT: stop using EasyMock
Integration tests should never use mocks as they are always
supposed to use the real implementation and the integration
between components.
Remove the use of EasyMock as it has a very limited
contribution and impact on ReplicationIT.
Change-Id: I61d42c69164484486187f123a2fa26f8810c1924
diff --git a/plugins/replication b/plugins/replication
index c65db46..f1e84b0 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit c65db46ef4114df13accacd20fea61788eec01f1
+Subproject commit f1e84b0738b60d89d8bd710e58ebba4eac61b770
