Skip to content

Commit fbe796c

Browse files
penguin-boxxpenguin-boxx
committedFeb 20, 2022
Add tests
1 parent 315fd22 commit fbe796c

File tree

12 files changed

+241
-17
lines changed

12 files changed

+241
-17
lines changed
 

‎.idea/codeStyles/Project.xml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/src/main/kotlin/io/lambdarpc/examples/basic/client/Main.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fun main(): Unit = runBlocking(serviceDispatcher) {
2020
val m = 3
2121
println("eval5 { it + m } = ${eval5 { it + m }}")
2222
println("specializeAdd(5)(37) = ${specializeAdd(5)(37)}")
23-
println("executeAndAdd { it + 12 }(100) = ${executeAndAdd { it * 2 }(2)}")
23+
println("executeAndAdd { it + 12 }(100) = ${evalAndReturn { it * 2 }(2)}")
2424
println(
2525
"distance(Point(9.0, 1.0), Point(5.0, 4.0)) = " +
2626
"${distance(Point(9.0, 1.0), Point(5.0, 4.0))}"

‎examples/src/main/kotlin/io/lambdarpc/examples/basic/service1/Facade.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ val add5 by conf.def(j<Int>(), j<Int>())
1616
val eval5 by conf.def(f(j<Int>(), j<Int>()), j<Int>())
1717

1818
val specializeAdd by conf.def(j<Int>(), f(j<Int>(), j<Int>()))
19-
val executeAndAdd by conf.def(f(j<Int>(), j<Int>()), f(j<Int>(), j<Int>()))
19+
val evalAndReturn by conf.def(f(j<Int>(), j<Int>()), f(j<Int>(), j<Int>()))
2020

2121
val distance by conf.def(j<Point>(), j<Point>(), j<Double>())
2222

‎examples/src/main/kotlin/io/lambdarpc/examples/basic/service1/Lib.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@ fun add5(x: Int) = x + 5
1212

1313
suspend fun eval5(f: suspend (Int) -> Int): Int = f(5)
1414

15-
/**
16-
* Specializes plus.
17-
*/
1815
fun specializeAdd(x: Int): suspend (Int) -> Int = { it + x }
1916

20-
suspend fun executeAndAdd(f: suspend (Int) -> Int): suspend (Int) -> Int {
17+
suspend fun evalAndReturn(f: suspend (Int) -> Int): suspend (Int) -> Int {
2118
val x = f(5) // Works well, connection for executeAndAdd call is still alive
2219
return {
2320
val y = try {
24-
f(10) // This lambda lives longer then executeAndAdd call connection
21+
f(10) // This frontend function lives longer then evalAndReturn call connection
2522
} catch (e: CallDisconnectedChannelFunction) {
2623
30
2724
}

‎examples/src/main/kotlin/io/lambdarpc/examples/basic/service1/Main.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fun main() {
1010
add5 of ::add5
1111
eval5 of ::eval5
1212
specializeAdd of ::specializeAdd
13-
executeAndAdd of ::executeAndAdd
13+
evalAndReturn of ::evalAndReturn
1414
distance of ::distance
1515
normFilter of ::normFilter
1616
mapPoints of ::mapPoints

‎examples/src/main/kotlin/io/lambdarpc/examples/basic/stress/Main.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fun main(): Unit = runBlocking(serviceDispatcher + newSingleThreadContext("name"
3333
println("specializeAdd(5)(37) = ${specializeAdd(5)(37)}")
3434
}
3535
launch {
36-
println("executeAndAdd { it + 12 }(100) = ${executeAndAdd { it + 12 }(100)}")
36+
println("executeAndAdd { it + 12 }(100) = ${evalAndReturn { it + 12 }(100)}")
3737
}
3838
val n = Random.nextInt(100)
3939
val rnd = Random(Random.nextInt())

‎lambdarpc/config/detekt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ style:
2222
active: false
2323
# Checking arguments list size in boilerplate implementations
2424
MagicNumber:
25-
excludes: ['**/BackendFunction.kt']
25+
excludes: ['**/BackendFunction.kt', '**/test/**']
2626

2727
naming:
2828
# Does not always agree with IDEA default warnings

‎lambdarpc/src/main/kotlin/io/lambdarpc/dsl/DeclarationBuilders.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import kotlin.properties.ReadOnlyProperty
1010
class Configuration(val serviceId: ServiceId)
1111

1212
fun <D> def(accessName: String?, definitionProvider: (AccessName) -> D) =
13-
ReadOnlyProperty { _: Nothing?, property ->
13+
ReadOnlyProperty { _: Any?, property ->
1414
definitionProvider(accessName?.an ?: property.name.an)
1515
}
1616

‎lambdarpc/src/main/kotlin/io/lambdarpc/dsl/LibService.kt

+12-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import io.lambdarpc.transport.ServiceRegistry
1010
import io.lambdarpc.transport.grpc.service.GrpcLibService
1111
import io.lambdarpc.transport.grpc.service.SingleUseConnectionProvider
1212
import io.lambdarpc.utils.Endpoint
13+
import io.lambdarpc.utils.Port
1314
import io.lambdarpc.utils.ServiceId
1415
import kotlinx.coroutines.CoroutineScope
1516

@@ -23,7 +24,7 @@ class LibService(
2324
endpoint: Endpoint,
2425
serviceRegistry: ServiceRegistry = MapServiceRegistry(),
2526
builder: LibServiceDSL.() -> Unit
26-
) {
27+
) : io.lambdarpc.transport.LibService {
2728
private val endpointConnectionProvider = SingleUseConnectionProvider()
2829

2930
private val serviceIdConnectionProvider = object : ConnectionProvider<ServiceId> {
@@ -44,17 +45,24 @@ class LibService(
4445
)
4546
)
4647

47-
fun start() {
48+
override val port: Port
49+
get() = service.port
50+
51+
override fun start() {
4852
service.start()
4953
}
5054

51-
fun awaitTermination() {
55+
override fun awaitTermination() {
5256
service.awaitTermination()
5357
}
58+
59+
override fun shutdown() {
60+
service.shutdown()
61+
}
5462
}
5563

5664
@Suppress("UNCHECKED_CAST")
57-
class LibServiceDSL {
65+
class LibServiceDSL internal constructor() {
5866
internal val registry = FunctionRegistry()
5967

6068
infix fun <R> (suspend CoroutineScope.() -> R).of(f: suspend () -> R) =

‎lambdarpc/src/main/kotlin/io/lambdarpc/transport/LibService.kt

+7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
package io.lambdarpc.transport
22

3+
import io.lambdarpc.utils.Port
4+
35
/**
46
* Represents libservice.
57
*/
68
interface LibService {
9+
val port: Port
10+
711
fun start()
12+
813
fun awaitTermination()
14+
15+
fun shutdown()
916
}

‎lambdarpc/src/main/kotlin/io/lambdarpc/transport/grpc/service/GrpcLibService.kt

+10-2
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,32 @@ import io.grpc.ServerBuilder
55
import io.lambdarpc.transport.LibService
66
import io.lambdarpc.transport.grpc.LibServiceGrpcKt
77
import io.lambdarpc.utils.Port
8+
import io.lambdarpc.utils.port
89

910
/**
1011
* gRPC [LibService] implementation.
1112
*/
1213
class GrpcLibService(
13-
port: Port,
14+
port: Port?,
1415
libService: LibServiceGrpcKt.LibServiceCoroutineImplBase
1516
) : LibService {
1617
val service: Server = ServerBuilder
17-
.forPort(port.p)
18+
.forPort(port?.p ?: 0)
1819
.addService(libService)
1920
.build()
2021

22+
override val port: Port
23+
get() = service.port.port
24+
2125
override fun start() {
2226
service.start()
2327
}
2428

2529
override fun awaitTermination() {
2630
service.awaitTermination()
2731
}
32+
33+
override fun shutdown() {
34+
service.shutdown()
35+
}
2836
}

‎lambdarpc/src/test/kotlin/io/lambdarpc/BasicTests.kt

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
package io.lambdarpc
2+
3+
import com.google.protobuf.ByteString
4+
import io.lambdarpc.BasicTests.Facade.add
5+
import io.lambdarpc.BasicTests.Facade.add5
6+
import io.lambdarpc.BasicTests.Facade.distance
7+
import io.lambdarpc.BasicTests.Facade.eval
8+
import io.lambdarpc.BasicTests.Facade.eval5
9+
import io.lambdarpc.BasicTests.Facade.evalAndReturn
10+
import io.lambdarpc.BasicTests.Facade.mapPoints
11+
import io.lambdarpc.BasicTests.Facade.normMap
12+
import io.lambdarpc.BasicTests.Facade.numpyAdd
13+
import io.lambdarpc.BasicTests.Facade.specializeAdd
14+
import io.lambdarpc.coders.DataCoder
15+
import io.lambdarpc.dsl.*
16+
import io.lambdarpc.functions.frontend.CallDisconnectedChannelFunction
17+
import io.lambdarpc.transport.LibService
18+
import io.lambdarpc.transport.grpc.serialization.RawData
19+
import io.lambdarpc.transport.grpc.serialization.rd
20+
import io.lambdarpc.utils.Endpoint
21+
import io.lambdarpc.utils.addr
22+
import io.lambdarpc.utils.toSid
23+
import kotlinx.coroutines.runBlocking
24+
import kotlinx.serialization.Serializable
25+
import org.junit.jupiter.api.AfterAll
26+
import org.junit.jupiter.api.BeforeAll
27+
import org.junit.jupiter.api.Test
28+
import org.junit.jupiter.api.TestInstance
29+
import kotlin.math.absoluteValue
30+
import kotlin.math.sqrt
31+
import kotlin.test.assertEquals
32+
import kotlin.test.assertTrue
33+
34+
private typealias Norm = suspend (BasicTests.Point) -> Double
35+
36+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
37+
class BasicTests {
38+
companion object {
39+
private val serviceId = "cddc248f-5271-4091-aeeb-f5f374e92e8e".toSid()
40+
}
41+
42+
@Serializable
43+
data class Point(val x: Double, val y: Double)
44+
45+
/**
46+
* Some struct with complex internal structure.
47+
*/
48+
data class NumpyArray<T>(val x: T)
49+
50+
object NumpyArrayIntCoder : DataCoder<NumpyArray<Int>> {
51+
override fun encode(value: NumpyArray<Int>): RawData =
52+
ByteString.copyFrom(byteArrayOf(value.x.toByte())).rd
53+
54+
override fun decode(data: RawData): NumpyArray<Int> =
55+
NumpyArray(data.bytes.toByteArray().first().toInt())
56+
}
57+
58+
object Lib {
59+
fun add5(x: Int) = x + 5
60+
fun add(x: Int, y: Int) = x + y
61+
62+
suspend fun eval5(f: suspend (Int) -> Int): Int = f(5)
63+
suspend fun eval(x: Int, f: suspend (Int) -> Int): Int = f(x)
64+
65+
fun specializeAdd(x: Int): suspend (Int) -> Int = { x + it }
66+
67+
suspend fun evalAndReturn(f: suspend (Int) -> Int): suspend (Int) -> Int {
68+
val x = f(5) // Works well, connection for executeAndAdd call is still alive
69+
return {
70+
val y = try {
71+
f(10) // This frontend function lives longer then evalAndReturn call connection
72+
} catch (e: CallDisconnectedChannelFunction) {
73+
30
74+
}
75+
x + y + it
76+
}
77+
}
78+
79+
fun distance(a: Point, b: Point): Double {
80+
val dx = a.x - b.x
81+
val dy = a.y - b.y
82+
return sqrt(dx * dx + dy * dy)
83+
}
84+
85+
suspend fun mapPoints(xs: List<Point>, f: suspend (Point) -> Double): List<Double> =
86+
xs.map { f(it) }
87+
88+
suspend fun normMap(xs: List<Point>, transformNorm: suspend (Norm) -> Norm): List<Double> =
89+
xs.map { point -> transformNorm { it.x * it.x + it.y * it.y }(point) }
90+
91+
fun numpyAdd(x: Int, arr: NumpyArray<Int>) = NumpyArray(x + arr.x)
92+
}
93+
94+
object Facade {
95+
private val conf = Configuration(serviceId)
96+
97+
val add5 by conf.def(j<Int>(), j<Int>())
98+
val add by conf.def(j<Int>(), j<Int>(), j<Int>())
99+
100+
val eval5 by conf.def(f(j<Int>(), j<Int>()), j<Int>())
101+
val eval by conf.def(j<Int>(), f(j<Int>(), j<Int>()), j<Int>())
102+
103+
val specializeAdd by conf.def(j<Int>(), f(j<Int>(), j<Int>()))
104+
val evalAndReturn by conf.def(f(j<Int>(), j<Int>()), f(j<Int>(), j<Int>()))
105+
106+
val distance by conf.def(j<Point>(), j<Point>(), j<Double>())
107+
108+
val mapPoints by conf.def(j<List<Point>>(), f(j<Point>(), j<Double>()), j<List<Double>>())
109+
110+
private val norm = f(j<Point>(), j<Double>())
111+
val normMap by conf.def(j<List<Point>>(), f(norm, norm), j<List<Double>>())
112+
113+
val numpyAdd by conf.def(j<Int>(), NumpyArrayIntCoder, NumpyArrayIntCoder)
114+
}
115+
116+
private lateinit var service: LibService
117+
private lateinit var serviceDispatcher: ServiceDispatcher
118+
119+
@BeforeAll
120+
fun before() {
121+
service = io.lambdarpc.dsl.LibService(
122+
serviceId, Endpoint("localhost", 0)
123+
) {
124+
add5 of Lib::add5
125+
add of Lib::add
126+
127+
eval5 of Lib::eval5
128+
eval of Lib::eval
129+
130+
specializeAdd of Lib::specializeAdd
131+
evalAndReturn of Lib::evalAndReturn
132+
133+
distance of Lib::distance
134+
135+
mapPoints of Lib::mapPoints
136+
normMap of Lib::normMap
137+
138+
numpyAdd of Lib::numpyAdd
139+
}
140+
service.start()
141+
serviceDispatcher = ServiceDispatcher(
142+
serviceId to Endpoint("localhost".addr, service.port)
143+
)
144+
}
145+
146+
@Test
147+
fun `simple add`() = runBlocking(serviceDispatcher) {
148+
assertEquals(11, add5(6))
149+
assertEquals(11, add(5, 6))
150+
}
151+
152+
@Test
153+
fun `simple HOF eval`() = runBlocking(serviceDispatcher) {
154+
assertEquals(11, eval5 { it + 6 })
155+
assertEquals(11, eval(5) { it + 6 })
156+
}
157+
158+
@Test
159+
fun `return function`() = runBlocking(serviceDispatcher) {
160+
assertEquals(11, specializeAdd(5)(6))
161+
}
162+
163+
@Test
164+
fun `closing execute channel`() = runBlocking(serviceDispatcher) {
165+
assertEquals(42, evalAndReturn { it * 2 }(2))
166+
}
167+
168+
@Test
169+
fun `default structure encoding`() = runBlocking(serviceDispatcher) {
170+
val p1 = Point(9.0, 1.0)
171+
val p2 = Point(5.0, 4.0)
172+
val d = distance(p1, p2)
173+
assertTrue((d - 5).absoluteValue < 0.001)
174+
}
175+
176+
@Test
177+
fun `invoke frontend multiple times`() = runBlocking(serviceDispatcher) {
178+
val ps = listOf(Point(0.0, 0.0), Point(2.0, 1.0), Point(1.0, 1.5))
179+
val expected = Lib.mapPoints(ps) { it.run { sqrt(x * x + y * y) } }
180+
val actual = mapPoints(ps) { it.run { sqrt(x * x + y * y) } }
181+
assertEquals(expected, actual)
182+
}
183+
184+
@Test
185+
fun `lambda returning lambda`() = runBlocking(serviceDispatcher) {
186+
val ps = listOf(Point(0.0, 0.0), Point(2.0, 1.0), Point(1.0, 1.5))
187+
val expected = Lib.normMap(ps) { norm -> { point -> sqrt(norm(point)) } }
188+
val actual = normMap(ps) { norm -> { point -> sqrt(norm(point)) } }
189+
assertEquals(expected, actual)
190+
}
191+
192+
@Test
193+
fun `custom data coder`() = runBlocking(serviceDispatcher) {
194+
assertEquals(42, numpyAdd(2, NumpyArray(40)).x)
195+
}
196+
197+
@AfterAll
198+
fun after() {
199+
service.shutdown()
200+
}
201+
}

0 commit comments

Comments
 (0)
Please sign in to comment.