Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary code, maintain a consistent code style #650

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Remove unnecessary code, maintain a consistent code style #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51a1e1b
style: remove unnecessary stubbing code
waahhh Feb 21, 2024
ba0a50b
style: consistent test code style
waahhh Feb 21, 2024
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
25 changes: 0 additions & 25 deletions ...t/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLiteralSerializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ import com.linecorp.kotlinjdsl.render.jpql.entity.book.BookAuthorType
import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializerTest
import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
import io.mockk.every
import io.mockk.impl.annotations.MockK
import io.mockk.just
import io.mockk.runs
import io.mockk.verifySequence
import org.assertj.core.api.WithAssertions
import org.junit.jupiter.api.Test
Expand Down Expand Up @@ -46,8 +43,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw int`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.intLiteral(int1)
val context = TestRenderContext(serializer)

Expand All @@ -63,8 +58,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw long`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.longLiteral(long1)
val context = TestRenderContext(serializer)

Expand All @@ -81,8 +74,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw float`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.floatLiteral(float1)
val context = TestRenderContext(serializer)

Expand All @@ -99,8 +90,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw double`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.doubleLiteral(double1)
val context = TestRenderContext(serializer)

Expand All @@ -116,8 +105,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw true`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.booleanLiteral(true)
val context = TestRenderContext(serializer)

Expand All @@ -133,8 +120,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw false`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.booleanLiteral(false)
val context = TestRenderContext(serializer)

Expand All @@ -150,8 +135,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw char`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.charLiteral(char1)
val context = TestRenderContext(serializer)

Expand All @@ -169,8 +152,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw single quote char`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.charLiteral(singleQuote[0])
val context = TestRenderContext(serializer)

Expand All @@ -188,8 +169,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw string`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.stringLiteral(string1)
val context = TestRenderContext(serializer)

Expand All @@ -207,8 +186,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw string single quote string`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.stringLiteral(string1 + singleQuote + string2)
val context = TestRenderContext(serializer)

Expand All @@ -226,8 +203,6 @@ class JpqlLiteralSerializerTest : WithAssertions {
@Test
fun `serialize() can draw enum`() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.enumLiteral(BookAuthorType.AUTHOR)
val context = TestRenderContext(serializer)

Expand Down
7 changes: 4 additions & 3 deletions ...kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLocalDateSerializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.linecorp.kotlinjdsl.render.jpql.serializer.impl

import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressions
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocalDate
import com.linecorp.kotlinjdsl.render.TestRenderContext
import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
Expand All @@ -21,7 +22,7 @@ class JpqlLocalDateSerializerTest {
private lateinit var serializer: JpqlRenderSerializer

@Test
fun handle() {
fun handledType() {
// when
val actual = sut.handledType()

Expand All @@ -32,11 +33,11 @@ class JpqlLocalDateSerializerTest {
@Test
fun serialize() {
// given
val part = JpqlLocalDate
val part = Expressions.localDate()
val context = TestRenderContext(serializer)

// when
sut.serialize(part, writer, context)
sut.serialize(part as JpqlLocalDate, writer, context)

// then
verifySequence {
Expand Down
13 changes: 4 additions & 9 deletions ...pl/JpqlJpqlLocalDateTimeSerializerTest.kt → ...r/impl/JpqlLocalDateTimeSerializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,13 @@ import com.linecorp.kotlinjdsl.render.TestRenderContext
import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializerTest
import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
import io.mockk.every
import io.mockk.impl.annotations.MockK
import io.mockk.just
import io.mockk.runs
import io.mockk.verifySequence
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

@JpqlSerializerTest
class JpqlJpqlLocalDateTimeSerializerTest {
class JpqlLocalDateTimeSerializerTest {
private val sut = JpqlLocalDateTimeSerializer()

@MockK
Expand All @@ -25,7 +22,7 @@ class JpqlJpqlLocalDateTimeSerializerTest {
private lateinit var serializer: JpqlRenderSerializer

@Test
fun handle() {
fun handledType() {
// when
val actual = sut.handledType()

Expand All @@ -36,13 +33,11 @@ class JpqlJpqlLocalDateTimeSerializerTest {
@Test
fun serialize() {
// given
every { writer.write(any<String>()) } just runs

val part = Expressions.localDateTime() as JpqlLocalDateTime
val part = Expressions.localDateTime()
val context = TestRenderContext(serializer)

// when
sut.serialize(part, writer, context)
sut.serialize(part as JpqlLocalDateTime, writer, context)

// then
verifySequence {
Expand Down
7 changes: 4 additions & 3 deletions ...kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLocalTimeSerializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.linecorp.kotlinjdsl.render.jpql.serializer.impl

import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressions
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLocalTime
import com.linecorp.kotlinjdsl.render.TestRenderContext
import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
Expand All @@ -21,7 +22,7 @@ class JpqlLocalTimeSerializerTest {
private lateinit var serializer: JpqlRenderSerializer

@Test
fun handle() {
fun handledType() {
// when
val actual = sut.handledType()

Expand All @@ -32,11 +33,11 @@ class JpqlLocalTimeSerializerTest {
@Test
fun serialize() {
// given
val part = JpqlLocalTime
val part = Expressions.localTime()
val context = TestRenderContext(serializer)

// when
sut.serialize(part, writer, context)
sut.serialize(part as JpqlLocalTime, writer, context)

// then
verifySequence {
Expand Down
5 changes: 3 additions & 2 deletions ...test/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlNullSerializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.linecorp.kotlinjdsl.render.jpql.serializer.impl

import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressions
import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlNull
import com.linecorp.kotlinjdsl.render.TestRenderContext
import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
Expand Down Expand Up @@ -32,11 +33,11 @@ class JpqlNullSerializerTest : WithAssertions {
@Test
fun serialize() {
// given
val part = JpqlNull
val part = Expressions.nullValue<Any>()
val context = TestRenderContext(serializer)

// when
sut.serialize(part, writer, context)
sut.serialize(part as JpqlNull, writer, context)

// then
verifySequence {
Expand Down