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

1 files changed, 3 insertions, 5 deletions

diff --git a/utils/src/test/java/cardchannel/UnmarshalTest.java b/utils/src/test/java/cardchannel/UnmarshalTest.java
index 998dd9e6..f1ed0c9d 100644
--- a/utils/src/test/java/cardchannel/UnmarshalTest.java
+++ b/utils/src/test/java/cardchannel/UnmarshalTest.java
@@ -29,7 +29,6 @@ import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 import org.junit.Ignore;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 /**
  *
@@ -42,12 +41,11 @@ public class UnmarshalTest {
     JAXBContext ctx = JAXBContext.newInstance(ObjectFactory.class);
     Unmarshaller um = ctx.createUnmarshaller();
 
-    JAXBElement<ScriptType> script = (JAXBElement<ScriptType>) um.unmarshal(new File("src/test/cardchannel/script.xml"));
+    JAXBElement<?> script = (JAXBElement<?>) um.unmarshal(new File("src/test/cardchannel/script.xml"));
 
-    ScriptType scriptT = script.getValue();
+    ScriptType scriptT = (ScriptType) script.getValue();
     System.out.println("script " + scriptT.getClass());
     List<Object> resetOrCommandAPDUOrVerifyAPDU = scriptT.getResetOrCommandAPDUOrVerifyAPDU();
-//    assertEquals(3, resetOrCommandAPDUOrVerifyAPDU.size());
     for (Object object : resetOrCommandAPDUOrVerifyAPDU) {
       System.out.println("script contains: " + object.getClass());
     }
@@ -65,7 +63,7 @@ public class UnmarshalTest {
     s.getResetOrCommandAPDUOrVerifyAPDU().add(r);
     JAXBElement<ScriptType> script = of.createScript(s);
 
-    m.marshal(script, new File("src/test/cardchannel/marshalled.xml"));
+    m.marshal(script, System.out);
     
   }
 }