From 60ad3d03409c3c6256e1cf18a76e21e1100dda22 Mon Sep 17 00:00:00 2001 From: garciay Date: Thu, 28 Jul 2016 05:51:30 +0000 Subject: [PATCH] Update UT primitives --- .../etsi/ttcn/codec/its/uppertester/Plugin.java | 6 ++++-- .../ttcn/codec/its/uppertester/UtPduId.java | 6 ++++-- .../codec/its/uppertester/UtSremTrigger.java | 4 ++-- .../codec/its/uppertester/UtSremUpdate.java | 17 +++++++++++++++++ 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtSremUpdate.java diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/Plugin.java b/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/Plugin.java index 676c805c6..01ee4f492 100644 --- a/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/Plugin.java +++ b/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/Plugin.java @@ -46,10 +46,12 @@ public class Plugin { cf.setCodec(TciTypeClass.RECORD, "UpperTester", "UtIvimTriggerResult", UtIvimTermination.class); cf.setCodec(TciTypeClass.RECORD, "UpperTester", "UtIvimUpdateResult", UtIvimTermination.class); // SREM/SSEM - cf.setCodec(TciTypeClass.RECORD, "UpperTester", "UtSremEventInd", UtEventInd.class); - cf.setCodec(TciTypeClass.RECORD, "UpperTester", "UtSsemEventInd", UtEventInd.class); cf.setCodec(TciTypeClass.RECORD, "UpperTester", "UtSremTrigger", UtSremTrigger.class); cf.setCodec(TciTypeClass.RECORD, "UpperTester", "UtSremTriggerResult", UtBoolean.class); + cf.setCodec(TciTypeClass.RECORD, "UpperTester", "UtSremUpdate", UtSremUpdate.class); + cf.setCodec(TciTypeClass.RECORD, "UpperTester", "UtSremUpdateResult", UtBoolean.class); + cf.setCodec(TciTypeClass.RECORD, "UpperTester", "UtSremEventInd", UtEventInd.class); + cf.setCodec(TciTypeClass.RECORD, "UpperTester", "UtSsemEventInd", UtEventInd.class); } } \ No newline at end of file diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtPduId.java b/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtPduId.java index 62b071f66..cb007ee5b 100644 --- a/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtPduId.java +++ b/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtPduId.java @@ -105,8 +105,10 @@ public enum UtPduId { /* From LibItsSremSsem_TypesAndValues */ UtSremTrigger(0xAB), UtSremTriggerResult(0xAC), - UtSremEventInd(0xAD), - UtSsemEventInd(0xAE), + UtSremUpdate(0xAD), + UtSremUpdateResult(0xAE), + UtSremEventInd(0xAF), + UtSsemEventInd(0xB0), // FIXME Not good, try to merge UtSremTriggerResult & UtSremUpdateResult /* Reserved */ reserved(0xFF); diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtSremTrigger.java b/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtSremTrigger.java index d636a4d13..cb1e2506c 100644 --- a/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtSremTrigger.java +++ b/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtSremTrigger.java @@ -10,7 +10,7 @@ public class UtSremTrigger extends UtRecord { } private void setLengths() { - mainCodec.setHint("BasicVehicleRole", "8"); - mainCodec.setHint("RequestImportanceLevel", "8"); + mainCodec.setHint("BasicVehicleRoleLen", "8"); + mainCodec.setHint("RequestImportanceLevelLen", "8"); } } diff --git a/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtSremUpdate.java b/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtSremUpdate.java new file mode 100644 index 000000000..27beef116 --- /dev/null +++ b/javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtSremUpdate.java @@ -0,0 +1,17 @@ +package org.etsi.ttcn.codec.its.uppertester; + +import org.etsi.ttcn.codec.MainCodec; + +public class UtSremUpdate extends UtRecord { + + public UtSremUpdate(MainCodec mainCodec) { + super(mainCodec); + setLengths(); + } + + private void setLengths() { + mainCodec.setHint("RequestIDLen", "8"); + mainCodec.setHint("BasicVehicleRoleLen", "8"); + mainCodec.setHint("RequestImportanceLevelLen", "8"); + } +} -- GitLab