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

Commit

Permalink
add feature flag and force update unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@ubhaller
ubhaller committed Jul 20, 2021
1 parent cfebbe4 commit b104639
Show file tree
Hide file tree
Showing 9 changed files with 98 additions and 14 deletions.
5 changes: 1 addition & 4 deletions ...wallet/ws/model/WalletConfigResponse.java → ...ig/shared/model/WalletConfigResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package ch.admin.bag.covidcertificate.backend.config.wallet.ws.model;
package ch.admin.bag.covidcertificate.backend.config.shared.model;

import ch.admin.bag.covidcertificate.backend.config.shared.model.ConfigResponse;
import ch.admin.bag.covidcertificate.backend.config.shared.model.Faq;
import ch.admin.bag.covidcertificate.backend.config.shared.model.Language;
import ch.ubique.openapi.docannotations.Documentation;
import java.util.Map;

Expand Down
5 changes: 4 additions & 1 deletion ...ch-covidcertificate-backend-config-shared/src/main/resources/application-local.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# test p12 for local development use
ws.jws.p12=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
ws.jws.password=test
ws.jws.password=test

ws.wallet.light-certificate.active=true
ws.wallet.pdf-generation.active=true
5 changes: 5 additions & 0 deletions ...red/src/test/java/ch/admin/bag/covidcertificate/backend/config/shared/ConfigAsserter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import ch.admin.bag.covidcertificate.backend.config.shared.model.ConfigResponse;
import ch.admin.bag.covidcertificate.backend.config.shared.model.Faq;
Expand Down Expand Up @@ -39,6 +40,10 @@ public static void assertIsNoForceUpdate(ConfigResponse resp) throws Exception {
assertFalse(resp.isForceUpdate());
}

public static void assertIsForceUpdate(ConfigResponse resp) throws Exception {
assertTrue(resp.isForceUpdate());
}

public static void assertInfoBox(ConfigResponse resp) throws Exception {
for (Language language : Language.values()) {
assertNotNull(resp.getInfoBox().get(language));
Expand Down
26 changes: 22 additions & 4 deletions ...-shared/src/test/java/ch/admin/bag/covidcertificate/backend/config/shared/TestHelper.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package ch.admin.bag.covidcertificate.backend.config.shared;

import ch.admin.bag.covidcertificate.backend.config.shared.model.ConfigResponse;
import ch.admin.bag.covidcertificate.backend.config.shared.model.WalletConfigResponse;
import ch.admin.bag.covidcertificate.backend.config.shared.security.signature.JWSMessageConverter;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down Expand Up @@ -32,22 +33,39 @@ public TestHelper(ObjectMapper objectMapper) {
this.objectMapper = objectMapper;
}

public ConfigResponse toConfigResponse(
MockHttpServletResponse result, MediaType mediaType, String pathToCaPem)
public ConfigResponse internalToConfigResponse(
MockHttpServletResponse result,
MediaType mediaType,
String pathToCaPem,
Class<? extends ConfigResponse> clazz)
throws JsonProcessingException, UnsupportedEncodingException {
String responseStr = result.getContentAsString(StandardCharsets.UTF_8);
if (MediaType.APPLICATION_JSON.equalsTypeAndSubtype(mediaType)) {
return objectMapper.readValue(responseStr, ConfigResponse.class);
return objectMapper.readValue(responseStr, clazz);
} else if (JWSMessageConverter.JWS_MEDIA_TYPE.equalsTypeAndSubtype(mediaType)) {
// verify cert chain
Jws<Claims> claimsJws =
Jwts.parserBuilder()
.setSigningKeyResolver(new JwsKeyResolver(pathToCaPem))
.build()
.parseClaimsJws(responseStr);
return objectMapper.convertValue(claimsJws.getBody(), ConfigResponse.class);
return objectMapper.convertValue(claimsJws.getBody(), clazz);
} else {
throw new RuntimeException("unexpected media type: " + mediaType);
}
}

public ConfigResponse toConfigResponse(
MockHttpServletResponse result, MediaType mediaType, String pathToCaPem)
throws JsonProcessingException, UnsupportedEncodingException {
return internalToConfigResponse(result, mediaType, pathToCaPem, ConfigResponse.class);
}

public WalletConfigResponse toWalletConfigResponse(
MockHttpServletResponse result, MediaType mediaType, String pathToCaPem)
throws JsonProcessingException, UnsupportedEncodingException {
return (WalletConfigResponse)
internalToConfigResponse(
result, mediaType, pathToCaPem, WalletConfigResponse.class);
}
}
2 changes: 1 addition & 1 deletion ...ch/admin/bag/covidcertificate/backend/config/wallet/ws/config/mock/MockFaqLinkConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import ch.admin.bag.covidcertificate.backend.config.shared.model.Language;
import ch.admin.bag.covidcertificate.backend.config.shared.poeditor.Messages;
import ch.admin.bag.covidcertificate.backend.config.wallet.ws.controller.WalletConfigController;
import ch.admin.bag.covidcertificate.backend.config.wallet.ws.model.WalletConfigResponse;
import ch.admin.bag.covidcertificate.backend.config.shared.model.WalletConfigResponse;
import java.util.Map;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
Expand Down
2 changes: 1 addition & 1 deletion ...dmin/bag/covidcertificate/backend/config/wallet/ws/config/mock/MockForceUpdateConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import ch.admin.bag.covidcertificate.backend.config.shared.poeditor.Messages;
import ch.admin.bag.covidcertificate.backend.config.shared.semver.Version;
import ch.admin.bag.covidcertificate.backend.config.wallet.ws.controller.WalletConfigController;
import ch.admin.bag.covidcertificate.backend.config.wallet.ws.model.WalletConfigResponse;
import ch.admin.bag.covidcertificate.backend.config.shared.model.WalletConfigResponse;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
2 changes: 1 addition & 1 deletion ...ch/admin/bag/covidcertificate/backend/config/wallet/ws/config/mock/MockInfoBoxConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import ch.admin.bag.covidcertificate.backend.config.shared.helper.MockHelper;
import ch.admin.bag.covidcertificate.backend.config.shared.poeditor.Messages;
import ch.admin.bag.covidcertificate.backend.config.wallet.ws.controller.WalletConfigController;
import ch.admin.bag.covidcertificate.backend.config.wallet.ws.model.WalletConfigResponse;
import ch.admin.bag.covidcertificate.backend.config.shared.model.WalletConfigResponse;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
2 changes: 1 addition & 1 deletion ...dmin/bag/covidcertificate/backend/config/wallet/ws/controller/WalletConfigController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import ch.admin.bag.covidcertificate.backend.config.shared.helper.FaqHelper;
import ch.admin.bag.covidcertificate.backend.config.shared.poeditor.Messages;
import ch.admin.bag.covidcertificate.backend.config.shared.semver.Version;
import ch.admin.bag.covidcertificate.backend.config.wallet.ws.model.WalletConfigResponse;
import ch.admin.bag.covidcertificate.backend.config.shared.model.WalletConfigResponse;
import ch.ubique.openapi.docannotations.Documentation;
import org.springframework.http.CacheControl;
import org.springframework.http.ResponseEntity;
Expand Down
63 changes: 62 additions & 1 deletion .../test/java/ch/admin/bag/covidcertificate/backend/config/wallet/ws/BaseControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import static ch.admin.bag.covidcertificate.backend.config.shared.TestHelper.SECURITY_HEADERS;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
Expand All @@ -21,6 +22,7 @@
import ch.admin.bag.covidcertificate.backend.config.shared.TestHelper;
import ch.admin.bag.covidcertificate.backend.config.shared.model.ConfigResponse;
import ch.admin.bag.covidcertificate.backend.config.shared.model.Language;
import ch.admin.bag.covidcertificate.backend.config.shared.model.WalletConfigResponse;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.util.List;
Expand Down Expand Up @@ -112,6 +114,46 @@ public void testForUpdateNote() throws Exception {
ConfigAsserter.assertNoUpdate(resp);
}

@Test
public void testFeatureFlagsSet() throws Exception {
MockHttpServletResponse result =
mockMvc.perform(
get(BASE_URL + "/config")
.accept(acceptMediaType)
.header("accept", "application/json")
.param("osversion", "android9")
.param("appversion", "android-2.2.0")
.param("buildnr", "1622464850983"))
.andExpect(status().is2xxSuccessful())
.andReturn()
.getResponse();
WalletConfigResponse resp =
testHelper.toWalletConfigResponse(
result, acceptMediaType, TestHelper.PATH_TO_CA_PEM);
assertTrue(resp.getLightCertificateActive());
assertTrue(resp.getPdfGenerationActive());
}

@Test
public void testPdfFeatureDisabled() throws Exception {
MockHttpServletResponse result =
mockMvc.perform(
get(BASE_URL + "/config")
.accept(acceptMediaType)
.header("accept", "application/json")
.param("osversion", "android9")
.param("appversion", "android-2.1.0")
.param("buildnr", "1622464850983"))
.andExpect(status().is2xxSuccessful())
.andReturn()
.getResponse();
WalletConfigResponse resp =
testHelper.toWalletConfigResponse(
result, acceptMediaType, TestHelper.PATH_TO_CA_PEM);
assertTrue(resp.getLightCertificateActive());
assertFalse(resp.getPdfGenerationActive());
}

@Test
public void testNoForceUpdate() throws Exception {
MockHttpServletResponse result =
Expand All @@ -130,6 +172,24 @@ public void testNoForceUpdate() throws Exception {
ConfigAsserter.assertIsNoForceUpdate(resp);
}

@Test
public void testForceUpdate() throws Exception {
MockHttpServletResponse result =
mockMvc.perform(
get(BASE_URL + "/config")
.accept(acceptMediaType)
.header("accept", "application/json")
.param("osversion", "ios14.0")
.param("appversion", "ios-1.1.0")
.param("buildnr", "ios-2020.0145asdfa34"))
.andExpect(status().is2xxSuccessful())
.andReturn()
.getResponse();
ConfigResponse resp =
testHelper.toConfigResponse(result, acceptMediaType, TestHelper.PATH_TO_CA_PEM);
ConfigAsserter.assertIsForceUpdate(resp);
}

@Test
public void testFaqTexts() throws Exception {
MockHttpServletResponse result =
Expand Down Expand Up @@ -180,7 +240,8 @@ private void assertQuestions(ConfigResponse resp) {
assertEquals(faqEntryCount, expectedFaqEntryTitlesEn.size());

// true for those faq entries where a link is set
List<Boolean> isLinkSetList = List.of(false, false, false, true, false, false, false, false);
List<Boolean> isLinkSetList =
List.of(false, false, false, true, false, false, false, false);
assertEquals(faqEntryCount, isLinkSetList.size());

ConfigAsserter.assertFaq(
Expand Down

0 comments on commit b104639

Please sign in to comment.