Skip to content
This repository was archived by the owner on May 16, 2023. It is now read-only.

Community enhancements #927

Merged
mibrasap merged 3 commits into from
Oct 27, 2020
Merged

Community enhancements #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
773e779
Refactoring/reformatting in tests (#830)
Ra-Jo-cosee Oct 26, 2020
743e3a8
Merge branch 'master' into community
mibrasap Oct 27, 2020
72accc3
Merge branch 'master' into community
mibrasap Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...ces/distribution/assembly/appconfig/validation/ApplicationConfigurationValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,26 @@ private ValidationResult getResultForTest(TestWithExpectedResult test) throws Un
}

private static Stream<Arguments> createOkTests() {
return Stream.of(AllOk()).map(Arguments::of);
return Stream.of(allOk()).map(Arguments::of);
}

private static Stream<Arguments> createNegativeTests() {
return Stream.of(
MinRiskThresholdOutOfBoundsNegative(),
MinRiskThresholdOutOfBoundsPositive()
minRiskThresholdOutOfBoundsNegative(),
minRiskThresholdOutOfBoundsPositive()
).map(Arguments::of);
}

public static TestWithExpectedResult AllOk() {
private static TestWithExpectedResult allOk() {
return TEST_BUILDER.build("app-config_ok.yaml");
}

public static TestWithExpectedResult MinRiskThresholdOutOfBoundsNegative() {
private static TestWithExpectedResult minRiskThresholdOutOfBoundsNegative() {
return TEST_BUILDER.build("app-config_mrs_negative.yaml")
.with(buildError("min-risk-score", RISK_SCORE_MIN - 1, VALUE_OUT_OF_BOUNDS));
}

public static TestWithExpectedResult MinRiskThresholdOutOfBoundsPositive() {
private static TestWithExpectedResult minRiskThresholdOutOfBoundsPositive() {
return TEST_BUILDER.build("app-config_mrs_oob.yaml")
.with(buildError("min-risk-score", RISK_SCORE_MAX + 1, VALUE_OUT_OF_BOUNDS));
}
Expand Down
24 changes: 12 additions & 12 deletions ...rvices/distribution/assembly/appconfig/validation/ExposureConfigurationValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,48 +41,48 @@ private ValidationResult getResultForTest(TestWithExpectedResult test) throws Un

private static Stream<Arguments> createOkTests() {
return Stream.of(
AllOk(),
PartlyFilled(),
WeightOk()
allOk(),
partlyFilled(),
weightOk()
).map(Arguments::of);
}

private static Stream<Arguments> createFailedTests() {
return Stream.of(
ScoreTooHigh(),
WeightNegative(),
WeightTooHigh()
scoreTooHigh(),
weightNegative(),
weightTooHigh()
).map(Arguments::of);
}

public static TestWithExpectedResult AllOk() {
private static TestWithExpectedResult allOk() {
return new TestWithExpectedResult("all_ok.yaml");
}

public static TestWithExpectedResult PartlyFilled() {
private static TestWithExpectedResult partlyFilled() {
return new TestWithExpectedResult("partly_filled.yaml");
}

public static TestWithExpectedResult WeightOk() {
private static TestWithExpectedResult weightOk() {
return new TestWithExpectedResult("weight_ok.yaml");
}

public static TestWithExpectedResult WeightNegative() {
private static TestWithExpectedResult weightNegative() {
return new TestWithExpectedResult("weight_negative.yaml")
.with(buildError(CONFIG_PREFIX + "transmission", -10d, VALUE_OUT_OF_BOUNDS))
.with(buildError(CONFIG_PREFIX + "attenuation", 0.0001, TOO_MANY_DECIMAL_PLACES))
.with(buildError(CONFIG_PREFIX + "attenuation", 0.0001, VALUE_OUT_OF_BOUNDS))
.with(buildError(CONFIG_PREFIX + "duration", .0, VALUE_OUT_OF_BOUNDS));
}

public static TestWithExpectedResult WeightTooHigh() {
private static TestWithExpectedResult weightTooHigh() {
return new TestWithExpectedResult("weight_too_high.yaml")
.with(buildError(CONFIG_PREFIX + "duration", 99999999d, VALUE_OUT_OF_BOUNDS))
.with(buildError(CONFIG_PREFIX + "attenuation", 100.001d, VALUE_OUT_OF_BOUNDS))
.with(buildError(CONFIG_PREFIX + "transmission", 101d, VALUE_OUT_OF_BOUNDS));
}

public static TestWithExpectedResult ScoreTooHigh() {
private static TestWithExpectedResult scoreTooHigh() {
return new TestWithExpectedResult("score_too_high.yaml")
.with(buildError(CONFIG_PREFIX + "transmission.appDefined1", RiskLevel.UNRECOGNIZED, VALUE_OUT_OF_BOUNDS))
.with(buildError(CONFIG_PREFIX + "transmission.appDefined2", RiskLevel.UNRECOGNIZED, VALUE_OUT_OF_BOUNDS));
Expand Down
83 changes: 30 additions & 53 deletions ...s/distribution/assembly/diagnosiskeys/structure/directory/DiagnosisKeysDirectoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,7 @@ void setupAll() throws IOException {
void checkBuildsTheCorrectDirectoryStructureForOneCountryWhenNoKeys() {
buildDirectoryStructure(emptyList(), "DE");

Set<String> expectedFiles = Set.of(
join(separator, "diagnosis-keys", "country", "index"),
join(separator, "diagnosis-keys", "country", "DE", "date", "index"),
join(separator, "diagnosis-keys", "country", distributionServiceConfig.getEuPackageName(), "date", "index")
);

Set<String> expectedFiles = getExpectedFiles(separator);
Set<String> actualFiles = getFilePaths(outputFile, outputFile.getAbsolutePath());

assertThat(actualFiles).isEqualTo(amendWithChecksumFiles(expectedFiles));
Expand All @@ -92,11 +87,8 @@ void checkBuildsTheCorrectDirectoryStructureForOneCountryWhenNoKeys() {
void checkBuildsTheCorrectDirectoryStructureForMultipleSupportedCountriesWhenNoKeys() {
buildDirectoryStructure(emptyList(), "DE", "FR");

Set<String> expectedFiles = Set.of(
join(separator, "diagnosis-keys", "country", "index"),
join(separator, "diagnosis-keys", "country", "DE", "date", "index"),
join(separator, "diagnosis-keys", "country", distributionServiceConfig.getEuPackageName(), "date", "index")
);
String separator = File.separator;
Set<String> expectedFiles = getExpectedFiles(separator);

Set<String> actualFiles = getFilePaths(outputFile, outputFile.getAbsolutePath());

Expand All @@ -109,16 +101,8 @@ void checkBuildsTheCorrectDirectoryStructureForOneCountry() {

buildDirectoryStructure(diagnosisKeys, "DE");

Set<String> expectedFiles = Sets.newLinkedHashSet(join(separator, "diagnosis-keys", "country", "index"),
join(separator, "diagnosis-keys", "country", "DE", "date", "index"),
join(separator, "diagnosis-keys", "country", distributionServiceConfig.getEuPackageName(), "date", "index"));
expectedFiles.addAll(generateExpectedDirectoryStructure("DE", "1970-01-03"));
expectedFiles.addAll(generateExpectedDirectoryStructure("DE", "1970-01-04"));
expectedFiles
.addAll(generateExpectedDirectoryStructure(distributionServiceConfig.getEuPackageName(), "1970-01-03"));
expectedFiles
.addAll(generateExpectedDirectoryStructure(distributionServiceConfig.getEuPackageName(), "1970-01-04"));

Set<String> expectedFiles = getExpectedFiles(separator);
expectedFiles.addAll(directoriesFrom1970_01_03To1970_01_04());
Set<String> actualFiles = getFilePaths(outputFile, outputFile.getAbsolutePath());

assertThat(actualFiles).isEqualTo(amendWithChecksumFiles(expectedFiles));
Expand All @@ -132,17 +116,8 @@ void checkBuildsTheCorrectDirectoryStructureForDifferentVisitedCountries() {

buildDirectoryStructure(diagnosisKeysOfCountries, "DE", "FR");

Set<String> expectedFiles = Sets.newLinkedHashSet(join(separator, "diagnosis-keys", "country", "index"),
join(separator, "diagnosis-keys", "country", "DE", "date", "index"),
join(separator, "diagnosis-keys", "country", distributionServiceConfig.getEuPackageName(), "date", "index"));

expectedFiles.addAll(generateExpectedDirectoryStructure("DE", "1970-01-03"));
expectedFiles.addAll(generateExpectedDirectoryStructure("DE", "1970-01-04"));

expectedFiles
.addAll(generateExpectedDirectoryStructure(distributionServiceConfig.getEuPackageName(), "1970-01-03"));
expectedFiles
.addAll(generateExpectedDirectoryStructure(distributionServiceConfig.getEuPackageName(), "1970-01-04"));
Set<String> expectedFiles = getExpectedFiles(separator);
expectedFiles.addAll(directoriesFrom1970_01_03To1970_01_04());
Set<String> actualFiles = getFilePaths(outputFile, outputFile.getAbsolutePath());

assertThat(actualFiles).isEqualTo(amendWithChecksumFiles(expectedFiles));
Expand All @@ -158,18 +133,8 @@ void checkBuildsTheCorrectDirectoryStructureForTwoCountriesWithDifferentKeys() {

buildDirectoryStructure(diagnosisKeysOfCountries, "DE", "FR");

Set<String> expectedFiles = Sets.newLinkedHashSet(join(separator, "diagnosis-keys", "country", "index"),
join(separator, "diagnosis-keys", "country", "DE", "date", "index"),
join(separator, "diagnosis-keys", "country", distributionServiceConfig.getEuPackageName(), "date", "index")
);

expectedFiles.addAll(generateExpectedDirectoryStructure("DE", "1970-01-03"));
expectedFiles.addAll(generateExpectedDirectoryStructure("DE", "1970-01-04"));
expectedFiles
.addAll(generateExpectedDirectoryStructure(distributionServiceConfig.getEuPackageName(), "1970-01-03"));
expectedFiles
.addAll(generateExpectedDirectoryStructure(distributionServiceConfig.getEuPackageName(), "1970-01-04"));

Set<String> expectedFiles = getExpectedFiles(separator);
expectedFiles.addAll(directoriesFrom1970_01_03To1970_01_04());
Set<String> actualFiles = getFilePaths(outputFile, outputFile.getAbsolutePath());

assertThat(actualFiles).isEqualTo(amendWithChecksumFiles(expectedFiles));
Expand All @@ -183,19 +148,31 @@ void checkBuildsTheCorrectDirectoryStructureForMultipleSupportedCountriesAndSing

buildDirectoryStructure(diagnosisKeysOfCountries, "DE", "FR", "DK");

Set<String> expectedFiles = Sets.newLinkedHashSet(join(separator, "diagnosis-keys", "country", "index"),
Set<String> expectedFiles = getExpectedFiles(separator);
expectedFiles.addAll(directoriesFrom1970_01_03To1970_01_04());
Set<String> actualFiles = getFilePaths(outputFile, outputFile.getAbsolutePath());

assertThat(actualFiles).isEqualTo(amendWithChecksumFiles(expectedFiles));
}

private Set<String> getExpectedFiles(String separator) {
return Sets.newLinkedHashSet(
join(separator, "diagnosis-keys", "country", "index"),
join(separator, "diagnosis-keys", "country", "DE", "date", "index"),
join(separator, "diagnosis-keys", "country", distributionServiceConfig.getEuPackageName(), "date", "index"));
expectedFiles.addAll(generateExpectedDirectoryStructure("DE", "1970-01-03"));
expectedFiles.addAll(generateExpectedDirectoryStructure("DE", "1970-01-04"));
expectedFiles
join(separator, "diagnosis-keys", "country", distributionServiceConfig.getEuPackageName(), "date", "index")
);
}

private Set<String> directoriesFrom1970_01_03To1970_01_04() {
Set<String> directories = Sets.newLinkedHashSet();
directories.addAll(generateExpectedDirectoryStructure("DE", "1970-01-03"));
directories.addAll(generateExpectedDirectoryStructure("DE", "1970-01-04"));
directories
.addAll(generateExpectedDirectoryStructure(distributionServiceConfig.getEuPackageName(), "1970-01-03"));
expectedFiles
directories
.addAll(generateExpectedDirectoryStructure(distributionServiceConfig.getEuPackageName(), "1970-01-04"));

Set<String> actualFiles = getFilePaths(outputFile, outputFile.getAbsolutePath());

assertThat(actualFiles).isEqualTo(amendWithChecksumFiles(expectedFiles));
return directories;
}

private void buildDirectoryStructure(Collection<DiagnosisKey> keys, String... supportedCountries) {
Expand Down