From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 5 May 2010 15:29:01 +0000
Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/smcc/starcos/STARCOSCardTest.java   | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java')

diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java
index 154884d4..82e48d64 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java
@@ -41,7 +41,7 @@ import at.gv.egiz.smcc.NotActivatedException;
 import at.gv.egiz.smcc.PIN;
 import at.gv.egiz.smcc.PINFormatException;
 import at.gv.egiz.smcc.PINMgmtSignatureCard;
-import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.PinInfo;
 import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.smcc.SignatureCardException;
 import at.gv.egiz.smcc.SignatureCardFactory;
@@ -258,17 +258,17 @@ public class STARCOSCardTest extends CardTest {
     PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard(
             STARCOSCardEmul.DEFAULT_SS_PIN, STARCOSCardEmul.DEFAULT_SS_PIN, PIN.STATE_RESET);
     
-    for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+    for (PinInfo pinInfo : signatureCard.getPinInfos()) {
 
       char[] pin = "123456".toCharArray();
 
-      for (int i = pinSpec.getMinLength(); i <= pinSpec.getMaxLength(); i++) {
-        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+      for (int i = pinInfo.getMinLength(); i <= pinInfo.getMaxLength(); i++) {
+        signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(pin));
         char[] newPin = new char[i];
         Arrays.fill(newPin, '0');
         signatureCard
-            .changePIN(pinSpec, new ChangePINProvider(pin, newPin));
-        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(newPin));
+            .changePIN(pinInfo, new ChangePINProvider(pin, newPin));
+        signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(newPin));
         pin = newPin;
       }
     }
@@ -283,20 +283,20 @@ public class STARCOSCardTest extends CardTest {
     PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard(
             null, null, PIN.STATE_PIN_NOTACTIVE);
 
-    for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+    for (PinInfo pinInfo : signatureCard.getPinInfos()) {
 
-      char[] pin = "1234567890".substring(0, pinSpec.getMinLength()).toCharArray();
+      char[] pin = "1234567890".substring(0, pinInfo.getMinLength()).toCharArray();
 
       boolean notActive = false;
       try {
-        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+        signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(pin));
       } catch (NotActivatedException ex) {
         notActive = true;
       }
       assertTrue(notActive);
 
-      signatureCard.activatePIN(pinSpec, new ChangePINProvider(null, pin));
-      signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+      signatureCard.activatePIN(pinInfo, new ChangePINProvider(null, pin));
+      signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(pin));
     }
   }
 
@@ -307,13 +307,13 @@ public class STARCOSCardTest extends CardTest {
 
     PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard();
 
-    for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+    for (PinInfo pinInfo : signatureCard.getPinInfos()) {
 
       char[] invalidPin = "999999".toCharArray();
       int numInvalidTries = 2;
       InvalidPINProvider invalidPinProvider = new InvalidPINProvider(invalidPin, numInvalidTries);
       try {
-        signatureCard.verifyPIN(pinSpec, invalidPinProvider);
+        signatureCard.verifyPIN(pinInfo, invalidPinProvider);
       } catch (CancelledException ex) {
       } finally {
         assertTrue(invalidPinProvider.getProvided() == numInvalidTries);
@@ -328,7 +328,7 @@ public class STARCOSCardTest extends CardTest {
 
     PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard();
     
-    for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+    for (PinInfo pinInfo : signatureCard.getPinInfos()) {
 
       char[] invalidPin = "999999".toCharArray();
       int numInvalidTries = 2;
@@ -336,7 +336,7 @@ public class STARCOSCardTest extends CardTest {
               new InvalidChangePINProvider(invalidPin, invalidPin, numInvalidTries);
 
       try {
-        signatureCard.changePIN(pinSpec, invalidPinProvider);
+        signatureCard.changePIN(pinInfo, invalidPinProvider);
       } catch (CancelledException ex) {
       } finally {
         assertTrue(invalidPinProvider.getProvided() == numInvalidTries);
-- 
cgit v1.2.3