Publish Release 1.4.1

Automerge Pull-Request for Release 1.4.1

.gitignore

@@ -29,7 +29,7 @@ src/test/resources/templates/FeatureFiles/TI-M_11X/ZusatztestsOrgOnly/
 src/test/resources/templates/FeatureFiles/TI-M_11X/Zusatztests/
 src/test/resources/templates/FeatureFiles/TI-M_Abwaertskompatibilitaet_vs11X/
 src/test/resources/templates/FeatureFiles/TIM_V2/
-src/test/resources/templates/Spielwiese
+src/test/resources/templates/Spielwiese/
 
 
 .owaspignore

ReleaseNotes.md

@@ -2,15 +2,26 @@
 
 # Release notes
 
-## Link to TI-Messenger-testsuite [`docu`](https://github.com/gematik/TI-Messenger-Testsuite/tree/main/doc/userguide/Testsuite.adoc#docu)
+## Link to TI-Messenger-testsuite [
+
+`docu`](https://github.com/gematik/TI-Messenger-Testsuite/tree/main/doc/userguide/Testsuite.adoc#docu)
+
+## Release 1.4.1
+
+### Changes
+
+- adds functionality for add and delete domains in block/allow lists
+- API change, breaking only ePa: renames deleteBlockedDomain to deleteBlockedUserDomain for consistency
 
 ## Release 1.4.0
 
 ### Changes
 
 - adds 400 Bad Request responses for test driver api
-- Adjustment for 03_AenderungEinesHealthcareService.json - Only one day of availableTime due to VZD change
-- API breaking change: renames FhirAvailableTimes to FhirAvailableTime and adjusts description and example to reflect
+- Adjustment for 03_AenderungEinesHealthcareService.json - Only one day of availableTime due to VZD
+  change
+- API breaking change: renames FhirAvailableTimes to FhirAvailableTime and adjusts description and
+  example to reflect
   VZD update to profile 0.11.18
 
 ### Bugs
@@ -24,7 +35,8 @@
 
 - Two unused endpoints were removed from the test driver API: getLocations, getLocation
 - Adjusts the blockedUsers and allowedUsers endpoints to allow code generation
-- Three unused endpoints were removed from the test driver API: createLocation, updateLocation, deleteLocation
+- Three unused endpoints were removed from the test driver API: createLocation, updateLocation,
+  deleteLocation
 
 ### Bugs
 
@@ -336,7 +348,8 @@
 - HttpTimout for serentiy set to 5 minutes. Can be configured by -DhttpTimeout=\<seconds>
 - If a claim device fails, the testsuite will retry to claim up to 3 times (configurable via
   environment
-  variable <maxRetryClaimRequest> [`read more (Parameter die das Verhalten der Testsuite anpassen)`](doc/userguide/GettingStarted.adoc)
+  variable <maxRetryClaimRequest> [
+  `read more (Parameter die das Verhalten der Testsuite anpassen)`](doc/userguide/GettingStarted.adoc)
 
 ### Bugfixes
 

doc/userguide/GettingStarted.adoc

@@ -198,6 +198,52 @@ From must start with http:// and match the value in link:{sourcedir}/test/resour
 Make sure that the specified URL ends with a trailing '/', otherwise the connection will fail.
 <3> Additional resources in the path must be specified.
 
+=== Correct Completion of the Metadata for the Interface
+
+IMPORTANT: Please ensure that the interface metadata is populated with all
+required parameters accurately.
+
+One of these parameters is the information interface, which requires the
+OS information. This parameter must be filled with the corresponding
+operating system. This applies equally to both the TI-M client interface
+(`clientInfo`) and the organization admin interface (`fachdienstInfo`).
+
+For the TI-M client interface, the operating system must be differentiated between:
+
+-   Mobile clients (e.g., Android, iOS)
+-   Native clients (e.g., Windows, macOS)
+-   Web clients (e.g., Linux Server, Windows Server)
+
+The same applies to the organization admin interface. If it is
+integrated into a TI-M client (e.g., within a native app), the operating
+system should be specified similarly to TI-M clients (e.g., Windows, macOS).
+
+Client interface example:
+----
+"clientInfo": {
+        "osInfo": {
+            "operatingSystem": "Android",
+            "version": "10"
+        }
+    }
+----
+Organisation admin interface example:
+----
+"fachdienstInfo": {
+        "osInfo": {
+            "operatingSystem": "LinuxServer",
+            "version": "5.15"
+        }
+    }
+----
+Please ensure that all required parameters are filled in, not just the `osInfo` field!
+
+Additionally, this parameter must also be populated when using the same codebase for
+multiple products requiring approval. It must align with the information
+provided in the submitted application for approval documents.
+
+Example: In the application for approval: TI-M Client Android -> `"operatingSystem": "Android"`.
+
 === Starting the test cases
 
 The test suite executes the tests as Maven integration tests.

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>de.gematik.tim.test</groupId>
   <artifactId>TI-Messenger-Testsuite</artifactId>
-  <version>1.4.0</version>
+  <version>1.4.1</version>
   <packaging>jar</packaging>
   <name>TI-Messenger-Testsuite</name>
   <description>Testsuite to check functionality of TI-Messenger-Clients</description>
@@ -749,7 +749,7 @@
               </execution>
             </executions>
             <configuration>
-              <generateGitPropertiesFile>false</generateGitPropertiesFile>
+              <generateGitPropertiesFile>true</generateGitPropertiesFile>
               <includeOnlyProperties>
                 <includeOnlyProperty>^git.branch</includeOnlyProperty>
               </includeOnlyProperties>
@@ -820,6 +820,19 @@
                   </target>
                 </configuration>
               </execution>
+              <execution>
+                <id>move-git-properties</id>
+                <phase>initialize</phase>
+                <configuration>
+                  <target>
+                    <copy file="${project.build.directory}/classes/git.properties"
+                          todir="${project.build.directory}/ti-m-testdriversim"/>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
               <execution>
                 <id>move_simulator_jar</id>
                 <phase>pre-integration-test</phase>
@@ -916,7 +929,7 @@
                   <executable>cp</executable>
                   <arguments>
                     <argument>-a</argument>
-                    <argument>${project.build.directory}/site/serenity/</argument>
+                    <argument>${project.build.directory}/site/serenity/.</argument>
                     <argument>${basedir}/reports/${build.time}/report/</argument>
                   </arguments>
                 </configuration>
@@ -1037,7 +1050,7 @@
                   <executable>cp</executable>
                   <arguments>
                     <argument>-a</argument>
-                    <argument>${project.build.directory}/site/serenity/</argument>
+                    <argument>${project.build.directory}/site/serenity/.</argument>
                     <argument>${basedir}/reports/${build.time}/report/</argument>
                   </arguments>
                 </configuration>
@@ -1113,7 +1126,7 @@
                   <executable>cp</executable>
                   <arguments>
                     <argument>-a</argument>
-                    <argument>${project.build.directory}/site/serenity/</argument>
+                    <argument>${project.build.directory}/site/serenity/.</argument>
                     <argument>${basedir}/reports/${build.time}/report/</argument>
                   </arguments>
                 </configuration>

src/main/java/de/gematik/tim/test/glue/api/GeneralStepsGlue.java

@@ -24,7 +24,6 @@
 import de.gematik.tim.test.glue.api.utils.TestcasePropertiesManager;
 import io.cucumber.java.de.Dann;
 import io.cucumber.java.en.Then;
-import org.springframework.http.HttpStatus;
 
 public class GeneralStepsGlue {
 
@@ -41,10 +40,4 @@ public static void checkResponseCode(String actorName, int responseCode) {
       }
     }
   }
-
-  public static void checkResponseCode() {
-    if (!HttpStatus.valueOf(lastResponse().statusCode()).is2xxSuccessful()) {
-      throw new TestRunException("Operation returned error code " + lastResponse().statusCode());
-    }
-  }
 }

src/main/java/de/gematik/tim/test/glue/api/TestdriverApiEndpoint.java

@@ -22,6 +22,7 @@
 import static de.gematik.tim.test.glue.api.TestdriverApiEndpoint.HttpMethod.PUT;
 import static de.gematik.tim.test.glue.api.TestdriverApiPath.ACCOUNT_PATH;
 import static de.gematik.tim.test.glue.api.TestdriverApiPath.ALLOWED_USERS_PATH;
+import static de.gematik.tim.test.glue.api.TestdriverApiPath.AUTHENTICATED_MEDIA_DOWNLOAD_PATH;
 import static de.gematik.tim.test.glue.api.TestdriverApiPath.AUTHORIZATION_PATH;
 import static de.gematik.tim.test.glue.api.TestdriverApiPath.BLOCKED_USERS_PATH;
 import static de.gematik.tim.test.glue.api.TestdriverApiPath.CLAIM_DEVICE_PATH;
@@ -179,6 +180,7 @@ public enum TestdriverApiEndpoint {
   // MEDIA
   UPLOAD_MEDIA(POST, MEDIA_PATH, UseDeviceAbility.class),
   DOWNLOAD_MEDIA(GET, MEDIA_DOWNLOAD_PATH, UseDeviceAbility.class),
+  DOWNLOAD_AUTHENTICATED_MEDIA(GET, AUTHENTICATED_MEDIA_DOWNLOAD_PATH, UseDeviceAbility.class),
 
   // CONTACT-MANAGEMENT
   GET_CONTACT(GET, CONTACT_PATH, UseDeviceAbility.class),
@@ -191,6 +193,10 @@ public enum TestdriverApiEndpoint {
 
   ADD_BLOCKED_USERS(POST, BLOCKED_USERS_PATH, UseDeviceAbility.class),
   ADD_ALLOWED_USERS(POST, ALLOWED_USERS_PATH, UseDeviceAbility.class),
+  ADD_ALLOWED_DOMAINS(POST, ALLOWED_USERS_PATH, UseDeviceAbility.class),
+  ADD_BLOCKED_DOMAINS(POST, BLOCKED_USERS_PATH, UseDeviceAbility.class),
+  DELETE_ALLOWED_DOMAINS(DELETE, ALLOWED_USERS_PATH, UseDeviceAbility.class),
+  DELETE_BLOCKED_DOMAINS(DELETE, BLOCKED_USERS_PATH, UseDeviceAbility.class),
   DELETE_BLOCKED_USERS(DELETE, BLOCKED_USERS_PATH, UseDeviceAbility.class),
   DELETE_ALLOWED_USERS(DELETE, ALLOWED_USERS_PATH, UseDeviceAbility.class);
 

src/main/java/de/gematik/tim/test/glue/api/TestdriverApiPath.java

@@ -101,10 +101,12 @@ public final class TestdriverApiPath {
 
   // MEDIA
   public static final String MEDIA_PATH = DEVICE_ID_PATH + "/media";
-
   public static final String MEDIA_DOWNLOAD_PATH =
       MEDIA_PATH + "/" + PATH_VARIABLE.formatted(MEDIA_ID_VARIABLE);
 
+  public static final String AUTHENTICATED_MEDIA_DOWNLOAD_PATH =
+      MEDIA_PATH + "/authenticated/" + PATH_VARIABLE.formatted(MEDIA_ID_VARIABLE);
+
   // AUTHORIZATION
   public static final String AUTHORIZATION_PATH = DEVICE_ID_PATH + "/authorizationMode";
   public static final String BLOCKED_USERS_PATH = DEVICE_ID_PATH + "/blockedUsers";