Skip to content
Snippets Groups Projects
Unverified Commit db973ba2 authored by Maximilian Lenkeit's avatar Maximilian Lenkeit Committed by GitHub
Browse files

Adopt TRL encoding to ENF restrictions (EXPOSUREAPP-4039) (#1763)

* Adopt Exposure Window test cases to new TRL encoding

keys with report type RECURSIVE are dropped by Android in Exposure
Window mode. The new encoding uses RECUSRIVE only with TRL 1 and 2
which are dropped anyway.

https://jira-ibs.wbs.net.sap/browse/EXPOSUREAPP-4039

* Adopt default App Config to new TRL encoding

keys with report type RECURSIVE are dropped by Android in Exposure
Window mode. The new encoding uses RECUSRIVE only with TRL 1 and 2
which are dropped anyway.

https://jira-ibs.wbs.net.sap/browse/EXPOSUREAPP-4039
https://github.com/corona-warn-app/cwa-protocol-buffers/commit/634c13c687a8f84d737a23c84e0e7c86e8e8bf9d



Co-authored-by: default avatarBMItter <46747780+BMItter@users.noreply.github.com>
parent eabb4fe6
No related branches found
No related tags found
No related merge requests found
No preview for this file type
665e82fa8d333eea36c5bda14f22f4519dc7d1a9dc890872ce8bc07880030bf1
\ No newline at end of file
827fb746a1128e465d65ec77030fdf38c823dec593ae18aed55195069cf8b701
\ No newline at end of file
......@@ -47,7 +47,7 @@ class DefaultAppConfigSanityCheck : BaseTest() {
fun `current default matches checksum`() {
val config = context.assets.open(configName).readBytes()
val sha256 = context.assets.open(checkSumName).readBytes().toString(Charsets.UTF_8)
sha256 shouldBe "665e82fa8d333eea36c5bda14f22f4519dc7d1a9dc890872ce8bc07880030bf1"
sha256 shouldBe "827fb746a1128e465d65ec77030fdf38c823dec593ae18aed55195069cf8b701"
config.toSHA256() shouldBe sha256
}
......
......@@ -76,12 +76,12 @@
}
],
"trlEncoding": {
"infectiousnessOffsetStandard": 0,
"infectiousnessOffsetHigh": 4,
"reportTypeOffsetRecursive": 4,
"reportTypeOffsetSelfReport": 3,
"reportTypeOffsetConfirmedClinicalDiagnosis": 2,
"reportTypeOffsetConfirmedTest": 1
"infectiousnessOffsetStandard": 1,
"infectiousnessOffsetHigh": 2,
"reportTypeOffsetRecursive": 0,
"reportTypeOffsetSelfReport": 2,
"reportTypeOffsetConfirmedClinicalDiagnosis": 4,
"reportTypeOffsetConfirmedTest": 6
},
"transmissionRiskLevelMultiplier": 0.2
},
......@@ -211,8 +211,8 @@
"exposureWindows": [
{
"ageInDays": 1,
"reportType": 2,
"infectiousness": 1,
"reportType": 4,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
{
......@@ -271,8 +271,8 @@
"exposureWindows": [
{
"ageInDays": 1,
"reportType": 1,
"infectiousness": 2,
"reportType": 2,
"infectiousness": 1,
"calibrationConfidence": 0,
"scanInstances": [
{
......@@ -306,8 +306,8 @@
"exposureWindows": [
{
"ageInDays": 1,
"reportType": 1,
"infectiousness": 2,
"reportType": 2,
"infectiousness": 1,
"calibrationConfidence": 0,
"scanInstances": [
{
......@@ -521,8 +521,8 @@
},
{
"ageInDays": 1,
"reportType": 4,
"infectiousness": 1,
"reportType": 3,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
{
......@@ -665,7 +665,7 @@
"exposureWindows": [
{
"ageInDays": 3,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
......@@ -683,7 +683,7 @@
},
{
"ageInDays": 2,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
......@@ -701,7 +701,7 @@
},
{
"ageInDays": 4,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
......@@ -731,7 +731,7 @@
"exposureWindows": [
{
"ageInDays": 1,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
......@@ -749,7 +749,7 @@
},
{
"ageInDays": 1,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
......@@ -779,7 +779,7 @@
"exposureWindows": [
{
"ageInDays": 1,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
......@@ -797,7 +797,7 @@
},
{
"ageInDays": 1,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 1,
"scanInstances": [
......@@ -827,7 +827,7 @@
"exposureWindows": [
{
"ageInDays": 1,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
......@@ -845,8 +845,8 @@
},
{
"ageInDays": 1,
"reportType": 3,
"infectiousness": 2,
"reportType": 1,
"infectiousness": 1,
"calibrationConfidence": 0,
"scanInstances": [
{
......@@ -875,7 +875,7 @@
"exposureWindows": [
{
"ageInDays": 1,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
......@@ -893,7 +893,7 @@
},
{
"ageInDays": 2,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
......@@ -941,7 +941,7 @@
},
{
"ageInDays": 1,
"reportType": 4,
"reportType": 1,
"infectiousness": 2,
"calibrationConfidence": 0,
"scanInstances": [
......@@ -1001,8 +1001,8 @@
"exposureWindows": [
{
"ageInDays": 1,
"reportType": 3,
"infectiousness": 2,
"reportType": 1,
"infectiousness": 1,
"calibrationConfidence": 0,
"scanInstances": [
{
......@@ -1031,8 +1031,8 @@
"exposureWindows": [
{
"ageInDays": 1,
"reportType": 3,
"infectiousness": 2,
"reportType": 1,
"infectiousness": 1,
"calibrationConfidence": 0,
"scanInstances": [
{
......@@ -1066,8 +1066,8 @@
"exposureWindows": [
{
"ageInDays": 1,
"reportType": 3,
"infectiousness": 2,
"reportType": 1,
"infectiousness": 1,
"calibrationConfidence": 0,
"scanInstances": [
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment