mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
Merge pull request #2361 from ebean-orm/feature/move-tests-to-ebean-test
Refactor move tests from ebean-core to ebean-test
This commit is contained in:
Rob Bygrave
+7
-7
@@ -60,13 +60,13 @@
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.ebean</groupId>
|
||||
<artifactId>ebean-ddl-generator</artifactId>
|
||||
<!-- <version>12.11.3</version>-->
|
||||
<version>12.11.4A</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>io.ebean</groupId>-->
|
||||
<!-- <artifactId>ebean-ddl-generator</artifactId>-->
|
||||
<!--<!– <version>12.11.3</version>–>-->
|
||||
<!-- <version>12.11.4A</version>-->
|
||||
<!-- <scope>test</scope>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<!-- test scope for supporting ebean-ddl-generator -->
|
||||
<dependency>
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
agent-use-only: true
|
||||
profile-location: true
|
||||
entity-packages: org,misc
|
||||
transactional-packages: org
|
||||
querybean-packages: none
|
||||
synthetic: true
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
<configuration scan="true" scanPeriod="10 seconds">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||
<level>TRACE</level>
|
||||
</filter>
|
||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="APPLICATION" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<File>target/log/application.log</File>
|
||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||
<level>TRACE</level>
|
||||
</filter>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<FileNamePattern>log/application.log.%d{yyyy-MM-dd}</FileNamePattern>
|
||||
<MaxHistory>90</MaxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="READAUDIT_QUERY_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<File>target/log/readAuditQuery.log</File>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<FileNamePattern>log/readAuditQuery.log.%d{yyyy-MM-dd}</FileNamePattern>
|
||||
<MaxHistory>90</MaxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||
<pattern>%d{HH:mm:ss.SSS} %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="READAUDIT_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<File>target/log/readAudit.log</File>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<FileNamePattern>log/readAudit.log.%d{yyyy-MM-dd}</FileNamePattern>
|
||||
<MaxHistory>90</MaxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||
<pattern>%d{HH:mm:ss.SSS} %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<appender name="CHANGE_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<File>target/log/change-log.log</File>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<FileNamePattern>log/changeLog.log.%d{yyyy-MM-dd}</FileNamePattern>
|
||||
<MaxHistory>90</MaxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||
<pattern>%d{HH:mm:ss.SSS} %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<logger name="io.ebean.ReadAuditQuery" level="TRACE" additivity="false">
|
||||
<appender-ref ref="READAUDIT_QUERY_LOG"/>
|
||||
</logger>
|
||||
|
||||
<logger name="io.ebean.ReadAudit" level="TRACE" additivity="false">
|
||||
<appender-ref ref="READAUDIT_LOG"/>
|
||||
</logger>
|
||||
|
||||
<logger name="io.ebean.ChangeLog" level="TRACE" additivity="false">
|
||||
<appender-ref ref="CHANGE_LOG"/>
|
||||
</logger>
|
||||
|
||||
<root level="WARN">
|
||||
<appender-ref ref="APPLICATION"/>
|
||||
<appender-ref ref="STDOUT"/>
|
||||
</root>
|
||||
|
||||
|
||||
<logger name="org.tests" level="INFO"/>
|
||||
<logger name="io.ebean" level="INFO"/>
|
||||
|
||||
<logger name="io.ebean.docker" level="TRACE"/>
|
||||
<!-- <logger name="io.ebean.DDL" level="DEBUG"/>-->
|
||||
|
||||
<!-- <logger name="io.ebean.SQL" level="TRACE"/>-->
|
||||
<!-- <logger name="io.ebean.TXN" level="TRACE"/>-->
|
||||
<!-- <logger name="io.ebean.SUM" level="TRACE"/>-->
|
||||
|
||||
<!-- <logger name="io.ebean.cache" level="TRACE"/>-->
|
||||
<!-- <logger name="io.ebean.cache.REGION" level="TRACE"/>-->
|
||||
<!-- <logger name="io.ebean.cache.TABLEMOD" level="TRACE"/>-->
|
||||
|
||||
<!-- <logger name="io.ebean.cache.QUERY" level="TRACE"/>-->
|
||||
<!-- <logger name="io.ebean.cache.BEAN" level="TRACE"/>-->
|
||||
<!-- <logger name="io.ebean.cache.NATKEY" level="TRACE"/>-->
|
||||
<!-- <logger name="io.ebean.cache.COLL" level="TRACE"/>-->
|
||||
|
||||
<logger name="io.ebeaninternal.server.lib" level="TRACE"/>
|
||||
|
||||
<!--<logger name="io.ebeaninternal.server.autotune" level="TRACE"/>-->
|
||||
|
||||
<!--<logger name="io.ebean.ChangeLog" level="INFO"/>-->
|
||||
|
||||
</configuration>
|
||||
+66
-2
@@ -76,11 +76,75 @@
|
||||
<dependency>
|
||||
<groupId>com.h2database</groupId>
|
||||
<artifactId>h2</artifactId>
|
||||
<version>1.4.200</version>
|
||||
<version>1.4.199</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Test dependencies -->
|
||||
|
||||
<dependency>
|
||||
<groupId>io.avaje</groupId>
|
||||
<artifactId>avaje-jsr305</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.ebean</groupId>
|
||||
<artifactId>ebean-migration</artifactId>
|
||||
<version>12.4.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.avaje</groupId>
|
||||
<artifactId>mod-uuid</artifactId>
|
||||
<version>1.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.transaction</groupId>
|
||||
<artifactId>jta</artifactId>
|
||||
<version>1.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- validation annotations Size etc -->
|
||||
<dependency>
|
||||
<groupId>javax.validation</groupId>
|
||||
<artifactId>validation-api</artifactId>
|
||||
<version>1.1.0.Final</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>jakarta.validation</groupId>
|
||||
<artifactId>jakarta.validation-api</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>joda-time</groupId>
|
||||
<artifactId>joda-time</artifactId>
|
||||
<version>2.9.7</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
<artifactId>javax.annotation-api</artifactId>
|
||||
<version>1.3.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-io</groupId>
|
||||
<artifactId>commons-io</artifactId>
|
||||
<version>2.7</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
@@ -143,7 +207,7 @@
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<tiles>
|
||||
<tile>io.ebean.tile:enhancement:12.6.0</tile>
|
||||
<tile>io.ebean.tile:enhancement:12.11.3</tile>
|
||||
</tiles>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
@@ -3,7 +3,7 @@ package io.ebean.test;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import io.ebean.DB;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.test.BSimpleWithGen;
|
||||
import org.etest.BSimpleFor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -16,9 +16,9 @@ public class DbJsonTest {
|
||||
@Test
|
||||
public void of() {
|
||||
|
||||
DB.find(BSimpleWithGen.class).delete();
|
||||
DB.find(BSimpleFor.class).delete();
|
||||
|
||||
BSimpleWithGen bean = new BSimpleWithGen("something");
|
||||
BSimpleFor bean = new BSimpleFor("something");
|
||||
DB.save(bean);
|
||||
|
||||
assertThat(bean.getVersion()).isEqualTo(1);
|
||||
@@ -29,10 +29,10 @@ public class DbJsonTest {
|
||||
.assertContentMatches("/bean/example-bean.json");
|
||||
|
||||
|
||||
BSimpleWithGen bean2 = new BSimpleWithGen("other");
|
||||
BSimpleFor bean2 = new BSimpleFor("other");
|
||||
DB.save(bean2);
|
||||
|
||||
final List<BSimpleWithGen> beans = DB.find(BSimpleWithGen.class).findList();
|
||||
final List<BSimpleFor> beans = DB.find(BSimpleFor.class).findList();
|
||||
|
||||
DbJson.of(beans)
|
||||
//.withPlaceholder("_")
|
||||
@@ -43,10 +43,10 @@ public class DbJsonTest {
|
||||
@Test
|
||||
public void assertContains_pass() {
|
||||
|
||||
BSimpleWithGen bean = new BSimpleWithGen("something-contains-me", "YeahNah");
|
||||
BSimpleFor bean = new BSimpleFor("something-contains-me", "YeahNah");
|
||||
DB.save(bean);
|
||||
|
||||
BSimpleWithGen found = DB.find(BSimpleWithGen.class, bean.getId());
|
||||
BSimpleFor found = DB.find(BSimpleFor.class, bean.getId());
|
||||
|
||||
DbJson.of(found).assertContainsResource("/bean/contains-minimal.json");
|
||||
DbJson.of(found).assertContains(readResource("/bean/contains-with-version.json"));
|
||||
@@ -57,7 +57,7 @@ public class DbJsonTest {
|
||||
@Test
|
||||
public void asJson() {
|
||||
|
||||
BSimpleWithGen bean = new BSimpleWithGen("other");
|
||||
BSimpleFor bean = new BSimpleFor("other");
|
||||
DB.save(bean);
|
||||
|
||||
String asJson = DbJson.of(bean)
|
||||
|
||||
@@ -2,7 +2,7 @@ package io.ebean.test;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.test.PlainBean;
|
||||
import org.etest.PlainBean;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user