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

Move tests from kotlin-querbean-generator to the test-kotlin module

Browse Source
This commit is contained in:
Rob Bygrave
2023-03-03 23:34:51 +13:00
parent a73c985315
commit 35cb4356c5
16 changed files with 100 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-querybean-generator/pom.xml
+5 -25
View File
@@ -100,37 +100,17 @@
<goal>test-compile</goal>
</goals>
</execution>
<execution>
<id>test-kapt</id>
<goals>
<goal>test-kapt</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>src/test/kotlin</sourceDir>
</sourceDirs>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>io.ebean</groupId>
<artifactId>kotlin-querybean-generator</artifactId>
<version>13.13.3-RC1</version>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</execution>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<sourceDirs>
<source>src/main/java</source>
<source>target/generated-sources/kapt/test</source>
<source>target/generated-sources/kaptKotlin/test</source>
</sourceDirs>
</configuration>
<!-- <configuration>-->
<!-- <sourceDirs>-->
<!-- <source>src/main/java</source>-->
<!-- </sourceDirs>-->
<!-- </configuration>-->
</execution>
</executions>
<configuration>
tests/test-java16/pom.xml
+2 -2
View File
@@ -52,7 +52,7 @@
<path>
<groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId>
<version>13.13.3-SNAPSHOT</version>
<version>13.14.1-SNAPSHOT</version>
</path>
</annotationProcessorPaths>
</configuration>
@@ -65,7 +65,7 @@
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.ebean.tile:enhancement:13.13.2</tile>
<tile>io.ebean.tile:enhancement:13.14.0</tile>
</tiles>
</configuration>
</plugin>
tests/test-kotlin/pom.xml
+91 -43
View File
@@ -16,11 +16,27 @@
<maven.compiler.target>11</maven.compiler.target>
<ebean-maven-plugin.version>13.13.0</ebean-maven-plugin.version>
<kotlin.version>1.6.0</kotlin.version>
<kotlin.version>1.7.22</kotlin.version>
<jackson.version>2.12.1</jackson.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.10</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean</artifactId>
@@ -41,36 +57,17 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.14.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
<plugins>
<plugin>
@@ -78,40 +75,91 @@
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<configuration>
<jvmTarget>11</jvmTarget>
<jvmTarget>${maven.compiler.target}</jvmTarget>
</configuration>
<executions>
<execution>
<id>test-compile</id>
<id>kapt</id>
<goals>
<goal>test-compile</goal>
<goal>kapt</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>src/main/kotlin</sourceDir>
</sourceDirs>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>io.ebean</groupId>
<artifactId>kotlin-querybean-generator</artifactId>
<version>13.14.0</version>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</execution>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<!-- <execution>-->
<!-- <id>test-kapt</id>-->
<!-- <goals>-->
<!-- <goal>test-kapt</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <sourceDirs>-->
<!-- <sourceDir>src/test/kotlin</sourceDir>-->
<!-- </sourceDirs>-->
<!-- <annotationProcessorPaths>-->
<!-- <annotationProcessorPath>-->
<!-- <groupId>io.ebean</groupId>-->
<!-- <artifactId>kotlin-querybean-generator</artifactId>-->
<!-- <version>13.13.2</version>-->
<!-- </annotationProcessorPath>-->
<!-- </annotationProcessorPaths>-->
<!-- </configuration>-->
<!-- </execution>-->
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<release>${java.release}</release>
</configuration>
<executions>
<!-- Replacing default-compile as it is treated specially by maven -->
<execution>
<id>default-compile</id>
<phase>none</phase>
<configuration/>
</execution>
<!-- Replacing default-testCompile as it is treated specially by maven -->
<execution>
<id>default-testCompile</id>
<phase>none</phase>
<configuration/>
</execution>
<execution>
<configuration/>
<id>java-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<configuration/>
<id>java-test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.ebean</groupId>
<artifactId>ebean-maven-plugin</artifactId>
<version>${ebean-maven-plugin.version}</version>
<executions>
<execution>
<id>main</id>
<phase>process-classes</phase>
<configuration>
<transformArgs>debug=1</transformArgs>
</configuration>
<goals>
<goal>enhance</goal>
</goals>
</execution>
<execution>
<id>test</id>
<phase>process-test-classes</phase>
kotlin-querybean-generator/src/test/kotlin/org/example/domain/Address.kt → tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/domain/BaseModel.kt → tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/domain/MyKotInner.kt → tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/Email.kt → tests/test-kotlin/src/main/kotlin/org/example/otherpackage/Email.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/GenericType.kt → tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericType.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/GenericTypeArgument.kt → tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeArgument.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt → tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt → tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/PhoneNumber.kt → tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneNumber.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/ValidEmail.kt → tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmail.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt → tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt
View File
kotlin-querybean-generator/src/test/kotlin/org/example/otherpackage/InnerTest.kt → tests/test-kotlin/src/test/kotlin/org/example/InnerTest.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package org.example.otherpackage
package org.example
import io.ebean.DB
import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
kotlin-querybean-generator/src/test/kotlin/io/ebean/querybean/generator/AddressTest.kt → tests/test-kotlin/src/test/kotlin/org/example/domain/AddressTest.kt
+1 -3
View File
@@ -1,8 +1,6 @@
package io.ebean.querybean.generator
package org.example.domain
import org.example.domain.Address
import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Assertions.fail
import org.junit.jupiter.api.Test
class AddressTest {