From 5f43228320c775eeeaf2a3b04f92b5efca4e75e3 Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Thu, 22 Aug 2024 11:45:22 +0200
Subject: [PATCH] cleanup

---
 .run/ImportHostingAssets.run.xml              | 33 +++++++++++++++++++
 .run/ImportOfficeData.run.xml                 |  4 +--
 .tc-environment                               |  2 ++
 .../hs/migration/ImportHostingAssets.java     |  3 +-
 src/test/resources/application.yml            |  4 +--
 5 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/.run/ImportHostingAssets.run.xml b/.run/ImportHostingAssets.run.xml
index bedd7143..2a7b71f6 100644
--- a/.run/ImportHostingAssets.run.xml
+++ b/.run/ImportHostingAssets.run.xml
@@ -33,4 +33,37 @@
     <RunAsTest>true</RunAsTest>
     <method v="2" />
   </configuration>
+  <configuration default="false" name="ImportHostingAssets" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="HSADMINNG_POSTGRES_ADMIN_USERNAME" value="admin" />
+          <entry key="HSADMINNG_POSTGRES_RESTRICTED_USERNAME" value="restricted" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":importHostingAssets" />
+          <option value="--tests" />
+          <option value="&quot;net.hostsharing.hsadminng.hs.migration.ImportHostingAssets&quot;" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <EXTENSION ID="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension">
+      <extension name="coverage" sample_coverage="false" />
+    </EXTENSION>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
+    <method v="2" />
+  </configuration>
 </component>
\ No newline at end of file
diff --git a/.run/ImportOfficeData.run.xml b/.run/ImportOfficeData.run.xml
index c796a3c3..c146186e 100644
--- a/.run/ImportOfficeData.run.xml
+++ b/.run/ImportOfficeData.run.xml
@@ -86,7 +86,7 @@
         <list>
           <option value=":importOfficeData" />
           <option value="--tests" />
-          <option value="&quot;net.hostsharing.hsadminng.hs.office.migration.ImportOfficeData&quot;" />
+          <option value="&quot;net.hostsharing.hsadminng.hs.migration.ImportOfficeData&quot;" />
         </list>
       </option>
       <option name="vmOptions" />
@@ -100,4 +100,4 @@
     <RunAsTest>true</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.tc-environment b/.tc-environment
index ac6348e6..4261068b 100644
--- a/.tc-environment
+++ b/.tc-environment
@@ -3,3 +3,5 @@ export HSADMINNG_POSTGRES_ADMIN_USERNAME=admin
 export HSADMINNG_POSTGRES_ADMIN_PASSWORD=
 export HSADMINNG_POSTGRES_RESTRICTED_USERNAME=restricted
 export HSADMINNG_MIGRATION_DATA_PATH=migration
+export LANG=de_DE.UTF-8
+export LANG=en_US.UTF-8
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java b/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
index 0f90aa15..4b7375f9 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
@@ -115,8 +115,7 @@ import static org.assertj.core.api.Assumptions.assumeThat;
  */
 @Tag("importHostingAssets")
 @DataJpaTest(properties = {
-         "spring.datasource.url=${HSADMINNG_POSTGRES_JDBC_URL:jdbc:tc:postgresql:15.5-bookworm:///importHostingAssetsTC}",
-//        "spring.datasource.url=jdbc:tc:postgresql:15.5-bookworm:///importHostingAssetsTC",
+        "spring.datasource.url=${HSADMINNG_POSTGRES_JDBC_URL:jdbc:tc:postgresql:15.5-bookworm:///importHostingAssetsTC}",
         "spring.datasource.username=${HSADMINNG_POSTGRES_ADMIN_USERNAME:ADMIN}",
         "spring.datasource.password=${HSADMINNG_POSTGRES_ADMIN_PASSWORD:password}",
         "hsadminng.superuser=${HSADMINNG_SUPERUSER:superuser-alex@hostsharing.net}"
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index 7ae587f3..7c3d2cff 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -30,5 +30,5 @@ spring:
 
 logging:
     level:
-        liquibase: INFO
-        net.ttddyy.dsproxy.listener: DEBUG
+        liquibase: WARN
+        net.ttddyy.dsproxy.listener: DEBUG # HOWTO: log meaningful SQL statements