tct3_javasrc.patch 7.46 KB
Newer Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
Index: adapter/org/etsi/its/adapter/TestAdapter.java
===================================================================
--- adapter/org/etsi/its/adapter/TestAdapter.java	(revision 2573)
+++ adapter/org/etsi/its/adapter/TestAdapter.java	(working copy)
@@ -20,7 +20,6 @@
 import org.etsi.its.adapter.ports.ProtocolPortFactory;
 import org.etsi.its.adapter.ports.UpperTesterPort;
 import org.etsi.ttcn.tci.CharstringValue;
-import org.etsi.ttcn.tri.TriActionTemplate;
 import org.etsi.ttcn.tri.TriAddress;
 import org.etsi.ttcn.tri.TriAddressList;
 import org.etsi.ttcn.tri.TriCommunicationSA;
@@ -74,7 +73,6 @@
     /* (non-Javadoc)
      * @see org.etsi.ttcn.tri.TriCommunicationSA#triExecuteTestcase(org.etsi.ttcn.tri.TriTestCaseId, org.etsi.ttcn.tri.TriPortIdList)
      */
-    @Override
     public TriStatus triExecuteTestcase(final TriTestCaseId tcId, final TriPortIdList portList) {
         return required.getTriStatus(TriStatus.TRI_OK);
     } 
@@ -303,15 +301,6 @@
     }
 
     /**
-     * triSutActionTemplate not implemented
-     * @see org.etsi.ttcn.tri.TriCommunicationSA#triSutActionTemplate(org.etsi.ttcn.tri.TriActionTemplate)
-     */
-    @Override
-    public TriStatus triSutActionTemplate(TriActionTemplate templateValue) {
-        return required.getTriStatus(TriStatus.TRI_ERROR, "triSutActionTemplate not implemented");
-    }
-
-    /**
      * triMapParam not implemented
      * @see org.etsi.ttcn.tri.TriCommunicationSA#triMapParam(org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriParameterList)
      */
@@ -328,4 +317,28 @@
     public TriStatus triUnmapParam(TriPortId compPortId, TriPortId tsiPortId, TriParameterList paramList) {
         return required.getTriStatus(TriStatus.TRI_ERROR, "triUnmapParam not implemented");
     }
+
+    @Override
+    public TriStatus triExecuteTestCase(TriTestCaseId arg0, TriPortIdList arg1) {
+        // TODO Auto-generated method stub
+        return triExecuteTestcase(arg0, arg1);
+    }
+
+    @Override
+    public TriStatus triGetStreamValue(TriComponentId arg0, TriPortId arg1, TriAddress arg2, TriMessage arg3) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public TriStatus triSetStreamValue(TriComponentId arg0, TriPortId arg1, TriAddress arg2, TriMessage arg3) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public TriStatus triStaticMap(TriPortId arg0, TriPortId arg1) {
+        // TODO Auto-generated method stub
+        return null;
+    }
 } 
Index: codec/org/etsi/ttcn/codec/CodecFactory.java
===================================================================
--- codec/org/etsi/ttcn/codec/CodecFactory.java	(revision 2573)
+++ codec/org/etsi/ttcn/codec/CodecFactory.java	(working copy)
@@ -83,7 +83,7 @@
         if(codec != null) {
             //TERFactory.getInstance().logDebug(String.format("%50s", encoding));
             //TERFactory.getInstance().logDebug(" ==> " + codec.getClass().getName());
-            System.out.println(String.format("%50s", encoding) + " ==> " + codec.getClass().getName());
+            //System.out.println(String.format("%50s", encoding) + " ==> " + codec.getClass().getName());
             return codec;
         }
         return null;
@@ -92,12 +92,12 @@
     public ICodec getCodec(MainCodec mainCodec, int classType, String encoding, String typeName) {
 
         //TERFactory.getInstance().logDebug(String.format("%50s", typeName + "(" + encoding + ")"));
-        System.out.println(String.format("%50s", typeName + "(" + encoding + ")"));
+//        System.out.println(String.format("%50s", typeName + "(" + encoding + ")"));
         Class<? extends ICodec> cls = null;
         Class<?>[] ctorParams = {MainCodec.class};
 
         //TERFactory.getInstance().logDebug("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
-        System.out.println("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
+//        System.out.println("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
         cls = codecs.get(classType + '/' + encoding + '/' + typeName);
         if(cls == null) {
             cls = codecs.get(classType + '/' + encoding + '/');
@@ -108,7 +108,7 @@
 
         if(cls != null) {
             //TERFactory.getInstance().logDebug(" ==> " + cls.getName());
-            System.out.println(" ==> " + cls.getName());
+            //System.out.println(" ==> " + cls.getName());
             try {
                 Constructor<? extends ICodec> ctor = cls.getConstructor(ctorParams);
                 return ctor.newInstance(mainCodec);
Index: codec/org/etsi/ttcn/codec/MainCodec.java
===================================================================
--- codec/org/etsi/ttcn/codec/MainCodec.java	(revision 2573)
+++ codec/org/etsi/ttcn/codec/MainCodec.java	(working copy)
@@ -67,6 +67,8 @@
 
     @Override
     public CodecBuffer encode(Value value) {
+        //TERFactory.getInstance().logDebug(">>> MainCodec.encode: " + value);
+        //System.out.println(">>> MainCodec.encode: " + value);
         
         CodecFactory cf = CodecFactory.getInstance();
         TciCDProvided extCodec = cf.getExternalCodec(value.getValueEncoding());
Index: tool/org/etsi/its/tool/elvior/res/ta.properties
===================================================================
--- tool/org/etsi/its/tool/elvior/res/ta.properties	(revision 2573)
+++ tool/org/etsi/its/tool/elvior/res/ta.properties	(working copy)
@@ -1,12 +1,12 @@
 # Debug level - Authorized values: OFF, ALL, INFO, SEVERE
 DEBUG_ENABLED=OFF
 # Define the port/layer configuration for CAM
-#camPort=BTP/GN/ETH
-camPort=BTP/GN/UdpIpCSG
+camPort=BTP/GN/ETH
+#camPort=BTP/GN/UdpIpCSG
 #camPort=BTP/GN/CSG
 # Define the port/layer configuration for DENM
-#denmPort=BTP/GN/ETH
-denmPort=BTP/GN/UdpIpCSG
+denmPort=BTP/GN/ETH
+#denmPort=BTP/GN/UdpIpCSG
 #denmPort=BTP/GN/CSG
 # Define the port/layer configuration for MAPEM-SPATEM
 mapemSpatemPort=BTP/GN/ETH
@@ -32,7 +32,7 @@
 #fsapPort=FSAP/UdpIp
 #fsapPort=FSAP/UdpIp
 
-# Commsignia RSU/OBU Simulator
+# Commsignia RSU and OBU Simulator
 #UpperTesterSettings=10.200.1.101:12345
 # Commsignia Wireless OBU
 UpperTesterSettings=80.98.62.165:18502
@@ -60,9 +60,10 @@
 #LocalEthernetMAC=0022191B7FDB
 # G5 bridge connected on USB3/Ethernet
 #LocalEthernetMAC=00E08F008855
-# Post-mortem ATS execution mode
+# Post-mortem ATS execution mode (G5 raw Ethernet only)
 OfflineMode=false
-PcapFile=pcap/vendor/Livorno 20160914-2 DENM Full packet.pcap
+#PcapFile=pcap/vendor/Livorno 20160914-2 DENM Full packet.pcap
+PcapFile=F:/FSCOM/ETSI/ITS/STF517_ITS_Valid_Conform_Frmwk.2016/ITS-CMS5 PreQ/Savari/TC_SEC_ITSS_SND_MSG_01_01_BV.pcap
 # Start at time in seconds since 1970-01-01, e.g. 1421661427.233361
 OffsetTime=0
 # Define the Ethernet type value used by the IUT
@@ -92,15 +93,15 @@
 # Interval between each beacon sent by TS (ms)
 TsBeaconInterval=1000
 # Latitude of Test System
-#Commsignia
-TsLatitude=514744250
+#Commsignia TsLatitude=514744250
 #Yogoko TsLatitude=481210840
-#Livorno TsLatitude=43551050
+#Livorno 
+TsLatitude=43551050
 # Longitude of Test System
-#Commsignia
-TsLongitude=56240550
+#Commsignia TsLongitude=56240550
 # Yogoko TsLongitude=-16287930
-#Livorno TsLongitude=10298730
+#Livorno 
+TsLongitude=10298730
 # Secured mode status
 UtSecuredMode=false
 # Secured configuration identifier