mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
Merge remote-tracking branch 'upstream/master'
# Conflicts: # ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java # ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java
This commit is contained in:
commit
06cbb21a8a
29 files changed
+1525
-102
No files matched your search
@@ -1,34 +0,0 @@
|
||||
package io.ebean;
|
||||
|
||||
import io.ebean.xtest.BaseTestCase;
|
||||
import io.ebean.xtest.ForPlatform;
|
||||
import io.ebean.annotation.Platform;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.Properties;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
public class DbPrimaryTest extends BaseTestCase {
|
||||
|
||||
@Test
|
||||
public void testIsSkipPrimaryServer() {
|
||||
DbPrimary.setSkip(true);
|
||||
assertTrue(DbPrimary.isSkip());
|
||||
DbPrimary.setSkip(false);
|
||||
assertFalse(DbPrimary.isSkip());
|
||||
}
|
||||
|
||||
@Test
|
||||
@ForPlatform(Platform.H2)
|
||||
public void testGetPrimaryServerName() {
|
||||
String primaryServerName = DbPrimary.getDefaultServerName();
|
||||
assertEquals("h2", primaryServerName);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLoadProperties() {
|
||||
Properties properties = DbPrimary.getProperties();
|
||||
assertTrue(!properties.isEmpty());
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,6 @@ import io.ebean.OrderBy;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
|
||||
public class PropertyTest {
|
||||
|
||||
@Test
|
||||
|
||||
+5
-11
@@ -1,9 +1,9 @@
|
||||
package io.ebeaninternal.dbmigration;
|
||||
package io.ebean.xtest.dbmigration;
|
||||
|
||||
import io.ebean.Database;
|
||||
import io.ebean.DatabaseFactory;
|
||||
import io.ebean.config.DatabaseConfig;
|
||||
import org.assertj.core.api.Assertions;
|
||||
import io.ebean.dbmigration.DbMigration;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -25,28 +25,22 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
* @author Roland Praml, FOCONIS AG
|
||||
*
|
||||
*/
|
||||
public class DbMigrationDropHistoryTest {
|
||||
class DbMigrationDropHistoryTest {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(DbMigrationDropHistoryTest.class);
|
||||
|
||||
@Test
|
||||
public void invokeTest() throws IOException {
|
||||
void invokeTest() throws IOException {
|
||||
main(null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void lastVersion_no_v_Prefix() {
|
||||
File d = new File("src/test/resources/migrationtest-history/dbmigration");
|
||||
Assertions.assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.2");
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
|
||||
logger.info("start");
|
||||
// First, we clean up the output-directory
|
||||
Files.walk(Paths.get("src/test/resources/migrationtest-history"))
|
||||
.filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete);
|
||||
DefaultDbMigration migration = new DefaultDbMigration();
|
||||
DbMigration migration = DbMigration.create();
|
||||
|
||||
// We use src/test/resources as output directory (so we see in GIT if files will change)
|
||||
|
||||
+3
-2
@@ -1,4 +1,4 @@
|
||||
package io.ebeaninternal.dbmigration;
|
||||
package io.ebean.xtest.dbmigration;
|
||||
|
||||
import io.ebean.Database;
|
||||
import io.ebean.DatabaseFactory;
|
||||
@@ -6,6 +6,7 @@ import io.ebean.annotation.Platform;
|
||||
import io.ebean.config.DatabaseConfig;
|
||||
import io.ebeaninternal.api.DbOffline;
|
||||
|
||||
import io.ebean.dbmigration.DbMigration;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -55,7 +56,7 @@ public class DbMigrationGenerateTest {
|
||||
Files.walk(Paths.get(pathToResources, "migrationtest"))
|
||||
.filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete);
|
||||
|
||||
DefaultDbMigration migration = new DefaultDbMigration();
|
||||
DbMigration migration = DbMigration.create();
|
||||
migration.setIncludeIndex(true);
|
||||
// We use src/test/resources as output directory (so we see in GIT if files will change)
|
||||
migration.setPathToResources(pathToResources);
|
||||
+3
-13
@@ -1,19 +1,17 @@
|
||||
package io.ebeaninternal.dbmigration;
|
||||
package io.ebean.xtest.dbmigration;
|
||||
|
||||
import io.ebean.*;
|
||||
import io.ebean.xtest.BaseTestCase;
|
||||
import io.ebean.xtest.IgnorePlatform;
|
||||
import io.ebean.annotation.Platform;
|
||||
import io.ebean.config.DatabaseConfig;
|
||||
import io.ebean.config.dbplatform.DbHistorySupport;
|
||||
import io.ebean.datasource.pool.ConnectionPool;
|
||||
import io.ebean.xtest.BaseTestCase;
|
||||
import io.ebean.xtest.IgnorePlatform;
|
||||
import misc.migration.v1_0.ETable;
|
||||
import misc.migration.v1_1.EHistory;
|
||||
import misc.migration.v1_1.EHistory2;
|
||||
import org.assertj.core.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.sql.ResultSet;
|
||||
@@ -44,14 +42,6 @@ public class DbMigrationTest extends BaseTestCase {
|
||||
server().script().run(url);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void lastVersion() {
|
||||
File d = new File("src/test/resources/migrationtest/dbmigration/h2");
|
||||
Assertions.assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.4");
|
||||
assertThat(LastMigration.nextVersion(d, null, false)).isEqualTo("1.5");
|
||||
assertThat(LastMigration.nextVersion(d, null, true)).isEqualTo("1.4");
|
||||
}
|
||||
|
||||
@IgnorePlatform({
|
||||
// Yugabyte does not see column updates on table alters:
|
||||
// update table T set C = 'value'; alter table T alter column C set not null -> error column C has null values
|
||||
@@ -1,38 +0,0 @@
|
||||
package io.ebeaninternal.server.changelog;
|
||||
|
||||
import io.ebean.xtest.BaseTestCase;
|
||||
import io.ebean.event.changelog.BeanChange;
|
||||
import io.ebean.event.changelog.ChangeSet;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.StringWriter;
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
|
||||
public class ChangeJsonBuilderTest extends BaseTestCase {
|
||||
|
||||
Helper helper = new Helper();
|
||||
|
||||
@Test
|
||||
public void testToJson() throws Exception {
|
||||
|
||||
ChangeJsonBuilder builder = new ChangeJsonBuilder();
|
||||
|
||||
ChangeSet changeSet = helper.createChangeSet("ABCD", 10);
|
||||
changeSet.getUserContext().put("altUser", "role user");
|
||||
|
||||
List<BeanChange> changes = changeSet.getChanges();
|
||||
for (int i = 0; i < changes.size(); i++) {
|
||||
StringWriter buffer = new StringWriter();
|
||||
builder.writeBeanJson(buffer, changes.get(i), changeSet);
|
||||
|
||||
assertThat(buffer.toString()).contains("\"source\"");
|
||||
assertThat(buffer.toString()).contains("\"userId\"");
|
||||
assertThat(buffer.toString()).contains("\"userIpAddress\"");
|
||||
assertThat(buffer.toString()).contains("\"userContext\"");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
package io.ebeaninternal.server.changelog;
|
||||
|
||||
import io.ebean.xtest.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.Database;
|
||||
import io.ebean.event.changelog.ChangeSet;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
public class DefaultChangeLogListenerTest extends BaseTestCase {
|
||||
|
||||
Helper helper = new Helper();
|
||||
|
||||
@Test
|
||||
public void test() {
|
||||
|
||||
DefaultChangeLogListener changeLogListener = new DefaultChangeLogListener();
|
||||
|
||||
Database defaultServer = DB.getDefault();
|
||||
changeLogListener.configure(defaultServer.pluginApi());
|
||||
|
||||
ChangeSet changeSet = helper.createChangeSet("INT-001", 13);
|
||||
|
||||
changeLogListener.log(changeSet);
|
||||
}
|
||||
|
||||
}
|
||||
-74
@@ -1,74 +0,0 @@
|
||||
package io.ebeaninternal.server.changelog;
|
||||
|
||||
import io.ebean.xtest.BaseTestCase;
|
||||
import io.ebean.event.changelog.ChangeLogFilter;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.inheritance.model.ProductConfiguration;
|
||||
import org.tests.model.basic.Address;
|
||||
import org.tests.model.basic.Contact;
|
||||
import org.tests.model.basic.Country;
|
||||
import org.tests.model.basic.Customer;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
public class DefaultChangeLogRegisterTest extends BaseTestCase {
|
||||
|
||||
|
||||
@Test
|
||||
public void test_defaultInsertTrue() {
|
||||
|
||||
DefaultChangeLogRegister register = new DefaultChangeLogRegister(true);
|
||||
|
||||
assertNull(register.getChangeFilter(Address.class));
|
||||
|
||||
ChangeLogFilter changeFilter = register.getChangeFilter(Customer.class);
|
||||
DefaultChangeLogRegister.UpdateFilter updateFilter = (DefaultChangeLogRegister.UpdateFilter) changeFilter;
|
||||
assertFalse(updateFilter.includeInserts);
|
||||
assertThat(updateFilter.updateProperties).containsExactly("name", "status");
|
||||
|
||||
changeFilter = register.getChangeFilter(Country.class);
|
||||
DefaultChangeLogRegister.BasicFilter countryFilter = (DefaultChangeLogRegister.BasicFilter) changeFilter;
|
||||
assertTrue(countryFilter.includeInserts);
|
||||
|
||||
// use default setting
|
||||
changeFilter = register.getChangeFilter(Contact.class);
|
||||
DefaultChangeLogRegister.BasicFilter contactFilter = (DefaultChangeLogRegister.BasicFilter) changeFilter;
|
||||
assertTrue(contactFilter.includeInserts);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_defaultInsertFalse() {
|
||||
|
||||
DefaultChangeLogRegister register = new DefaultChangeLogRegister(false);
|
||||
|
||||
assertNull(register.getChangeFilter(Address.class));
|
||||
|
||||
ChangeLogFilter changeFilter = register.getChangeFilter(Customer.class);
|
||||
DefaultChangeLogRegister.UpdateFilter updateFilter = (DefaultChangeLogRegister.UpdateFilter) changeFilter;
|
||||
assertFalse(updateFilter.includeInserts);
|
||||
assertThat(updateFilter.updateProperties).containsExactly("name", "status");
|
||||
|
||||
changeFilter = register.getChangeFilter(Country.class);
|
||||
DefaultChangeLogRegister.BasicFilter countryFilter = (DefaultChangeLogRegister.BasicFilter) changeFilter;
|
||||
assertTrue(countryFilter.includeInserts);
|
||||
|
||||
// use default setting
|
||||
changeFilter = register.getChangeFilter(Contact.class);
|
||||
DefaultChangeLogRegister.BasicFilter contactFilter = (DefaultChangeLogRegister.BasicFilter) changeFilter;
|
||||
assertFalse(contactFilter.includeInserts);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_inheritance() {
|
||||
|
||||
DefaultChangeLogRegister register = new DefaultChangeLogRegister(true);
|
||||
ChangeLogFilter changeFilter = register.getChangeFilter(ProductConfiguration.class);
|
||||
assertNotNull(changeFilter);
|
||||
DefaultChangeLogRegister.BasicFilter basicFilter = (DefaultChangeLogRegister.BasicFilter) changeFilter;
|
||||
assertTrue(basicFilter.includeInserts);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
package io.ebeaninternal.server.changelog;
|
||||
|
||||
import io.ebean.event.changelog.BeanChange;
|
||||
import io.ebean.event.changelog.ChangeSet;
|
||||
import io.ebean.event.changelog.ChangeType;
|
||||
import io.ebean.event.changelog.TxnState;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class Helper {
|
||||
|
||||
public ChangeSet createChangeSet(String txnId, long startId) {
|
||||
|
||||
ChangeSet cs = new ChangeSet();
|
||||
cs.setTxnId(txnId);
|
||||
cs.setTxnState(TxnState.COMMITTED);
|
||||
cs.setTxnBatch(0);
|
||||
cs.setSource("myApp");
|
||||
cs.setUserId("user234");
|
||||
cs.setUserIpAddress("123.4.5.6");
|
||||
cs.getUserContext().put("someKey", "user defined input");
|
||||
|
||||
List<BeanChange> changes = cs.getChanges();
|
||||
|
||||
changes.add(createInsert(startId));
|
||||
changes.add(createUpdate(startId));
|
||||
changes.add(createDelete(startId));
|
||||
|
||||
return cs;
|
||||
}
|
||||
|
||||
private BeanChange createInsert(long startId) {
|
||||
|
||||
Map<String, Object> values = new LinkedHashMap<>();
|
||||
values.put("name", "rob");
|
||||
values.put("modified", new Timestamp(System.currentTimeMillis()));
|
||||
|
||||
Map<String, Object> oldValues = new LinkedHashMap<>();
|
||||
oldValues.put("name", "rob");
|
||||
oldValues.put("modified", new Timestamp(System.currentTimeMillis() - 100000));
|
||||
|
||||
return new BeanChange("mytable", null, startId + 1, ChangeType.INSERT, "");//values, oldValues);
|
||||
}
|
||||
|
||||
private BeanChange createUpdate(long startId) {
|
||||
Map<String, Object> values = new LinkedHashMap<>();
|
||||
values.put("name", "jim");
|
||||
values.put("nowHasVal", "wasNull");
|
||||
values.put("nowNull", null);
|
||||
values.put("modified", new Timestamp(System.currentTimeMillis()));
|
||||
|
||||
|
||||
Map<String, Object> oldValues = new LinkedHashMap<>();
|
||||
oldValues.put("name", "steve");
|
||||
oldValues.put("nowHasVal", null);
|
||||
oldValues.put("nowNull", "hadVal");
|
||||
oldValues.put("modified", new Timestamp(System.currentTimeMillis() - 100000));
|
||||
|
||||
|
||||
return new BeanChange("mytable", null, startId + 2, ChangeType.UPDATE, "");//values, oldValues);
|
||||
}
|
||||
|
||||
private BeanChange createDelete(long startId) {
|
||||
return new BeanChange("mytable", null, startId + 3, ChangeType.DELETE, null);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user