add insertAtTop parameter for requests, to put often called services …

…(like transferdata) at the top
doip-sim-ecu · Feb 14, 2022 · 15a89e6 · 15a89e6
1 parent b939ee5
commit 15a89e6
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.github.doip-sim-ecu"
-version = "0.5.0"
+version = "0.5.1"
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/SimDsl.kt b/src/main/kotlin/SimDsl.kt
@@ -305,18 +305,27 @@ open class RequestsData(
          * The loglevel used to log when the request matches and its responses
          */
         loglevel: LogLevel = LogLevel.DEBUG,
+        /**
+         * Insert at top
+         */
+        insertAtTop: Boolean = false,
         /**
          * Handler that is called when the request is matched
          */
-        response: RequestResponseHandler = {}): RequestMatcher {
+        response: RequestResponseHandler = {}
+    ): RequestMatcher {
         val req = RequestMatcher(
             name = name,
             requestBytes = request,
             requestRegex = null,
             loglevel = loglevel,
             responseHandler = response
         )
-        requests.add(req)
+        if (insertAtTop) {
+            requests.add(0, req)
+        } else {
+            requests.add(req)
+        }
         return req
     }
 
@@ -344,18 +353,27 @@ open class RequestsData(
          * The loglevel used to log when the request matches and its responses
          */
         loglevel: LogLevel = LogLevel.DEBUG,
+        /**
+         * Insert at top
+         */
+        insertAtTop: Boolean = false,
         /**
          * Handler that is called when the request is matched
          */
-        response: RequestResponseHandler = {}): RequestMatcher {
+        response: RequestResponseHandler = {}
+    ): RequestMatcher {
         val req = RequestMatcher(
             name = name,
             requestBytes = null,
             requestRegex = reqRegex,
             loglevel = loglevel,
             responseHandler = response
         )
-        requests.add(req)
+        if (insertAtTop) {
+            requests.add(0, req)
+        } else {
+            requests.add(req)
+        }
         return req
     }
 
@@ -383,14 +401,19 @@ open class RequestsData(
          * The loglevel used to log when the request matches and its responses
          */
         loglevel: LogLevel = LogLevel.DEBUG,
+        /**
+         * Insert at top
+         */
+        insertAtTop: Boolean = false,
         /**
          * Handler that is called when the request is matched
          */
-        response: RequestResponseHandler = {}) {
+        response: RequestResponseHandler = {}
+    ) {
         if (isRegex(reqHex)) {
-            request(regexifyRequestHex(reqHex), name, loglevel, response)
+            request(regexifyRequestHex(reqHex), name, loglevel, insertAtTop, response)
         } else {
-            request(reqHex.decodeHex(), name, loglevel, response)
+            request(reqHex.decodeHex(), name, loglevel, insertAtTop, response)
         }
     }
 

diff --git a/src/test/kotlin/SimDslTest.kt b/src/test/kotlin/SimDslTest.kt
@@ -53,6 +53,17 @@ class SimDslTest {
         assertThat(gatewayInstances.size).isEqualTo(0)
     }
 
+    @Test
+    fun `test dsl insertAtTop`() {
+        gateway("GW") {
+            request(byteArrayOf(0x10), "REQ1") { respond(byteArrayOf(0x50)) }
+            request("10", "REQ2") { respond("50") }
+            request("10 []", "REQ3", insertAtTop = true) { ack() }
+        }
+        assertThat(gateways.size).isEqualTo(1)
+        assertThat(gateways[0].requests[0].requestRegex?.pattern).isEqualTo("10.*")
+    }
+
     @Test
     fun `test multibyte ack`() {
         gateway("GW") {