From 438631ac28e8dc98d043440edf2081732ee5cd37 Mon Sep 17 00:00:00 2001
From: Michael Schulte <65006436+mschulte-tsi@users.noreply.github.com>
Date: Fri, 21 May 2021 10:49:23 +0200
Subject: [PATCH] Fix/Sample Collection naming (#228)

Fixed Sample Collection naming (#228)
---
 .../ExternalTestStateController.java          |  2 +-
 .../verification/model/TestResult.java        |  2 +-
 .../VerificationApplicationExternalTest.java  | 32 ++++++++++---------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/main/java/app/coronawarn/verification/controller/ExternalTestStateController.java b/src/main/java/app/coronawarn/verification/controller/ExternalTestStateController.java
index ee9f8cea..95e2bd13 100644
--- a/src/main/java/app/coronawarn/verification/controller/ExternalTestStateController.java
+++ b/src/main/java/app/coronawarn/verification/controller/ExternalTestStateController.java
@@ -115,7 +115,7 @@ public DeferredResult<ResponseEntity<TestResult>> getTestState(
           stopWatch.stop();
           fakeDelayService.updateFakeTestRequestDelay(stopWatch.getTotalTimeMillis());
           deferredResult.setResult(ResponseEntity.ok(generateReturnTestResult(testResult.getTestResult(),fake,
-            testResult.getCs())));
+            testResult.getSc())));
           return deferredResult;
         case TELETAN:
           log.info("The result for registration token based on teleTAN will be returned.");
diff --git a/src/main/java/app/coronawarn/verification/model/TestResult.java b/src/main/java/app/coronawarn/verification/model/TestResult.java
index f0ce71b1..a5fb213b 100644
--- a/src/main/java/app/coronawarn/verification/model/TestResult.java
+++ b/src/main/java/app/coronawarn/verification/model/TestResult.java
@@ -49,7 +49,7 @@ public class TestResult {
   private int testResult;
 
   @NonNull
-  private long cs;
+  private long sc;
 
   @JsonInclude(JsonInclude.Include.NON_NULL)
   @Transient
diff --git a/src/test/java/app/coronawarn/verification/VerificationApplicationExternalTest.java b/src/test/java/app/coronawarn/verification/VerificationApplicationExternalTest.java
index 4b865fd9..f85e3963 100644
--- a/src/test/java/app/coronawarn/verification/VerificationApplicationExternalTest.java
+++ b/src/test/java/app/coronawarn/verification/VerificationApplicationExternalTest.java
@@ -21,12 +21,26 @@
 
 package app.coronawarn.verification;
 
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.doReturn;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import app.coronawarn.verification.config.VerificationApplicationConfig;
 import app.coronawarn.verification.domain.VerificationAppSession;
-import app.coronawarn.verification.model.*;
+import app.coronawarn.verification.model.AppSessionSourceOfTrust;
+import app.coronawarn.verification.model.HashedGuid;
+import app.coronawarn.verification.model.RegistrationToken;
+import app.coronawarn.verification.model.RegistrationTokenKeyType;
+import app.coronawarn.verification.model.RegistrationTokenRequest;
 import app.coronawarn.verification.repository.VerificationAppSessionRepository;
 import app.coronawarn.verification.service.TanService;
 import app.coronawarn.verification.service.TestResultServerService;
+import java.util.List;
+import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -43,17 +57,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import java.util.List;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.doReturn;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 /**
  * This is the test class for the verification application.
  */
@@ -509,7 +512,6 @@ public void callGetRegistrationTokenByAlreadyExistForGUID() throws Exception {
       .contentType(MediaType.APPLICATION_JSON)
       .content(TestUtils.getAsJsonFormat(request)))
       .andReturn();
-    ;
     mockMvc.perform(asyncDispatch(result))
       .andExpect(status().isBadRequest());
   }
@@ -560,7 +562,7 @@ public void callGetTestState() throws Exception {
       .andReturn()
       .getResponse()
       .getContentAsString()
-      .contains("cs");
+      .contains("sc");
   }
 
   /**
@@ -584,7 +586,7 @@ public void callGetTestStateWithFake() throws Exception {
       .andReturn()
       .getResponse()
       .getContentAsString()
-      .contains("cs");
+      .contains("sc");
   }
 
   /**