Skip to content
This repository has been archived by the owner on Sep 15, 2023. It is now read-only.

Commit

Permalink
add unit test for findDscs up to
Browse files Browse the repository at this point in the history
  • Loading branch information
@ubhaller
ubhaller committed Jul 14, 2021
1 parent 6ab76c5 commit 6595383
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 13 deletions.
45 changes: 33 additions & 12 deletions ...est/java/ch/admin/bag/covidcertificate/backend/verifier/data/VerifierDataServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
import ch.admin.bag.covidcertificate.backend.verifier.model.CertSource;
import ch.admin.bag.covidcertificate.backend.verifier.model.cert.Algorithm;
import ch.admin.bag.covidcertificate.backend.verifier.model.cert.CertFormat;
import ch.admin.bag.covidcertificate.backend.verifier.model.cert.ClientCert;
import ch.admin.bag.covidcertificate.backend.verifier.model.cert.db.DbCsca;
import ch.admin.bag.covidcertificate.backend.verifier.model.cert.db.DbDsc;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
Expand Down Expand Up @@ -104,9 +106,12 @@ void insertDscTest() {
final var cscaId = verifierDataService.findCscas("CH").get(0).getId();
verifierDataService.insertDscs(Collections.emptyList());
assertTrue(verifierDataService.findActiveDscKeyIds().isEmpty());
final var rsaDsc = getRSADsc(0, "CH", cscaId);
final var rsaDsc = getRsaDsc(0, "CH", cscaId);
verifierDataService.insertDscs(Collections.singletonList(rsaDsc));
assertEquals(1, verifierDataService.findActiveDscKeyIds().size());

List<String> activeDscKeyIds = verifierDataService.findActiveDscKeyIds();
assertEquals(1, activeDscKeyIds.size());
assertEquals(rsaDsc.getKeyId(), activeDscKeyIds.get(0));
assertEquals(
rsaDsc.getKeyId(),
verifierDataService.findDscs(0L, CertFormat.ANDROID, null).get(0).getKeyId());
Expand All @@ -119,12 +124,12 @@ void removeDscsNotInTest() {
final var cscas = verifierDataService.findCscas("CH");
assertEquals(1, cscas.size());
final var cscaId = cscas.get(0).getId();
final var rsaDsc = getRSADsc(0, "CH", cscaId);
final var rsaDsc = getRsaDsc(0, "CH", cscaId);
verifierDataService.insertDscs(Collections.singletonList(rsaDsc));
verifierDataService.removeDscsNotIn(Collections.emptyList());
assertTrue(verifierDataService.findActiveDscKeyIds().isEmpty());
verifierDataService.removeDscsNotIn(Collections.singletonList("keyid_0"));
final var ecDsc = getECDsc(1, "CH", cscaId);
final var ecDsc = getEcDsc(1, "CH", cscaId);
verifierDataService.insertDscs(List.of(rsaDsc, ecDsc));
verifierDataService.removeDscsNotIn(Collections.singletonList(rsaDsc.getKeyId()));
assertEquals(1, verifierDataService.findActiveDscKeyIds().size());
Expand All @@ -148,8 +153,8 @@ void removeDscsWithCscaIn() {
assertEquals(2, cscas.size());
final var cscaId0 = cscas.get(0).getId();
final var cscaId1 = cscas.get(1).getId();
final var rsaDsc = getRSADsc(0, "DE", cscaId0);
final var ecDsc = getECDsc(1, "DE", cscaId1);
final var rsaDsc = getRsaDsc(0, "DE", cscaId0);
final var ecDsc = getEcDsc(1, "DE", cscaId1);
verifierDataService.insertDscs(List.of(rsaDsc, ecDsc));
verifierDataService.removeDscsWithCscaIn(Collections.emptyList());
assertEquals(2, verifierDataService.findActiveDscKeyIds().size());
Expand All @@ -171,9 +176,25 @@ void removeDscsWithCscaIn() {
void findDscsTest() {
verifierDataService.insertCscas(Collections.singletonList(getDefaultCsca(0, "CH")));
final var cscaId = verifierDataService.findCscas("CH").get(0).getId();
verifierDataService.insertDscs(
List.of(getRSADsc(0, "CH", cscaId), getECDsc(1, "DE", cscaId)));
assertEquals(2, verifierDataService.findDscs(0L, CertFormat.IOS, null).size());

List<DbDsc> dscs = List.of(getRsaDsc(0, "CH", cscaId), getEcDsc(1, "DE", cscaId));
verifierDataService.insertDscs(dscs);

assertEquals(dscs.size(), verifierDataService.findDscs(0L, CertFormat.IOS, null).size());

// test upTo
verifierDataService.insertDscs(List.of(getEcDsc(2, "DE", cscaId)));
assertEquals(
dscs.size() + 1, verifierDataService.findDscs(0L, CertFormat.IOS, null).size());
List<ClientCert> upTo1 =
verifierDataService.findDscs(0L, CertFormat.IOS, (long) dscs.size());
assertEquals(dscs.size(), upTo1.size());
List<String> expectedKeyIds =
dscs.stream().map(DbDsc::getKeyId).collect(Collectors.toList());
for (ClientCert clientCert : upTo1) {
assertTrue(expectedKeyIds.contains(clientCert.getKeyId()));
assertTrue(clientCert.getPkId() <= dscs.size());
}
}

@Test
Expand All @@ -182,7 +203,7 @@ void findMaxDscsTest() {
verifierDataService.insertCscas(Collections.singletonList(getDefaultCsca(0, "CH")));
final var cscaId = verifierDataService.findCscas("CH").get(0).getId();
verifierDataService.insertDscs(
List.of(getRSADsc(0, "CH", cscaId), getECDsc(1, "DE", cscaId)));
List.of(getRsaDsc(0, "CH", cscaId), getEcDsc(1, "DE", cscaId)));
final var maxDscPkId = verifierDataService.findMaxDscPkId();
assertTrue(verifierDataService.findDscs(maxDscPkId, CertFormat.IOS, null).isEmpty());
assertEquals(1, verifierDataService.findDscs(maxDscPkId - 1, CertFormat.IOS, null).size());
Expand All @@ -197,7 +218,7 @@ private DbCsca getDefaultCsca(int idSuffix, String origin) {
return dbCsca;
}

private DbDsc getRSADsc(int idSuffix, String origin, long fkCsca) {
private DbDsc getRsaDsc(int idSuffix, String origin, long fkCsca) {
final var dbDsc = new DbDsc();
dbDsc.setKeyId("keyid_" + idSuffix);
dbDsc.setFkCsca(fkCsca);
Expand All @@ -211,7 +232,7 @@ private DbDsc getRSADsc(int idSuffix, String origin, long fkCsca) {
return dbDsc;
}

private DbDsc getECDsc(int idSuffix, String origin, long fkCsca) {
private DbDsc getEcDsc(int idSuffix, String origin, long fkCsca) {
final var dbDsc = new DbDsc();
dbDsc.setKeyId("keyid_" + idSuffix);
dbDsc.setFkCsca(fkCsca);
Expand Down
2 changes: 1 addition & 1 deletion ...fier-sync/src/test/java/ch/admin/bag/covidcertificate/backend/verifier/sync/X509Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void testX509Rsa() throws Exception {
}

@Test
void testX509EC() throws Exception {
void testX509Ec() throws Exception {
X509Certificate dscX509 = getX509(EC_DSC_PATH);
X509Certificate cscaX509 = getX509(EC_CSCA_PATH);

Expand Down

0 comments on commit 6595383

Please sign in to comment.