From 99bb55efa0fb2636731447a2d75cbe5c16934ed0 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 20 Jan 2021 17:22:00 +1300
Subject: [PATCH] No change - update ebean-test test configuration only for
 windows

---
 .../src/test/resources/application-test.yaml  | 62 ++-----------------
 .../src/test/resources/docker-run.properties  | 21 -------
 2 files changed, 5 insertions(+), 78 deletions(-)
 delete mode 100644 ebean-test/src/test/resources/docker-run.properties

diff --git a/ebean-test/src/test/resources/application-test.yaml b/ebean-test/src/test/resources/application-test.yaml
index 89eb92456..7ad9e2dd5 100644
--- a/ebean-test/src/test/resources/application-test.yaml
+++ b/ebean-test/src/test/resources/application-test.yaml
@@ -1,22 +1,18 @@
 datasource:
   db:
     username: sa
-    password:
+    password: sa
     databaseUrl: jdbc:h2:mem:tests
 
   pg:
     username: sa
-    password:
+    password: sa
     databaseUrl: jdbc:h2:mem:tests
 
 ebean:
-#  migration:
-#    run: false
-#
-#  ddl:
-#    generate: true
-#    run: true
-##    createOnly: true
+  ddl:
+    generate: true
+    run: true
 
   docstore:
     url: http://127.0.0.1:9200
@@ -26,57 +22,9 @@ ebean:
 #    useDocker: true
     elasticVersion: 5.6
 
-#    create: true
-
   test:
     redis: latest
     platform: mariadb #, postgres, mysql, mariadb, oracle, sqlserver, hana
 #    useDocker: false
-#    dockerMode: dropCreate
     ddlMode: dropCreate # none | dropCreate | create | migrations
     dbName: junk
-    postgres:
-      version: 9.6
-      extensions: pgcryto, hstore
-      username: asd
-      password: test
-      url: asd
-      driver: asd
-
-
-
-docker:
-  postgres:
-#    port: 6432
-    version: 9.6
-    extensions: pgcryto, hstore
-    username: ${test_db}
-    password: test
-    databaseUrl: jdbc:postgresql://localhost:6432/${test_db}
-    databaseDriver: org.postgresql.Driver
-
-  mysql:
-    version: 5.6
-    username: ${test_db}
-    password: test
-    databaseUrl: jdbc:mysql://localhost:4306/${test_db}
-    databaseDriver: com.mysql.jdbc.Driver
-
-  sqlserver:
-    version: 2017-CE
-    username: ${test_db}
-    password: SqlS3rv#r
-    databaseUrl: jdbc:sqlserver://localhost:1433;databaseName=${test_db}
-    databaseDriver: com.microsoft.sqlserver.jdbc.SQLServerDriver
-
-  oracle:
-    username: ${test_db}
-    password: test
-    databaseUrl: jdbc:oracle:thin:@127.0.0.1:1521:XE
-    databaseDriver: oracle.jdbc.driver.OracleDriver
-
-  hana:
-    username: ${test_db}
-    password: HXEHana1
-    databaseUrl: jdbc:sap://localhost:39017/?databaseName=HXE
-    databaseDriver: com.sap.db.jdbc.Driver
diff --git a/ebean-test/src/test/resources/docker-run.properties b/ebean-test/src/test/resources/docker-run.properties
deleted file mode 100644
index 275a4c76e..000000000
--- a/ebean-test/src/test/resources/docker-run.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-postgres.version=9.6
-postgres.dbName=test_db
-postgres.dbUser=test_user
-postgres.dbPassword=test
-postgres.dbExtensions=hstore,pgcrypto
-
-
-sqlserver.version=2017-CU2
-#sqlserver.port=1433
-#sqlserver.dbName=test_db
-#sqlserver.dbUser=test_user
-#sqlserver.dbPassword=SqlS3rv#r
-
-
-hana.version=2.00.033.00.20180925.2
-hana.port=39117
-hana.instanceNumber=91
-hana.passwordsUrl=file:///hana/mounts/passwords.json
-hana.mountsDirectory=/data/dockermounts
-# agree to the SAP license (https://www.sap.com/docs/download/cmp/2016/06/sap-hana-express-dev-agmt-and-exhibit.pdf)
-hana.agreeToSapLicense=false
\ No newline at end of file