From cdb319f0ef09d22f4d354ad7202ad6d492f87f67 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 23 Nov 2016 23:30:23 +1300
Subject: [PATCH] #885 - `DbMigrationConfig.loadSettings` config has wrong

---
 .../ebean/config/DbMigrationConfigTest.java   | 52 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java b/src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java
index b99c28fa9..d6b15e196 100644
--- a/src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java
+++ b/src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java
@@ -2,12 +2,14 @@ package com.avaje.ebean.config;
 
 import org.junit.Test;
 
+import java.util.Properties;
+
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
 
 
 public class DbMigrationConfigTest {
 
-
   @Test
   public void testLoad() {
 
@@ -20,4 +22,52 @@ public class DbMigrationConfigTest {
 
     assertThat(migrationConfig.getMigrationPath()).isEqualTo("dbmigration/myapp");
   }
+
+  @Test
+  public void loadProperties_migration() {
+
+    Properties properties = new Properties();
+    properties.setProperty("ebean.migration.dbusername", "banana");
+    properties.setProperty("ebean.migration.dbpassword", "apple");
+
+    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties);
+
+    DbMigrationConfig migrationConfig = new DbMigrationConfig();
+    migrationConfig.loadSettings(wrapper, "db");
+
+    assertEquals(migrationConfig.getDbUsername(),"banana");
+    assertEquals(migrationConfig.getDbPassword(),"apple");
+  }
+
+  @Test
+  public void loadProperties_datasource() {
+
+    Properties properties = new Properties();
+    properties.setProperty("datasource.db.username", "banana");
+    properties.setProperty("datasource.db.password", "apple");
+
+    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties);
+
+    DbMigrationConfig migrationConfig = new DbMigrationConfig();
+    migrationConfig.loadSettings(wrapper, "db");
+
+    assertEquals(migrationConfig.getDbUsername(),"banana");
+    assertEquals(migrationConfig.getDbPassword(),"apple");
+  }
+
+  @Test
+  public void loadProperties_datasource_adminusername() {
+
+    Properties properties = new Properties();
+    properties.setProperty("datasource.db.adminusername", "banana");
+    properties.setProperty("datasource.db.adminpassword", "apple");
+
+    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties);
+
+    DbMigrationConfig migrationConfig = new DbMigrationConfig();
+    migrationConfig.loadSettings(wrapper, "db");
+
+    assertEquals(migrationConfig.getDbUsername(),"banana");
+    assertEquals(migrationConfig.getDbPassword(),"apple");
+  }
 }