4 files changed, 57 insertions, 39 deletions
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/SLCommandFactoryTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/SLCommandFactoryTest.java
index e0b09508..cd931878 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/SLCommandFactoryTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/SLCommandFactoryTest.java
@@ -33,6 +33,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLRequestException;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.stal.dummy.DummySTAL;
 
 public class SLCommandFactoryTest {
   
@@ -49,6 +50,7 @@ public class SLCommandFactoryTest {
   public void setUp() {
     factory = SLCommandFactory.getInstance();
     context = new SLCommandContext();
+    context.setSTAL(new DummySTAL());
   }
   
   @Test
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureComandImplTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureComandImplTest.java
index c6dedf67..8fdec375 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureComandImplTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureComandImplTest.java
@@ -16,34 +16,34 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
-import static org.junit.Assert.*;
-
-import iaik.xml.crypto.XSecProvider;
-
-import java.io.InputStream;
-import java.security.Security;
-
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import at.gv.egiz.bku.slcommands.CreateXMLSignatureCommand;
-import at.gv.egiz.bku.slcommands.InfoboxReadCommand;
-import at.gv.egiz.bku.slcommands.SLCommand;
-import at.gv.egiz.bku.slcommands.SLCommandContext;
-import at.gv.egiz.bku.slcommands.SLCommandFactory;
-import at.gv.egiz.bku.slcommands.SLResult;
-import at.gv.egiz.bku.slcommands.impl.xsect.STALProvider;
-import at.gv.egiz.bku.slexceptions.SLCommandException;
-import at.gv.egiz.bku.slexceptions.SLRequestException;
-import at.gv.egiz.bku.slexceptions.SLRuntimeException;
-import at.gv.egiz.stal.STAL;
-import at.gv.egiz.stal.dummy.DummySTAL;
-@Ignore
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import iaik.xml.crypto.XSecProvider;
+
+import java.io.InputStream;
+import java.security.Security;
+
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import at.gv.egiz.bku.slcommands.CreateXMLSignatureCommand;
+import at.gv.egiz.bku.slcommands.InfoboxReadCommand;
+import at.gv.egiz.bku.slcommands.SLCommand;
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slcommands.SLCommandFactory;
+import at.gv.egiz.bku.slcommands.SLResult;
+import at.gv.egiz.bku.slcommands.impl.xsect.STALProvider;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+import at.gv.egiz.bku.slexceptions.SLRequestException;
+import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.stal.STAL;
+import at.gv.egiz.stal.dummy.DummySTAL;
+//@Ignore
 public class CreateXMLSignatureComandImplTest {
 
   private SLCommandFactory factory;
@@ -52,8 +52,9 @@ public class CreateXMLSignatureComandImplTest {
 
   @BeforeClass
   public static void setUpClass() {
-    
-    
+
+    new ClassPathXmlApplicationContext("at/gv/egiz/bku/slcommands/testApplicationContext.xml");
+
     Security.addProvider(new STALProvider());
     XSecProvider.addAsProvider(true);
   }
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadComandImplTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadComandImplTest.java
index 7a7b90e3..b0d11d47 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadComandImplTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadComandImplTest.java
@@ -25,9 +25,12 @@ import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
 import org.junit.Before;
-import org.junit.Ignore;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import at.gv.egiz.bku.slcommands.ErrorResult;
 import at.gv.egiz.bku.slcommands.InfoboxReadCommand;
 import at.gv.egiz.bku.slcommands.SLCommand;
 import at.gv.egiz.bku.slcommands.SLCommandContext;
@@ -39,13 +42,20 @@ import at.gv.egiz.bku.slexceptions.SLRuntimeException;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.dummy.DummySTAL;
 
-@Ignore
+//@Ignore
 public class InfoboxReadComandImplTest {
 
+  private static ApplicationContext appCtx;
+  
   private SLCommandFactory factory;
   
   private STAL stal;
   
+  @BeforeClass
+  public static void setUpClass() {
+    appCtx = new ClassPathXmlApplicationContext("at/gv/egiz/bku/slcommands/testApplicationContext.xml");
+  }
+
   @Before
   public void setUp() {
     factory = SLCommandFactory.getInstance();
@@ -71,19 +81,23 @@ public class InfoboxReadComandImplTest {
     InputStream inputStream = getClass().getClassLoader().getResourceAsStream("at/gv/egiz/bku/slcommands/infoboxreadcommand/IdentityLink.Binary.Invalid-1.xml");
     assertNotNull(inputStream);
     
-    SLCommandContext context = new SLCommandContext();
+    SLCommandContext context = new SLCommandContext();
+    context.setSTAL(stal);
     SLCommand command = factory.createSLCommand(new StreamSource(inputStream), context);
     assertTrue(command instanceof InfoboxReadCommand);
   }
 
-  @Test(expected=SLCommandException.class)
   public void testInfboxReadRequestInvalid2() throws SLCommandException, SLRuntimeException, SLRequestException {
     InputStream inputStream = getClass().getClassLoader().getResourceAsStream("at/gv/egiz/bku/slcommands/infoboxreadcommand/IdentityLink.Binary.Invalid-2.xml");
     assertNotNull(inputStream);
     
-    SLCommandContext context = new SLCommandContext();
+    SLCommandContext context = new SLCommandContext();
+    context.setSTAL(stal);
     SLCommand command = factory.createSLCommand(new StreamSource(inputStream), context);
-    assertTrue(command instanceof InfoboxReadCommand);
+    assertTrue(command instanceof InfoboxReadCommand);
+    
+    SLResult result = command.execute();
+    assertTrue(result instanceof ErrorResult);
   }
 
 }
diff --git a/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java b/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java
index dd8b8c8f..77dd7e4f 100644
--- a/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java
+++ b/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java
@@ -50,9 +50,10 @@ public class DummySTAL implements STAL {
   
   public DummySTAL() {
     try {
-      KeyStore ks = KeyStore.getInstance("pkcs12");
-      ks.load(getClass().getClassLoader().getResourceAsStream(
-          "at/gv/egiz/stal/dummy/keystore/Cert.p12"), "1622".toCharArray());
+      KeyStore ks = KeyStore.getInstance("pkcs12");
+      InputStream ksStream = getClass().getClassLoader().getResourceAsStream(
+      "at/gv/egiz/bku/slcommands/impl/Cert.p12");
+      ks.load(ksStream, "1622".toCharArray());
       for (Enumeration<String> aliases = ks.aliases(); aliases
           .hasMoreElements();) {
         String alias = aliases.nextElement();