Index: adapter/org/etsi/its/adapter/ports/V2GPort.java =================================================================== --- adapter/org/etsi/its/adapter/ports/V2GPort.java (revision 653) +++ adapter/org/etsi/its/adapter/ports/V2GPort.java (working copy) @@ -75,7 +75,7 @@ role = ((CharstringValue)TERFactory.getInstance().getTaParameter("V2gTsRole")).getString(); v2gHost = ((CharstringValue)TERFactory.getInstance().getTaParameter("V2gSeccAddress")).getString(); //v2gPort = Integer.decode(((CharstringValue)TERFactory.getInstance().getTaParameter("V2gSeccPort")).getString()); - v2gPort = ((IntegerValue)TERFactory.getInstance().getTaParameter("V2gSeccPort")).getInt(); + v2gPort = ((IntegerValue)TERFactory.getInstance().getTaParameter("V2gSeccPort")).getInteger(); try { sdpPeerAddress = InetAddress.getByName("ff02::1"); } catch (UnknownHostException e1) { Index: adapter/org/etsi/its/adapter/TestAdapter.java =================================================================== --- adapter/org/etsi/its/adapter/TestAdapter.java (revision 653) +++ adapter/org/etsi/its/adapter/TestAdapter.java (working copy) @@ -19,7 +19,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; @@ -71,14 +70,13 @@ } /* (non-Javadoc) - * @see org.etsi.ttcn.tri.TriCommunicationSA#triExecuteTestcase(org.etsi.ttcn.tri.TriTestCaseId, org.etsi.ttcn.tri.TriPortIdList) - */ - @Override + * @see org.etsi.ttcn.tri.TriCommunicationSA#triExecuteTestcase(org.etsi.ttcn.tri.TriTestCaseId, org.etsi.ttcn.tri.TriPortIdList) + */ public TriStatus triExecuteTestcase(final TriTestCaseId tcId, final TriPortIdList portList) { - return required.getTriStatus(TriStatus.TRI_OK); - } + return required.getTriStatus(TriStatus.TRI_OK); + } - /* (non-Javadoc) + /* (non-Javadoc) * @see org.etsi.ttcn.tri.TriCommunicationSA#triMap(org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriPortId) */ @Override @@ -297,15 +295,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) */ @@ -322,4 +311,14 @@ public TriStatus triUnmapParam(TriPortId compPortId, TriPortId tsiPortId, TriParameterList paramList) { return required.getTriStatus(TriStatus.TRI_ERROR, "triUnmapParam not implemented"); } + + @Override + public TriStatus triExecuteTestCase(TriTestCaseId tcId, TriPortIdList portList) { + return this.triExecuteTestcase(tcId, portList); + } + + @Override + public TriStatus triStaticMap(TriPortId arg0, TriPortId arg1) { + return required.getTriStatus(TriStatus.TRI_ERROR, "triMapParam not implemented"); + } } Index: codec/org/etsi/ttcn/codec/generic/Integer.java =================================================================== --- codec/org/etsi/ttcn/codec/generic/Integer.java (revision 653) +++ codec/org/etsi/ttcn/codec/generic/Integer.java (working copy) @@ -48,15 +48,15 @@ if(matcher.find()) { // Unsigned integer if(lengthInBits >= 32) { - iv.setBigInt(new BigInteger(1, value)); // /!\ ttwb specific + iv.setInteger(java.lang.Integer.MAX_VALUE); //!\ testcastT3 does not support big integer } else { - iv.setInt(ByteHelper.byteArrayToInt(value)); + iv.setInteger(ByteHelper.byteArrayToInt(value)); } } else { // Signed integer - iv.setInt(ByteHelper.byteArrayToSignedInt(value, lengthInBits)); + iv.setInteger(ByteHelper.byteArrayToSignedInt(value, lengthInBits)); } } catch(Exception e) { @@ -85,7 +85,7 @@ } lengthInBytes = lengthInBits / 8 + (((lengthInBits % 8) > 0)?1:0); - encoded = ByteHelper.intToByteArray(iv.getInt(), lengthInBytes); + encoded = ByteHelper.intToByteArray(iv.getInteger(), lengthInBytes); res.setBits(encoded, lengthInBits); return res; Index: codec/org/etsi/ttcn/codec/ICodec.java =================================================================== --- codec/org/etsi/ttcn/codec/ICodec.java (revision 653) +++ codec/org/etsi/ttcn/codec/ICodec.java (working copy) @@ -35,6 +35,8 @@ } catch(Exception e) { // Empty on purpose + System.err.println(e.getMessage()); + return -1; } return 0; } Index: codec/org/etsi/ttcn/codec/ipv6/Ipv6ExtHdr.java =================================================================== --- codec/org/etsi/ttcn/codec/ipv6/Ipv6ExtHdr.java (revision 653) +++ codec/org/etsi/ttcn/codec/ipv6/Ipv6ExtHdr.java (working copy) @@ -27,7 +27,7 @@ protected void postDecodeField(String fieldName, CodecBuffer buf, Type decodingHypothesis, RecordValue rv) { if(fieldName.equals("hdrLen")) { - int len = ((IntegerValue)(rv.getField(fieldName))).getInt(); + int len = ((IntegerValue)(rv.getField(fieldName))).getInteger(); mainCodec.setHint("Ipv6ExtHdrLen", Integer.toString(len)); } } Index: codec/org/etsi/ttcn/codec/its/geonetworking/CommonHeader.java =================================================================== --- codec/org/etsi/ttcn/codec/its/geonetworking/CommonHeader.java (revision 653) +++ codec/org/etsi/ttcn/codec/its/geonetworking/CommonHeader.java (working copy) @@ -39,7 +39,7 @@ } else if(fieldName.equals("plLength")) { - int pl = ((IntegerValue)(rv.getField(fieldName))).getInt(); + int pl = ((IntegerValue)(rv.getField(fieldName))).getInteger(); mainCodec.setHint("payloadLength", Integer.toString(pl)); } } Index: codec/org/etsi/ttcn/codec/lowpan/IphcHeader.java =================================================================== --- codec/org/etsi/ttcn/codec/lowpan/IphcHeader.java (revision 653) +++ codec/org/etsi/ttcn/codec/lowpan/IphcHeader.java (working copy) @@ -126,7 +126,7 @@ } else if(fieldName.equals("inlineNextHeader")) { - int nh = ((IntegerValue)(rv.getField(fieldName))).getInt(); + int nh = ((IntegerValue)(rv.getField(fieldName))).getInteger(); mainCodec.setHint("Ipv6NextHeader", Integer.toString(nh)); if(nh == 0 || nh == 60 || nh == 43 || nh == 44) { mainCodec.setHint("ExtensionHeaderListMore", "true"); Index: extfunc/org/etsi/its/extfunc/ItsExternalFunctionsProvider.java =================================================================== --- extfunc/org/etsi/its/extfunc/ItsExternalFunctionsProvider.java (revision 653) +++ extfunc/org/etsi/its/extfunc/ItsExternalFunctionsProvider.java (working copy) @@ -7,7 +7,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.math.BigInteger; import java.net.InetAddress; import java.net.UnknownHostException; import java.text.DateFormat; @@ -81,15 +80,15 @@ DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy hh:mm:ss"); IntegerValue now = _tcicdWrapper.getInteger(); try { - now.setInt( + now.setInteger( (int) (System.currentTimeMillis() - ((java.util.Date)formatter.parse(datestr)).getTime()) ); } catch (ParseException e) { - now.setInt(0); + now.setInteger(0); } - _logger.exiting("ItsExternalFunctionsProvider", "fx_getCurrentTime", String.format("%10d", now.getInt())); + _logger.exiting("ItsExternalFunctionsProvider", "fx_getCurrentTime", String.format("%10d", now.getInteger())); return now; } // End of method fx_getCurrentTime @@ -115,17 +114,17 @@ final IntegerValue p_latitudeA, final IntegerValue p_longitudeA, final IntegerValue p_latitudeB, final IntegerValue p_longitudeB) { _logger.entering("ItsExternalFunctionsProvider", "fx_computeDistance", - String.format("%d, %d, %d, %d", p_latitudeA.getInt(), - p_longitudeA.getInt(), p_latitudeB.getInt(), - p_longitudeB.getInt())); + String.format("%d, %d, %d, %d", p_latitudeA.getInteger(), + p_longitudeA.getInteger(), p_latitudeB.getInteger(), + p_longitudeB.getInteger())); // Initialise the returned value FloatValue dist = _tcicdWrapper.getFloat(); - double dlat = (new Double(p_latitudeB.getInt()) - new Double( - p_latitudeA.getInt())) / 10000000; - double dlong = (new Double(p_longitudeB.getInt()) - new Double( - p_longitudeA.getInt())) / 10000000; + double dlat = (new Double(p_latitudeB.getInteger()) - new Double( + p_latitudeA.getInteger())) / 10000000; + double dlong = (new Double(p_longitudeB.getInteger()) - new Double( + p_longitudeA.getInteger())) / 10000000; long d = Math.round(Math.sqrt(Math.pow(dlat * rbis, 2) + Math.pow(dlong * rbis * Math.cos(dlat), 2))); @@ -165,17 +164,17 @@ _logger.entering( "ItsExternalFunctionsProvider", "fx_computePositionUsingDistance", - String.format("%d, %d", p_distance.getInt(), - p_orientation.getInt())); + String.format("%d, %d", p_distance.getInteger(), + p_orientation.getInteger())); - double angularD = new Double(p_distance.getInt()) / earthRadius; - double radHeading = new Double(p_orientation.getInt()) * Math.PI + double angularD = new Double(p_distance.getInteger()) / earthRadius; + double radHeading = new Double(p_orientation.getInteger()) * Math.PI / 180; // Convert to rad - double lat1 = (new Double(p_refLatitude.getInt()) / 10000000) + double lat1 = (new Double(p_refLatitude.getInteger()) / 10000000) * Math.PI / 180; - double long1 = (new Double(p_refLongitude.getInt()) / 10000000) + double long1 = (new Double(p_refLongitude.getInteger()) / 10000000) * Math.PI / 180; double lat2 = Math.asin(Math.sin(lat1) * Math.cos(angularD) @@ -193,8 +192,8 @@ long rlat2 = Math.round(lat2 * 10000000 / Math.PI * 180); long rlong2 = Math.round(long2 * 10000000 / Math.PI * 180); - p_latitude.setInt((int) rlat2); - p_longitude.setInt((int) rlong2); + p_latitude.setInteger((int) rlat2); + p_longitude.setInteger((int) rlong2); } // End of method fx_computePositionUsingDistance @@ -221,9 +220,8 @@ public IntegerValue fx_computeGnTimestamp() { IntegerValue timestamp = _tcicdWrapper.getInteger(); - - // /!\ ttwb specific - timestamp.setBigInt(new BigInteger(1, ByteHelper.longToByteArray(((System.currentTimeMillis() - ITS_REF_TIME) % (long)Math.pow(2,32)), 5))); + timestamp.setInteger((int)((System.currentTimeMillis() - ITS_REF_TIME) % (long)Math.pow(2,32))); + return timestamp; } @@ -298,11 +296,11 @@ try { // Upper-Layer Packet Length (32bits) pseudoheader.write(ByteHelper.intToByteArray( - p_payloadLength.getInt(), 4)); + p_payloadLength.getInteger(), 4)); // Checksum set to 0 (24bits) pseudoheader.write(ByteHelper.intToByteArray(0, 3)); // Next header (8bits) - pseudoheader.write((byte) p_nextHdr.getInt()); + pseudoheader.write((byte) p_nextHdr.getInteger()); } catch (IOException e) { e.printStackTrace(); }