-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Amendment of gradle wrapper properties
- Loading branch information
1 parent
3f83f8d
commit 4dce939
Showing
7 changed files
with
148 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Thu Jan 19 12:26:01 EAT 2023 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip | ||
| distributionPath=wrapper/dists | ||
| zipStorePath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
p2p-sync/src/test/java/org/smartregister/p2p/shadows/ShadowConnectionsClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,13 @@ | ||
| package org.smartregister.p2p.sync.handler; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertNull; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| import com.google.android.gms.nearby.connection.Payload; | ||
| import com.google.android.gms.nearby.connection.PayloadTransferUpdate; | ||
|
|
||
|
|
@@ -42,12 +50,6 @@ | |
| import java.util.Optional; | ||
| import java.util.TreeSet; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertNull; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| /** | ||
| * Created by Ephraim Kigamba - [email protected] on 29/03/2019 | ||
| */ | ||
|
|
@@ -56,29 +58,25 @@ | |
| @Config(shadows = {ShadowAppDatabase.class, ShadowTasker.class, ShadowPayload.class}) | ||
| public class SyncSenderHandlerTest { | ||
|
|
||
| private final DataType event = new DataType("event", DataType.Type.NON_MEDIA, 1); | ||
| private final DataType client = new DataType("client", DataType.Type.NON_MEDIA, 2); | ||
| private final DataType profilePic = new DataType("profile-pic", DataType.Type.MEDIA, 3); | ||
| @Rule | ||
| public MockitoRule mockitoRule = MockitoJUnit.rule(); | ||
|
|
||
| private TestSyncSenderHandler syncSenderHandler; | ||
| @Mock | ||
| private P2pModeSelectContract.SenderPresenter senderPresenter; | ||
|
|
||
| @Mock | ||
| private P2PAuthorizationService authorizationService; | ||
| @Mock | ||
| private SenderTransferDao senderTransferDao; | ||
| @Mock | ||
| private ReceiverTransferDao receiverTransferDao; | ||
|
|
||
| private TreeSet<DataType> dataSyncOrder; | ||
|
|
||
| private DataType event = new DataType("event", DataType.Type.NON_MEDIA, 1); | ||
| private DataType client = new DataType("client", DataType.Type.NON_MEDIA, 2); | ||
| private DataType profilePic = new DataType("profile-pic", DataType.Type.MEDIA, 3); | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| P2PLibrary.init(new P2PLibrary.Options(RuntimeEnvironment.application, "some password", "username" | ||
| P2PLibrary.init(new P2PLibrary.Options(RuntimeEnvironment.application, "somepassword", "username" | ||
| , authorizationService, receiverTransferDao, senderTransferDao)); | ||
|
|
||
| dataSyncOrder = new TreeSet<>(); | ||
|
|
@@ -155,7 +153,7 @@ public void sendNextManifestShouldCallSendJSONDataManifestWhenNonMediaDataTypeIs | |
| syncSenderHandler.sendNextManifest(); | ||
|
|
||
| Mockito.verify(syncSenderHandler, Mockito.times(1)) | ||
| .sendJsonDataManifest(Mockito.any(DataType.class)); | ||
| .sendJsonDataManifest(any(DataType.class)); | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -170,7 +168,7 @@ public void sendNextManifestShouldCallSendMultimediaDataManifestWhenMediaDataTyp | |
| syncSenderHandler.sendNextManifest(); | ||
|
|
||
| Mockito.verify(syncSenderHandler, Mockito.times(1)) | ||
| .sendMultimediaDataManifest(Mockito.any(DataType.class)); | ||
| .sendMultimediaDataManifest(any(DataType.class)); | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -207,7 +205,7 @@ public void onPayloadTransferUpdateShouldCallSendNextPayloadAndResetFlagsWhenMan | |
| .when(syncSenderHandler) | ||
| .sendNextPayload(); | ||
|
|
||
| PayloadTransferUpdate payloadTransferUpdate = Mockito.mock(PayloadTransferUpdate.class); | ||
| PayloadTransferUpdate payloadTransferUpdate = mock(PayloadTransferUpdate.class); | ||
|
|
||
| Mockito.doReturn(payloadId) | ||
| .when(payloadTransferUpdate) | ||
|
|
@@ -225,7 +223,7 @@ public void onPayloadTransferUpdateShouldCallSendNextPayloadAndResetFlagsWhenMan | |
| .sendNextPayload(); | ||
|
|
||
| assertFalse((boolean) ReflectionHelpers.getField(syncSenderHandler, "awaitingManifestTransfer")); | ||
| assertEquals(Optional.of(0l), ReflectionHelpers.getField(syncSenderHandler, "awaitingManifestId")); | ||
| assertEquals(Optional.of(0L), ReflectionHelpers.getField(syncSenderHandler, "awaitingManifestId")); | ||
| assertNull(ReflectionHelpers.getField(syncSenderHandler, "payloadRetry")); | ||
| } | ||
|
|
||
|
|
@@ -238,7 +236,7 @@ public void onPayloadTransferUpdateShouldRetrySendingManifestWhenStatusManifestU | |
| .when(syncSenderHandler) | ||
| .sendNextPayload(); | ||
|
|
||
| PayloadTransferUpdate payloadTransferUpdate = Mockito.mock(PayloadTransferUpdate.class); | ||
| PayloadTransferUpdate payloadTransferUpdate = mock(PayloadTransferUpdate.class); | ||
|
|
||
| Mockito.doReturn(payloadId) | ||
| .when(payloadTransferUpdate) | ||
|
|
@@ -248,7 +246,7 @@ public void onPayloadTransferUpdateShouldRetrySendingManifestWhenStatusManifestU | |
| .when(payloadTransferUpdate) | ||
| .getStatus(); | ||
|
|
||
| SyncPackageManifest syncPackageManifest = Mockito.mock(SyncPackageManifest.class); | ||
| SyncPackageManifest syncPackageManifest = mock(SyncPackageManifest.class); | ||
|
|
||
| ReflectionHelpers.setField(syncSenderHandler, "awaitingManifestTransfer", true); | ||
| ReflectionHelpers.setField(syncSenderHandler, "awaitingManifestId", payloadId); | ||
|
|
@@ -271,7 +269,7 @@ public void onPayloadTransferUpdateShouldReportFatalSyncErrorToPresenterWhenMani | |
| .when(syncSenderHandler) | ||
| .sendNextPayload(); | ||
|
|
||
| PayloadTransferUpdate payloadTransferUpdate = Mockito.mock(PayloadTransferUpdate.class); | ||
| PayloadTransferUpdate payloadTransferUpdate = mock(PayloadTransferUpdate.class); | ||
|
|
||
| Mockito.doReturn(payloadId) | ||
| .when(payloadTransferUpdate) | ||
|
|
@@ -286,7 +284,7 @@ public void onPayloadTransferUpdateShouldReportFatalSyncErrorToPresenterWhenMani | |
| syncSenderHandler.onPayloadTransferUpdate(payloadTransferUpdate); | ||
|
|
||
| Mockito.verify(senderPresenter, Mockito.times(1)) | ||
| .errorOccurredSync(Mockito.any(Exception.class)); | ||
| .errorOccurredSync(any(Exception.class)); | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -297,7 +295,7 @@ public void onProcessStringShouldCallSendNextManifestWhenPayloadStatusUpdateForP | |
| .when(syncSenderHandler) | ||
| .sendNextManifest(); | ||
|
|
||
| Payload awaitingPayload = Mockito.mock(Payload.class); | ||
| Payload awaitingPayload = mock(Payload.class); | ||
|
|
||
| Mockito.doReturn(payloadId) | ||
| .when(awaitingPayload) | ||
|
|
@@ -330,7 +328,7 @@ public void onPayloadTransferUpdateShouldRetrySendingPayloadWhenPayloadStatusUpd | |
| long payloadId = 9; | ||
| int status = PayloadTransferUpdate.Status.FAILURE; | ||
|
|
||
| PayloadTransferUpdate payloadTransferUpdate = Mockito.mock(PayloadTransferUpdate.class); | ||
| PayloadTransferUpdate payloadTransferUpdate = mock(PayloadTransferUpdate.class); | ||
|
|
||
| Mockito.doReturn(payloadId) | ||
| .when(payloadTransferUpdate) | ||
|
|
@@ -340,7 +338,7 @@ public void onPayloadTransferUpdateShouldRetrySendingPayloadWhenPayloadStatusUpd | |
| .when(payloadTransferUpdate) | ||
| .getStatus(); | ||
|
|
||
| Payload awaitingPayload = Mockito.mock(Payload.class); | ||
| Payload awaitingPayload = mock(Payload.class); | ||
|
|
||
| Mockito.doReturn(payloadId) | ||
| .when(awaitingPayload) | ||
|
|
@@ -370,7 +368,7 @@ public void onPayloadTransferUpdateShouldReportFatalErrorToPresenterWhenPayloadS | |
| long payloadId = 9; | ||
| int status = PayloadTransferUpdate.Status.CANCELED; | ||
|
|
||
| PayloadTransferUpdate payloadTransferUpdate = Mockito.mock(PayloadTransferUpdate.class); | ||
| PayloadTransferUpdate payloadTransferUpdate = mock(PayloadTransferUpdate.class); | ||
|
|
||
| Mockito.doReturn(payloadId) | ||
| .when(payloadTransferUpdate) | ||
|
|
@@ -380,7 +378,7 @@ public void onPayloadTransferUpdateShouldReportFatalErrorToPresenterWhenPayloadS | |
| .when(payloadTransferUpdate) | ||
| .getStatus(); | ||
|
|
||
| Payload awaitingPayload = Mockito.mock(Payload.class); | ||
| Payload awaitingPayload = mock(Payload.class); | ||
|
|
||
| Mockito.doReturn(payloadId) | ||
| .when(awaitingPayload) | ||
|
|
@@ -391,14 +389,14 @@ public void onPayloadTransferUpdateShouldReportFatalErrorToPresenterWhenPayloadS | |
| syncSenderHandler.onPayloadTransferUpdate(payloadTransferUpdate); | ||
|
|
||
| Mockito.verify(senderPresenter, Mockito.times(1)) | ||
| .errorOccurredSync(Mockito.any(Exception.class)); | ||
| .errorOccurredSync(any(Exception.class)); | ||
| } | ||
|
|
||
| @Test | ||
| public void sendMultimediaDataManifestShouldCallPresenterSendManifest() { | ||
| DataType dataType = new DataType("pic", DataType.Type.MEDIA, 5); | ||
|
|
||
| File mockFile = Mockito.mock(File.class); | ||
| File mockFile = mock(File.class); | ||
| MultiMediaData multiMediaData = new MultiMediaData(mockFile, 8923); | ||
| HashMap<String, String> details = new HashMap<>(); | ||
| details.put("fileRecordId", "928"); | ||
|
|
@@ -408,7 +406,7 @@ public void sendMultimediaDataManifestShouldCallPresenterSendManifest() { | |
| HashMap<String, Long> remainingLastRecords = ReflectionHelpers.getField(syncSenderHandler, "remainingLastRecordIds"); | ||
| remainingLastRecords.put("pic", 0L); | ||
|
|
||
| Payload payload = Mockito.mock(Payload.class); | ||
| Payload payload = mock(Payload.class); | ||
| Mockito.doReturn(898L) | ||
| .when(payload) | ||
| .getId(); | ||
|
|
@@ -427,15 +425,15 @@ public void sendMultimediaDataManifestShouldCallPresenterSendManifest() { | |
|
|
||
| syncSenderHandler.sendMultimediaDataManifest(dataType); | ||
| Mockito.verify(senderPresenter, Mockito.times(1)) | ||
| .sendManifest(Mockito.any(SyncPackageManifest.class)); | ||
| .sendManifest(any(SyncPackageManifest.class)); | ||
| } | ||
|
|
||
| @Test | ||
| public void sendJsonDataManifestShouldCallPresenterSendManifest() { | ||
| DataType dataType = new DataType("Person", DataType.Type.NON_MEDIA, 5); | ||
| JsonData multiMediaData = new JsonData(new JSONArray(), 8923); | ||
|
|
||
| Payload payload = Mockito.mock(Payload.class); | ||
| Payload payload = mock(Payload.class); | ||
| Mockito.doReturn(898L) | ||
| .when(payload) | ||
| .getId(); | ||
|
|
||
Oops, something went wrong.