Refactor properties bootup, remove GlobalProperties and allow ServerConfig.loadFromProperties()

This commit is contained in:
rbygrave
2014-11-30 17:08:02 +13:00
parent fe65a0ccb9
commit 370267ab6f
105 changed files with 3772 additions and 3963 deletions
@@ -1,17 +1,15 @@
package com.avaje.tests.compositekeys;
import java.util.ArrayList;
import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.Query;
import com.avaje.ebean.config.GlobalProperties;
import com.avaje.tests.model.composite.ROrder;
import com.avaje.tests.model.composite.ROrderPK;
import org.junit.Assert;
import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
public class TestCKeyIdInExpression extends BaseTestCase {
@@ -21,9 +19,9 @@ public class TestCKeyIdInExpression extends BaseTestCase {
}
// public void testRunManually() {
//@Test
public void notRanAutomatically() {
GlobalProperties.put("datasource.default", "");
EbeanServer server = CreateIdExpandedFormServer.create();
ROrderPK k0 = new ROrderPK("compa", 100);