diff options
author | mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2010-06-16 11:19:41 +0000 |
---|---|---|
committer | mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2010-06-16 11:19:41 +0000 |
commit | 265b0aca555d9880361b754b6a18ce70b5be28cd (patch) | |
tree | 158387c96aa33e53beec0caab6bb938148c15587 /smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java | |
parent | 1615a1e0bea092641bd72351876f6aa6edba655e (diff) | |
download | mocca-265b0aca555d9880361b754b6a18ce70b5be28cd.tar.gz mocca-265b0aca555d9880361b754b6a18ce70b5be28cd.tar.bz2 mocca-265b0aca555d9880361b754b6a18ce70b5be28cd.zip |
Refactored smart card unit tests to use Spring to configure smart card emulators.
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@754 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java')
-rw-r--r-- | smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java index f37f12dd..7eecd7fc 100644 --- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java +++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java @@ -16,43 +16,34 @@ */ package at.gv.egiz.smcc.starcos; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.List; -import javax.smartcardio.Card; import javax.smartcardio.CardException; import javax.smartcardio.CommandAPDU; import javax.smartcardio.ResponseAPDU; import at.gv.egiz.smcc.AbstractAppl; import at.gv.egiz.smcc.CardChannelEmul; -import at.gv.egiz.smcc.CardEmul; import at.gv.egiz.smcc.File; import at.gv.egiz.smcc.PIN; -import java.util.ArrayList; -import java.util.List; -@SuppressWarnings("restriction") public class STARCOSCardChannelEmul extends CardChannelEmul { public static final int KID_PIN_Glob = 0x01; - /** - * - */ - protected CardEmul cardEmul; - - public final List<File> globalFiles = new ArrayList<File>(); - public final HashMap<Integer, PIN> globalPins = new HashMap<Integer, PIN>(); - - public STARCOSCardChannelEmul(CardEmul cardEmul, byte[] Glob_PIN, int PIN_STATE) { - this.cardEmul = cardEmul; - globalPins.put(KID_PIN_Glob, new PIN(Glob_PIN, KID_PIN_Glob, 10, PIN_STATE)); - } + protected List<File> globalFiles = new ArrayList<File>(); + + protected HashMap<Integer, PIN> globalPins = new HashMap<Integer, PIN>(); - @Override - public Card getCard() { - return cardEmul; + public void setGlobalFiles(List<File> globalFiles) { + this.globalFiles = globalFiles; + } + + public void setGlobalPins(HashMap<Integer, PIN> globalPins) { + this.globalPins = globalPins; } protected ResponseAPDU cmdSELECT(CommandAPDU command) throws CardException { @@ -122,7 +113,7 @@ public class STARCOSCardChannelEmul extends CardChannelEmul { } currentAppl = appl; - byte[] fci = currentAppl.getFCI(); + byte[] fci = currentAppl.getFCX(); byte[] response = new byte[fci.length + 2]; System.arraycopy(fci, 0, response, 0, fci.length); response[fci.length] = (byte) 0x90; |