Merge pull request #453 from handymenny/mts-asn1-kotlin-per

Support Segmented Capabilities
handymenny · Jul 27, 2024 · e1b84a9 · e1b84a9
2 parents 433ca12 + afb0922
commit e1b84a9
Show file tree

Hide file tree

Showing 12 changed files with 171,074 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -28,7 +28,7 @@ val tstypesImplementation: Configuration by
     configurations.getting { extendsFrom(configurations.implementation.get()) }
 
 dependencies {
-    val mtsAsn1Version = "45cc560"
+    val mtsAsn1Version = "3800c8a165"
     val javalinVersion = "6.1.6"
     val coroutinesVersion = "1.8.1"
     val kotlinxSerializationVer = "1.7.1"
@@ -38,6 +38,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinxSerializationVer")
     implementation("com.github.handymenny.mts-asn1:mts-asn1-converter:$mtsAsn1Version")
     implementation("com.github.handymenny.mts-asn1:mts-asn1-per:$mtsAsn1Version")
+    implementation("com.github.handymenny.mts-asn1:mts-asn1-kotlin-per:$mtsAsn1Version")
     implementation("com.github.handymenny.mts-asn1:mts-asn1-kotlinx-json:$mtsAsn1Version")
     implementation("org.slf4j:slf4j-nop:2.0.13")
     implementation("com.github.ajalt.clikt:clikt:4.4.0")

diff --git a/src/main/java/it/smartphonecombo/uecapabilityparser/util/MtsAsn1Helpers.kt b/src/main/java/it/smartphonecombo/uecapabilityparser/util/MtsAsn1Helpers.kt
@@ -5,7 +5,7 @@ import com.ericsson.mts.asn1.ASN1Lexer
 import com.ericsson.mts.asn1.ASN1Parser
 import com.ericsson.mts.asn1.ASN1Translator
 import com.ericsson.mts.asn1.KotlinJsonFormatWriter
-import com.ericsson.mts.asn1.PERTranslatorFactory
+import com.ericsson.mts.asn1.PERTranslatorFactoryKT
 import com.ericsson.mts.asn1.converter.AbstractConverter
 import it.smartphonecombo.uecapabilityparser.extension.decodeHex
 import it.smartphonecombo.uecapabilityparser.extension.getArrayAtPath
@@ -80,13 +80,13 @@ object MtsAsn1Helpers {
     private fun getAsn1Translator(rat: Rat): ASN1Translator {
         val trees = if (rat == Rat.EUTRA) lteTrees else nrTrees
 
-        return ASN1Translator.fromExternalTrees(PERTranslatorFactory(false), trees)
+        return ASN1Translator.fromExternalTrees(PERTranslatorFactoryKT(false), trees)
     }
 
     private fun getAsn1ApTranslator(rat: Rat): ASN1Translator {
         val trees = if (rat == Rat.EUTRA) s1apTrees else ngapTrees
 
-        return ASN1Translator.fromExternalTrees(PERTranslatorFactory(true), trees)
+        return ASN1Translator.fromExternalTrees(PERTranslatorFactoryKT(true), trees)
     }
 
     fun apPDUtoJson(rat: Rat, pdu: ByteArray): JsonElement? {

diff --git a/src/test/java/it/smartphonecombo/uecapabilityparser/cli/CliCsvOutputTest.kt b/src/test/java/it/smartphonecombo/uecapabilityparser/cli/CliCsvOutputTest.kt
@@ -298,6 +298,21 @@ internal class CliCsvOutputTest {
         )
     }
 
+    @Test
+    fun testUeCapHexSegmented() {
+        test(
+            "-i",
+            "$path/input/ueCapHexSegmented.hex",
+            "--sub-types",
+            "LTE",
+            "-t",
+            "H",
+            "-c",
+            "-",
+            oracleFilename = "ueCapHexSegmented.csv",
+        )
+    }
+
     @Test
     fun testQcatMrdc() {
         test(

diff --git a/src/test/java/it/smartphonecombo/uecapabilityparser/cli/CliJsonOutputTest.kt b/src/test/java/it/smartphonecombo/uecapabilityparser/cli/CliJsonOutputTest.kt
@@ -377,6 +377,22 @@ internal class CliJsonOutputTest {
         )
     }
 
+    @Test
+    fun testUeCapHexSegmented() {
+        test(
+            "-i",
+            "$path/input/ueCapHexSegmented.hex",
+            "--sub-types",
+            "LTE",
+            "-t",
+            "H",
+            "-j",
+            "-",
+            "--json-pretty-print",
+            oracleFilename = "ueCapHexSegmented.json",
+        )
+    }
+
     @Test
     fun testQcatMrdc() {
         test(

diff --git a/src/test/java/it/smartphonecombo/uecapabilityparser/cli/CliUeLogOutputTest.kt b/src/test/java/it/smartphonecombo/uecapabilityparser/cli/CliUeLogOutputTest.kt
@@ -197,6 +197,22 @@ internal class CliUeLogOutputTest {
         )
     }
 
+    @Test
+    fun testUeCapHexSegmented() {
+        test(
+            "-i",
+            "$path/input/ueCapHexSegmented.hex",
+            "--sub-types",
+            "LTE",
+            "-t",
+            "H",
+            "-l",
+            "-",
+            "--json-pretty-print",
+            oracleFilename = "ueCapHexSegmented.json",
+        )
+    }
+
     @Test
     fun testQcatMrdc() {
         test(

diff --git a/src/test/java/it/smartphonecombo/uecapabilityparser/server/ServerModeMultiPartParseTest.kt b/src/test/java/it/smartphonecombo/uecapabilityparser/server/ServerModeMultiPartParseTest.kt
@@ -260,6 +260,22 @@ internal class ServerModeMultiPartParseTest {
         )
     }
 
+    @Test
+    fun ueCapHexSegmentedJsonOutput() {
+        javalinJsonTest(
+            request =
+                buildJsonArray {
+                    addJsonObject {
+                        put("type", "H")
+                        putJsonArray("inputIndexes") { add(0) }
+                        putJsonArray("subTypes") { add("LTE") }
+                    }
+                },
+            files = listOf("$inputPath/ueCapHexSegmented.hex"),
+            oraclePath = "$oraclePath/ueCapHexSegmented.json",
+        )
+    }
+
     @Test
     fun qcatNrdc() {
         javalinJsonTest(

diff --git a/src/test/java/it/smartphonecombo/uecapabilityparser/server/ServerModeParseTest.kt b/src/test/java/it/smartphonecombo/uecapabilityparser/server/ServerModeParseTest.kt
@@ -349,6 +349,18 @@ internal class ServerModeParseTest {
         )
     }
 
+    @Test
+    fun ueCapHexSegmentedJsonOutput() {
+        javalinJsonTest(
+            request =
+                buildJsonObject {
+                    put("type", "H")
+                    put("input", fileToBase64("$path/input/ueCapHexSegmented.hex"))
+                },
+            oraclePath = "$path/oracleJson/ueCapHexSegmented.json"
+        )
+    }
+
     @Test
     fun qcatMrdcJsonOutput() {
         javalinJsonTest(