Merge branch 'j2735-2024' into psm/unit-testing

asn1jvm-runtime/src/main/java/asn2pojo/runtime/types/Asn1Enumerated.java

@@ -5,9 +5,4 @@
 public interface Asn1Enumerated extends Asn1Type {
     int getIndex();
     String getName();
-    boolean hasExtensionMarker();
-    int maxIndex();
-
-
-
 }

asn1jvm-runtime/src/main/java/asn2pojo/runtime/types/Asn1OctetString.java

@@ -15,7 +15,7 @@ public class Asn1OctetString implements Asn1Type {
 
     @JsonValue
     public String getValue() {
-        HexFormat hexFormat = HexFormat.of();
+        HexFormat hexFormat = HexFormat.of().withUpperCase();
         if (octets != null) {
             return hexFormat.formatHex(octets);
         } else {

generate-test-data/convert_bsm.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -x
+
+BASEDIR=./examples/2024/bsm
+./converter-debug -dd -p $1 -iuper -oxer $BASEDIR/$2.bin > $BASEDIR/$2.xml
+./converter-debug -dd -p $1 -iuper -ojer $BASEDIR/$2.bin > $BASEDIR/$2.json

generate-test-data/examples/2024/bsm/bsm_noext_02.bin

@@ -0,0 +1 @@
+S��XF����Åb�)��۰(^�I;�<b'�+�@

generate-test-data/examples/2024/bsm/bsm_noext_03.bin

@@ -0,0 +1 @@
+S��L��
��6�L��T�@��M	Li���~#�P8

generate-test-data/examples/2024/bsm/bsm_noext_04.bin

@@ -0,0 +1 @@
+���F��������b#�=$3���4;b GU�.�

generate-test-data/examples/2024/bsm/bsm_noext_05.bin

@@ -0,0 +1 @@
+���u���.B�Z���Ӿ����|�A�*C%��p

generate-test-data/examples/2024/bsm/vse_02.bin

@@ -0,0 +1,2 @@
+x���n"��A,�=����
+:��#_�0�(�	�H_[eE��_K��h�o����R&�0Ac�ͪ"W��

j2735-2024/build.gradle

@@ -25,6 +25,10 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
     testImplementation 'commons-io:commons-io:2.18.0'
+    testImplementation 'org.xmlunit:xmlunit-core:2.10.0'
+    testImplementation 'org.xmlunit:xmlunit-matchers:2.10.0'
+    testImplementation 'net.javacrumbs.json-unit:json-unit:4.1.0'
+
 
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 

j2735-2024/src/main/java/j2735/AddGrpB/Angle.java

@@ -1,30 +1,30 @@
-/*==============================================================================
- *
- * This source file was generated by a tool.
- * Beware manual edits might be overwritten in future releases.
- * asn1jvm v1.0-SNAPSHOT
- *
- *------------------------------------------------------------------------------
- * Copyright 2024 USDOT
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License.  You may obtain a copy
- * of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations under
- * the License.
- *============================================================================*/
-
+/*==============================================================================
+ *
+ * This source file was generated by a tool.
+ * Beware manual edits might be overwritten in future releases.
+ * asn1jvm v1.0-SNAPSHOT
+ *
+ *------------------------------------------------------------------------------
+ * Copyright 2024 USDOT
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *============================================================================*/
+
 package j2735.AddGrpB;
 
+import asn2pojo.runtime.serialization.IntegerDeserializer;
 import asn2pojo.runtime.types.Asn1Integer;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import asn2pojo.runtime.serialization.IntegerDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 @JsonDeserialize(using = Angle.AngleDeserializer.class)

j2735-2024/src/main/java/j2735/AddGrpB/Day.java

@@ -1,30 +1,30 @@
-/*==============================================================================
- *
- * This source file was generated by a tool.
- * Beware manual edits might be overwritten in future releases.
- * asn1jvm v1.0-SNAPSHOT
- *
- *------------------------------------------------------------------------------
- * Copyright 2024 USDOT
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License.  You may obtain a copy
- * of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations under
- * the License.
- *============================================================================*/
-
+/*==============================================================================
+ *
+ * This source file was generated by a tool.
+ * Beware manual edits might be overwritten in future releases.
+ * asn1jvm v1.0-SNAPSHOT
+ *
+ *------------------------------------------------------------------------------
+ * Copyright 2024 USDOT
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *============================================================================*/
+
 package j2735.AddGrpB;
 
+import asn2pojo.runtime.serialization.IntegerDeserializer;
 import asn2pojo.runtime.types.Asn1Integer;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import asn2pojo.runtime.serialization.IntegerDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 @JsonDeserialize(using = Day.DayDeserializer.class)

j2735-2024/src/main/java/j2735/AddGrpB/DayOfWeek.java

@@ -20,33 +20,25 @@
  * the License.
  *============================================================================*/
 
-package j2735.AddGrpB;
-
-import lombok.Getter;
-import asn2pojo.runtime.types.Asn1Enumerated;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@Getter
-@JsonSerialize(using = DayOfWeekSerializer.class)
-@JsonDeserialize(using = DayOfWeekDeserializer.class)
-public enum DayOfWeek implements Asn1Enumerated {
-	UNKNOWN(0, "unknown"), MONDAY(1, "monday"), TUESDAY(2, "tuesday"), WEDNESDAY(3, "wednesday"), THURSDAY(4,
-			"thursday"), FRIDAY(5, "friday"), SATURDAY(6, "saturday"), SUNDAY(7, "sunday");
-
-	private final int index;
-	private final String name;
-
-	public boolean hasExtensionMarker() {
-		return false;
-	}
-
-	private DayOfWeek(int index, String name) {
-		this.index = index;
-		this.name = name;
-	}
-
-	public int maxIndex() {
-		return 7;
-	}
+package j2735.AddGrpB;
+
+import asn2pojo.runtime.types.Asn1Enumerated;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Getter;
+
+@Getter
+@JsonSerialize(using = DayOfWeekSerializer.class)
+@JsonDeserialize(using = DayOfWeekDeserializer.class)
+public enum DayOfWeek implements Asn1Enumerated {
+	UNKNOWN(0, "unknown"), MONDAY(1, "monday"), TUESDAY(2, "tuesday"), WEDNESDAY(3, "wednesday"), THURSDAY(4,
+			"thursday"), FRIDAY(5, "friday"), SATURDAY(6, "saturday"), SUNDAY(7, "sunday");
+
+	private final int index;
+	private final String name;
+
+	private DayOfWeek(int index, String name) {
+		this.index = index;
+		this.name = name;
+	}
 }

j2735-2024/src/main/java/j2735/AddGrpB/DegreesLat.java

@@ -1,30 +1,30 @@
-/*==============================================================================
- *
- * This source file was generated by a tool.
- * Beware manual edits might be overwritten in future releases.
- * asn1jvm v1.0-SNAPSHOT
- *
- *------------------------------------------------------------------------------
- * Copyright 2024 USDOT
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License.  You may obtain a copy
- * of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations under
- * the License.
- *============================================================================*/
-
+/*==============================================================================
+ *
+ * This source file was generated by a tool.
+ * Beware manual edits might be overwritten in future releases.
+ * asn1jvm v1.0-SNAPSHOT
+ *
+ *------------------------------------------------------------------------------
+ * Copyright 2024 USDOT
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *============================================================================*/
+
 package j2735.AddGrpB;
 
+import asn2pojo.runtime.serialization.IntegerDeserializer;
 import asn2pojo.runtime.types.Asn1Integer;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import asn2pojo.runtime.serialization.IntegerDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 @JsonDeserialize(using = DegreesLat.DegreesLatDeserializer.class)

j2735-2024/src/main/java/j2735/AddGrpB/DegreesLong.java

@@ -1,30 +1,30 @@
-/*==============================================================================
- *
- * This source file was generated by a tool.
- * Beware manual edits might be overwritten in future releases.
- * asn1jvm v1.0-SNAPSHOT
- *
- *------------------------------------------------------------------------------
- * Copyright 2024 USDOT
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License.  You may obtain a copy
- * of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations under
- * the License.
- *============================================================================*/
-
+/*==============================================================================
+ *
+ * This source file was generated by a tool.
+ * Beware manual edits might be overwritten in future releases.
+ * asn1jvm v1.0-SNAPSHOT
+ *
+ *------------------------------------------------------------------------------
+ * Copyright 2024 USDOT
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *============================================================================*/
+
 package j2735.AddGrpB;
 
+import asn2pojo.runtime.serialization.IntegerDeserializer;
 import asn2pojo.runtime.types.Asn1Integer;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import asn2pojo.runtime.serialization.IntegerDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 @JsonDeserialize(using = DegreesLong.DegreesLongDeserializer.class)

j2735-2024/src/main/java/j2735/AddGrpB/Elevation.java

@@ -1,30 +1,30 @@
-/*==============================================================================
- *
- * This source file was generated by a tool.
- * Beware manual edits might be overwritten in future releases.
- * asn1jvm v1.0-SNAPSHOT
- *
- *------------------------------------------------------------------------------
- * Copyright 2024 USDOT
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License.  You may obtain a copy
- * of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations under
- * the License.
- *============================================================================*/
-
+/*==============================================================================
+ *
+ * This source file was generated by a tool.
+ * Beware manual edits might be overwritten in future releases.
+ * asn1jvm v1.0-SNAPSHOT
+ *
+ *------------------------------------------------------------------------------
+ * Copyright 2024 USDOT
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *============================================================================*/
+
 package j2735.AddGrpB;
 
+import asn2pojo.runtime.serialization.IntegerDeserializer;
 import asn2pojo.runtime.types.Asn1Integer;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import asn2pojo.runtime.serialization.IntegerDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 @JsonDeserialize(using = Elevation.ElevationDeserializer.class)