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

1 files changed, 1 insertions, 18 deletions

diff --git a/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSCardChannelEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSCardChannelEmul.java
index 25923686..5fcf2e37 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSCardChannelEmul.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSCardChannelEmul.java
@@ -18,34 +18,17 @@ package at.gv.egiz.smcc.acos;
 
 import java.util.Arrays;
 
-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;
 
-@SuppressWarnings("restriction")
 public abstract class ACOSCardChannelEmul extends CardChannelEmul {
 
-  /**
-   * 
-   */
-  protected CardEmul cardEmul;
-
-  public ACOSCardChannelEmul(CardEmul cardEmul) {
-    this.cardEmul = cardEmul;
-  }
-
-  @Override
-  public Card getCard() {
-    return cardEmul;
-  }
-
   protected ResponseAPDU cmdSELECT(CommandAPDU command) throws CardException {
   
     byte[] fid = command.getData();
@@ -58,7 +41,7 @@ public abstract class ACOSCardChannelEmul 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;