-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #196 from DP-3T/develop
Version 1.0.4
- Loading branch information
Showing
12 changed files
with
324 additions
and
21 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
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
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
227 changes: 227 additions & 0 deletions
227
dp3t-sdk/sdk/src/androidTest/java/org/dpppt/android/sdk/internal/TEKReleaseTest.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,227 @@ | ||
| /* | ||
| * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch> | ||
| * | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at https://mozilla.org/MPL/2.0/. | ||
| * | ||
| * SPDX-License-Identifier: MPL-2.0 | ||
| */ | ||
| package org.dpppt.android.sdk.internal; | ||
|
|
||
| import android.app.Activity; | ||
| import android.app.Instrumentation; | ||
| import android.content.Context; | ||
| import android.content.Intent; | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4; | ||
| import androidx.test.platform.app.InstrumentationRegistry; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.Date; | ||
| import java.util.concurrent.CountDownLatch; | ||
| import java.util.concurrent.atomic.AtomicInteger; | ||
| import java.util.concurrent.atomic.AtomicLong; | ||
|
|
||
| import org.dpppt.android.sdk.DP3T; | ||
| import org.dpppt.android.sdk.InfectionStatus; | ||
| import org.dpppt.android.sdk.backend.ResponseCallback; | ||
| import org.dpppt.android.sdk.internal.backend.ProxyConfig; | ||
| import org.dpppt.android.sdk.internal.backend.models.GaenKey; | ||
| import org.dpppt.android.sdk.internal.backend.models.GaenRequest; | ||
| import org.dpppt.android.sdk.internal.backend.models.GaenSecondDay; | ||
| import org.dpppt.android.sdk.internal.logger.LogLevel; | ||
| import org.dpppt.android.sdk.internal.logger.Logger; | ||
| import org.dpppt.android.sdk.internal.nearby.GaenStateHelper; | ||
| import org.dpppt.android.sdk.internal.nearby.GoogleExposureClient; | ||
| import org.dpppt.android.sdk.internal.nearby.TestGoogleExposureClient; | ||
| import org.dpppt.android.sdk.internal.storage.PendingKeyUploadStorage; | ||
| import org.dpppt.android.sdk.internal.util.Json; | ||
| import org.dpppt.android.sdk.models.ApplicationInfo; | ||
| import org.dpppt.android.sdk.models.ExposeeAuthMethodJson; | ||
| import org.dpppt.android.sdk.util.DateUtil; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import okhttp3.mockwebserver.Dispatcher; | ||
| import okhttp3.mockwebserver.MockResponse; | ||
| import okhttp3.mockwebserver.MockWebServer; | ||
| import okhttp3.mockwebserver.RecordedRequest; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| @RunWith(AndroidJUnit4.class) | ||
| public class TEKReleaseTest { | ||
|
|
||
| Context context; | ||
| MockWebServer server; | ||
| TestGoogleExposureClient testGoogleExposureClient; | ||
| Instrumentation.ActivityMonitor monitor; | ||
| Instrumentation mInstrumentation; | ||
|
|
||
| @Before | ||
| public void setup() throws IOException { | ||
| mInstrumentation = InstrumentationRegistry.getInstrumentation(); | ||
| context = mInstrumentation.getTargetContext(); | ||
|
|
||
| Logger.init(context, LogLevel.DEBUG); | ||
|
|
||
| ProxyConfig.DISABLE_SYSTEM_PROXY = true; | ||
| GaenStateHelper.SET_GAEN_AVAILABILITY_AVAILABLE_FOR_TESTS = true; | ||
|
|
||
| server = new MockWebServer(); | ||
| server.start(); | ||
| AppConfigManager appConfigManager = AppConfigManager.getInstance(context); | ||
| DP3T.init(context, new ApplicationInfo("test", server.url("/bucket/").toString(), server.url("/report/").toString()), | ||
| null); | ||
| appConfigManager.setTracingEnabled(false); | ||
| DP3T.clearData(context); | ||
| DP3T.init(context, new ApplicationInfo("test", server.url("/bucket/").toString(), server.url("/report/").toString()), | ||
| null); | ||
| appConfigManager.setTracingEnabled(true); | ||
| PendingKeyUploadStorage.getInstance(context).clear(); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void testIAmInfectedTodayKeyAlreadyReleased() throws Exception { | ||
| testIAmInfected(true, false, 5, true); | ||
| } | ||
|
|
||
| @Test | ||
| public void testIAmInfectedTodayKeyNotReleased() throws Exception { | ||
| testIAmInfected(false, true, 4, false); | ||
| } | ||
|
|
||
| private void testIAmInfected(boolean currentDayKeyReleased, boolean expectedTracingEnabledDirectlyAfterSendingInfection, | ||
| int expectedNumberOfTEKToday, boolean expectedNextDayRequestIsFake) throws Exception { | ||
|
|
||
| testGoogleExposureClient = new TestGoogleExposureClient(context, currentDayKeyReleased); | ||
| GoogleExposureClient.wrapTestClient(testGoogleExposureClient); | ||
| testGoogleExposureClient.setTime(System.currentTimeMillis()); | ||
|
|
||
| Activity activity = startEmptyActivity(); | ||
|
|
||
| AtomicInteger exposedFakeRequestCounter = new AtomicInteger(0); | ||
| AtomicInteger exposedRequestCounter = new AtomicInteger(0); | ||
| AtomicInteger exposednextdayFakeRequestCounter = new AtomicInteger(0); | ||
| AtomicInteger exposednextdayRequestCounter = new AtomicInteger(0); | ||
| ArrayList<Integer> sentRollingStartNumbers = new ArrayList<>(); | ||
| ArrayList<Integer> nextdaySentRollingStartNumbers = new ArrayList<>(); | ||
|
|
||
| //Onset Date is 4 days ago | ||
| long onsetDate = System.currentTimeMillis() - 1000 * 60 * 60 * 96; | ||
|
|
||
| server.setDispatcher(new Dispatcher() { | ||
| @Override | ||
| public MockResponse dispatch(RecordedRequest request) { | ||
| String body = new String(request.getBody().readByteArray()); | ||
| if (request.getPath().equals("/bucket/v1/gaen/exposed")) { | ||
| GaenRequest gaenRequest = Json.fromJson(body, GaenRequest.class); | ||
| int fake = gaenRequest.isFake(); | ||
| if (fake == 1) exposedFakeRequestCounter.getAndIncrement(); | ||
| else { | ||
| for (GaenKey k : gaenRequest.getGaenKeys()) { | ||
| if (!k.isFake()) { | ||
| sentRollingStartNumbers.add(k.getRollingStartNumber()); | ||
| } | ||
| } | ||
| exposedRequestCounter.getAndIncrement(); | ||
| } | ||
| } | ||
| if (request.getPath().equals("/bucket/v1/gaen/exposednextday")) { | ||
| GaenSecondDay gaenSecondDayRequest = Json.fromJson(body, GaenSecondDay.class); | ||
| int fake = gaenSecondDayRequest.isFake(); | ||
| if (fake == 1) exposednextdayFakeRequestCounter.getAndIncrement(); | ||
| else { | ||
| exposednextdayRequestCounter.getAndIncrement(); | ||
| nextdaySentRollingStartNumbers.add(gaenSecondDayRequest.getDelayedKey().getRollingStartNumber()); | ||
| } | ||
| } | ||
| return new MockResponse().setResponseCode(200); | ||
| } | ||
| }); | ||
|
|
||
| CountDownLatch countDownLatch = new CountDownLatch(1); | ||
| DP3T.sendIAmInfected(activity, new Date(onsetDate), new ExposeeAuthMethodJson(""), new ResponseCallback<Void>() { | ||
| @Override | ||
| public void onSuccess(Void response) { | ||
| countDownLatch.countDown(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onError(Throwable throwable) { | ||
| countDownLatch.countDown(); | ||
| } | ||
| }); | ||
| countDownLatch.await(); | ||
|
|
||
| AtomicLong today = new AtomicLong(System.currentTimeMillis()); | ||
| try { | ||
| new SyncWorker.SyncImpl(context, today.get()).doSync(); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| assertEquals(1, exposedRequestCounter.get()); | ||
| assertEquals(0, exposedFakeRequestCounter.get()); | ||
| assertEquals(0, exposednextdayFakeRequestCounter.get()); | ||
| assertEquals(0, exposednextdayRequestCounter.get()); | ||
| assertEquals(expectedTracingEnabledDirectlyAfterSendingInfection, DP3T.isTracingEnabled(context)); | ||
| assertEquals(InfectionStatus.INFECTED, DP3T.getStatus(context).getInfectionStatus()); | ||
| assertEquals(expectedNumberOfTEKToday, sentRollingStartNumbers.size()); | ||
| for (int k : sentRollingStartNumbers) { | ||
| assertTrue(k >= DateUtil.getRollingStartNumberForDate(onsetDate)); | ||
| if (currentDayKeyReleased) { | ||
| assertTrue(k <= DateUtil.getRollingStartNumberForDate(today.get())); | ||
| } else { | ||
| assertTrue(k < DateUtil.getRollingStartNumberForDate(today.get())); | ||
| } | ||
| } | ||
|
|
||
| AtomicLong tomorrow = new AtomicLong(today.get() + 1000 * 60 * 60 * 24); | ||
| testGoogleExposureClient.setTime(tomorrow.get()); | ||
|
|
||
| try { | ||
| new SyncWorker.SyncImpl(context, tomorrow.get()).doSync(); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| mInstrumentation.removeMonitor(monitor); | ||
|
|
||
| assertEquals(1, exposedRequestCounter.get()); | ||
| assertEquals(0, exposedFakeRequestCounter.get()); | ||
| if (expectedNextDayRequestIsFake) { | ||
| assertEquals(1, exposednextdayFakeRequestCounter.get()); | ||
| assertEquals(0, exposednextdayRequestCounter.get()); | ||
| } else { | ||
| assertEquals(0, exposednextdayFakeRequestCounter.get()); | ||
| assertEquals(1, exposednextdayRequestCounter.get()); | ||
| } | ||
| assertFalse(DP3T.isTracingEnabled(context)); | ||
| assertEquals(InfectionStatus.INFECTED, DP3T.getStatus(context).getInfectionStatus()); | ||
| for (int k : nextdaySentRollingStartNumbers) { | ||
| //the rolling start number that is sent tomorrow must be equals to today's rolling start number | ||
| assertEquals(k, DateUtil.getRollingStartNumberForDate(today.get())); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| private Activity startEmptyActivity() { | ||
| Instrumentation.ActivityMonitor monitor = mInstrumentation.addMonitor(TestActivity.class.getName(), null, false); | ||
| Intent intent = new Intent(Intent.ACTION_MAIN); | ||
| intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); | ||
| intent.setClassName(mInstrumentation.getTargetContext(), TestActivity.class.getName()); | ||
| mInstrumentation.startActivitySync(intent); | ||
|
|
||
| Activity activity = mInstrumentation.waitForMonitor(monitor); | ||
| assertNotNull(activity); | ||
| return activity; | ||
| } | ||
|
|
||
| } |
8 changes: 8 additions & 0 deletions
8
dp3t-sdk/sdk/src/androidTest/java/org/dpppt/android/sdk/internal/TestActivity.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package org.dpppt.android.sdk.internal; | ||
|
|
||
| import android.app.Activity; | ||
|
|
||
| public class TestActivity extends Activity { | ||
|
|
||
|
|
||
| } |
Oops, something went wrong.