github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1246 - Support use of application.yml and application-test.yml ... (as alternative to ebean.properties, test-ebean.properties)

Browse Source
This commit is contained in:
Rob Bygrave
2018-02-26 08:35:47 +13:00
parent 75462e7410
commit 8e9843ab8a
25 changed files with 788 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+4 -4
View File
@@ -5,14 +5,14 @@ import io.ebean.EbeanServer;
import io.ebean.EbeanServerFactory;
import io.ebean.Query;
import io.ebean.Transaction;
import io.ebean.config.PropertyMap;
import io.ebean.config.ServerConfig;
import org.tests.model.basic.UTDetail;
import org.tests.model.basic.UTMaster;
import io.ebean.config.properties.PropertiesLoader;
import org.avaje.datasource.DataSourceConfig;
import org.avaje.datasource.DataSourcePool;
import org.avaje.datasource.pool.ConnectionPool;
import org.junit.Test;
import org.tests.model.basic.UTDetail;
import org.tests.model.basic.UTMaster;
import java.sql.Connection;
import java.sql.SQLException;
@@ -27,7 +27,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
@Test
public void test() throws SQLException {
Properties properties = PropertyMap.defaultProperties();
Properties properties = PropertiesLoader.load();
DataSourceConfig dsConfig = new DataSourceConfig();
dsConfig.loadSettings(properties, "h2autocommit");//"h2autocommit","pg"