Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity
import jakarta.persistence.Id

class DuplicateIdEntity : PanacheEntity() {
@Id
var customId: String? = null
@Id var customId: String? = null
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test

import io.quarkus.builder.BuildException
import io.quarkus.test.QuarkusUnitTest
import org.jboss.shrinkwrap.api.spec.JavaArchive
import org.jboss.shrinkwrap.api.ShrinkWrap
import org.jboss.shrinkwrap.api.spec.JavaArchive
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.RegisterExtension
Expand All @@ -17,11 +17,9 @@ class DuplicateIdEntityTest {
companion object {
@RegisterExtension
@JvmField
var runner = QuarkusUnitTest()
.setExpectedException(BuildException::class.java)
.setArchiveProducer {
ShrinkWrap.create(JavaArchive::class.java)
.addClasses(DuplicateIdEntity::class.java)
}
var runner =
QuarkusUnitTest().setExpectedException(BuildException::class.java).setArchiveProducer {
ShrinkWrap.create(JavaArchive::class.java).addClasses(DuplicateIdEntity::class.java)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import jakarta.persistence.Entity

@Entity
class MyEntity : PanacheEntity() {
companion object: PanacheCompanion<MyEntity> {
}
companion object : PanacheCompanion<MyEntity> {}

lateinit var name: String
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class NoConfigTest {
companion object {
@RegisterExtension
@JvmField
val config = QuarkusUnitTest().setArchiveProducer { ShrinkWrap.create(JavaArchive::class.java) }
val config =
QuarkusUnitTest().setArchiveProducer { ShrinkWrap.create(JavaArchive::class.java) }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,23 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.config
import io.quarkus.arc.Arc
import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.MyEntity
import io.quarkus.test.QuarkusUnitTest
import jakarta.persistence.EntityManagerFactory
import org.jboss.shrinkwrap.api.spec.JavaArchive
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.RegisterExtension
import jakarta.persistence.EntityManagerFactory

class ConfigEnabledFalseTest {
companion object {
@RegisterExtension
val config = QuarkusUnitTest()
.withApplicationRoot { jar: JavaArchive -> jar.addClass(MyEntity::class.java) }
.withConfigurationResource("application-test.properties")
// We shouldn't get any build error caused by Panache consuming build items that are not produced
// See https://github.com/quarkusio/quarkus/issues/28842
.overrideConfigKey("quarkus.hibernate-orm.enabled", "false")
val config =
QuarkusUnitTest()
.withApplicationRoot { jar: JavaArchive -> jar.addClass(MyEntity::class.java) }
.withConfigurationResource("application-test.properties")
// We shouldn't get any build error caused by Panache consuming build items that are
// not produced
// See https://github.com/quarkusio/quarkus/issues/28842
.overrideConfigKey("quarkus.hibernate-orm.enabled", "false")
}

@Test
Expand All @@ -26,4 +28,4 @@ class ConfigEnabledFalseTest {
// Just check that Hibernate ORM is disabled.
Assertions.assertNull(Arc.container().instance(EntityManagerFactory::class.java).get())
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ import org.junit.jupiter.api.extension.RegisterExtension
class DefaultPersistenceUnitConfigTest {
@Test
fun panacheOperations() {
/**
* First entity operations
*/
/** First entity operations */
RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1"))
RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2"))
/**
* second entity operations
*/
/** second entity operations */
RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1"))
RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2"))
}

companion object {
@RegisterExtension
@JvmField
var runner = QuarkusUnitTest()
.setArchiveProducer {
ShrinkWrap.create(JavaArchive::class.java)
.addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
.addAsResource("application-test.properties", "application.properties")
}
var runner =
QuarkusUnitTest().setArchiveProducer {
ShrinkWrap.create(JavaArchive::class.java)
.addClasses(
FirstEntity::class.java,
SecondEntity::class.java,
PanacheTestResource::class.java,
)
.addAsResource("application-test.properties", "application.properties")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,36 @@ import org.junit.jupiter.api.extension.RegisterExtension
class DefaultPersistenceUnitFileTest {
@Test
fun panacheOperations() {
/**
* First entity operations
*/
/** First entity operations */
RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1"))
RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2"))
/**
* second entity operations
*/
/** second entity operations */
RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1"))
RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2"))
}

companion object {
@RegisterExtension
@JvmField
var runner = QuarkusUnitTest()
.setArchiveProducer {
ShrinkWrap.create(JavaArchive::class.java)
.addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
.addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml")
.addAsResource(StringAsset(
"""
var runner =
QuarkusUnitTest().setArchiveProducer {
ShrinkWrap.create(JavaArchive::class.java)
.addClasses(
FirstEntity::class.java,
SecondEntity::class.java,
PanacheTestResource::class.java,
)
.addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml")
.addAsResource(
StringAsset(
"""
quarkus.datasource.db-kind=h2
quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
""".trimIndent()),
"application.properties")
}
"""
.trimIndent()
),
"application.properties",
)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,20 @@ class ErroneousPersistenceUnitConfigTest {
companion object {
@RegisterExtension
@JvmField
var runner = QuarkusUnitTest()
var runner =
QuarkusUnitTest()
.setExpectedException(IllegalStateException::class.java)
.setArchiveProducer {
ShrinkWrap.create(JavaArchive::class.java)
.addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
.addAsResource("application-erroneous-multiple-persistence-units.properties", "application.properties")
.addClasses(
FirstEntity::class.java,
SecondEntity::class.java,
PanacheTestResource::class.java,
)
.addAsResource(
"application-erroneous-multiple-persistence-units.properties",
"application.properties",
)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,29 @@ class MultiplePersistenceUnitConfigTest {
@Test
@Disabled("fix in a separate PR")
fun panacheOperations() {
/**
* First entity operations
*/
/** First entity operations */
RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1"))
RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2"))
/**
* second entity operations
*/
/** second entity operations */
RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1"))
RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2"))
}

companion object {
@RegisterExtension
@JvmField
var runner = QuarkusUnitTest()
.setArchiveProducer {
ShrinkWrap.create(JavaArchive::class.java)
.addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
.addAsResource("application-multiple-persistence-units.properties", "application.properties")
}
var runner =
QuarkusUnitTest().setArchiveProducer {
ShrinkWrap.create(JavaArchive::class.java)
.addClasses(
FirstEntity::class.java,
SecondEntity::class.java,
PanacheTestResource::class.java,
)
.addAsResource(
"application-multiple-persistence-units.properties",
"application.properties",
)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import jakarta.persistence.Entity

@Entity
class SecondEntity : PanacheEntity() {
companion object: PanacheCompanion<SecondEntity>
companion object : PanacheCompanion<SecondEntity>

var name: String? = null
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import jakarta.persistence.Entity

@Entity
class MyEntity : PanacheEntity() {
companion object: PanacheCompanion<MyEntity> {
}
companion object : PanacheCompanion<MyEntity> {}

lateinit var name: String
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import io.quarkus.arc.Arc
import io.quarkus.hibernate.reactive.panache.kotlin.deployment.test.MyEntity
import io.quarkus.test.QuarkusUnitTest
import org.hibernate.reactive.mutiny.Mutiny
import org.hibernate.reactive.mutiny.impl.MutinySessionFactoryImpl
import org.jboss.shrinkwrap.api.spec.JavaArchive
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
Expand All @@ -13,12 +12,14 @@ import org.junit.jupiter.api.extension.RegisterExtension
class ConfigEnabledFalseTest {
companion object {
@RegisterExtension
val config = QuarkusUnitTest()
.withApplicationRoot { jar: JavaArchive -> jar.addClass(MyEntity::class.java) }
.withConfigurationResource("application.properties")
// We shouldn't get any build error caused by Panache consuming build items that are not produced
// See https://github.com/quarkusio/quarkus/issues/28842
.overrideConfigKey("quarkus.hibernate-orm.enabled", "false")
val config =
QuarkusUnitTest()
.withApplicationRoot { jar: JavaArchive -> jar.addClass(MyEntity::class.java) }
.withConfigurationResource("application.properties")
// We shouldn't get any build error caused by Panache consuming build items that are
// not produced
// See https://github.com/quarkusio/quarkus/issues/28842
.overrideConfigKey("quarkus.hibernate-orm.enabled", "false")
}

@Test
Expand All @@ -27,4 +28,4 @@ class ConfigEnabledFalseTest {
// Just check that Hibernate Reactive is disabled.
Assertions.assertNull(Arc.container().instance(Mutiny.SessionFactory::class.java).get())
}
}
}
Loading