-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into add-string-functions-upper
- Loading branch information
Showing
11 changed files
with
179 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
dsl/jpql/src/test/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/expression/LowerDslTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package com.linecorp.kotlinjdsl.dsl.jpql.expression | ||
|
|
||
| import com.linecorp.kotlinjdsl.dsl.jpql.queryPart | ||
| import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression | ||
| import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressions | ||
| import org.assertj.core.api.WithAssertions | ||
| import org.junit.jupiter.api.Test | ||
|
|
||
| class LowerDslTest : WithAssertions { | ||
| private val string1 = "string1" | ||
|
|
||
| private val stringExpression1 = Expressions.value("string1") | ||
|
|
||
| @Test | ||
| fun `lower() with a string`() { | ||
| // when | ||
| val expression = queryPart { | ||
| lower(string1) | ||
| }.toExpression() | ||
|
|
||
| val actual: Expression<String> = expression // for type check | ||
|
|
||
| // then | ||
| val expected = Expressions.lower( | ||
| Expressions.value(string1), | ||
| ) | ||
|
|
||
| assertThat(actual).isEqualTo(expected) | ||
| } | ||
|
|
||
| @Test | ||
| fun `lower() with a string expression`() { | ||
| // when | ||
| val expression = queryPart { | ||
| lower(stringExpression1) | ||
| }.toExpression() | ||
|
|
||
| val actual: Expression<String> = expression // for type check | ||
|
|
||
| // then | ||
| val expected = Expressions.lower( | ||
| stringExpression1, | ||
| ) | ||
|
|
||
| assertThat(actual).isEqualTo(expected) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
...jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/impl/JpqlLower.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl | ||
|
|
||
| import com.linecorp.kotlinjdsl.Internal | ||
| import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression | ||
|
|
||
| @Internal | ||
| data class JpqlLower internal constructor( | ||
| val value: Expression<String>, | ||
| ) : Expression<String> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
...rc/main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLowerSerializer.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package com.linecorp.kotlinjdsl.render.jpql.serializer.impl | ||
|
|
||
| import com.linecorp.kotlinjdsl.Internal | ||
| import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLower | ||
| import com.linecorp.kotlinjdsl.render.RenderContext | ||
| import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer | ||
| import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer | ||
| import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter | ||
| import kotlin.reflect.KClass | ||
|
|
||
| @Internal | ||
| class JpqlLowerSerializer : JpqlSerializer<JpqlLower> { | ||
| override fun handledType(): KClass<JpqlLower> { | ||
| return JpqlLower::class | ||
| } | ||
|
|
||
| override fun serialize(part: JpqlLower, writer: JpqlWriter, context: RenderContext) { | ||
| val delegate = context.getValue(JpqlRenderSerializer) | ||
|
|
||
| writer.write("LOWER") | ||
|
|
||
| writer.writeParentheses { | ||
| delegate.serialize(part.value, writer, context) | ||
| } | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
...est/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlLowerSerializerTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package com.linecorp.kotlinjdsl.render.jpql.serializer.impl | ||
|
|
||
| import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressions | ||
| import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlLower | ||
| 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.impl.annotations.MockK | ||
| import io.mockk.verifySequence | ||
| import org.assertj.core.api.WithAssertions | ||
| import org.junit.jupiter.api.Test | ||
|
|
||
| @JpqlSerializerTest | ||
| class JpqlLowerSerializerTest : WithAssertions { | ||
| private val sut = JpqlLowerSerializer() | ||
|
|
||
| @MockK | ||
| private lateinit var writer: JpqlWriter | ||
|
|
||
| @MockK | ||
| private lateinit var serializer: JpqlRenderSerializer | ||
|
|
||
| private val stringExpression1 = Expressions.value("string1") | ||
|
|
||
| @Test | ||
| fun handledType() { | ||
| // when | ||
| val actual = sut.handledType() | ||
|
|
||
| // then | ||
| assertThat(actual).isEqualTo(JpqlLower::class) | ||
| } | ||
|
|
||
| @Test | ||
| fun serialize() { | ||
| // given | ||
| val part = Expressions.lower( | ||
| stringExpression1, | ||
| ) | ||
| val context = TestRenderContext(serializer) | ||
|
|
||
| // when | ||
| sut.serialize(part as JpqlLower, writer, context) | ||
|
|
||
| // then | ||
| verifySequence { | ||
| writer.write("LOWER") | ||
| writer.writeParentheses(any()) | ||
| serializer.serialize(stringExpression1, writer, context) | ||
| } | ||
| } | ||
| } |