Merge branch 'samlengine_update' into moa-2.1-Snapshot

16 files changed, 879 insertions, 5 deletions

diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/ExpressionContextAdapter.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/ExpressionContextAdapter.java
new file mode 100644
index 000000000..c26236619
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/ExpressionContextAdapter.java
@@ -0,0 +1,52 @@
+package at.gv.egovernment.moa.id.process.spring.test;
+
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext;
+
+/**
+ * Adapter class for {@link ExpressionEvaluationContext}. Intended to be used for testing purposes.
+ * 
+ * @author tknall
+ * 
+ */
+public class ExpressionContextAdapter implements ExpressionEvaluationContext {
+
+	private static final long serialVersionUID = 1L;
+
+	private Map<String, Serializable> ctxData = Collections.synchronizedMap(new HashMap<String, Serializable>());
+
+	/**
+	 * Returns a certain {@link Serializable} object associated with a certain {@code key}.
+	 * 
+	 * @param key
+	 *            The key.
+	 * @return The object or {@code null} if no object was found stored with that key or if a {@code null} value was
+	 *         stored.
+	 */
+	Serializable get(String key) {
+		return ctxData.get(key);
+	}
+
+	/**
+	 * Stores a {@link Serializable} with a certain {@code key}.
+	 * 
+	 * @param key
+	 *            The key.
+	 * @param object
+	 *            The object.
+	 */
+	void put(String key, Serializable object) {
+		ctxData.put(key, object);
+	}
+
+	@Override
+	public Map<String, Serializable> getCtx() {
+		return Collections.unmodifiableMap(ctxData);
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SimplePojo.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SimplePojo.java
new file mode 100644
index 000000000..89f3c0383
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SimplePojo.java
@@ -0,0 +1,41 @@
+package at.gv.egovernment.moa.id.process.spring.test;
+
+import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator;
+
+/**
+ * A dummy pojo used to test {@link ExpressionEvaluator} with Spring EL referencing Spring beans.
+ * 
+ * @author tknall
+ * 
+ */
+public class SimplePojo {
+
+	private Boolean booleanValue;
+	private String stringValue;
+	private Integer integerValue;
+
+	public Boolean getBooleanValue() {
+		return booleanValue;
+	}
+
+	public void setBooleanValue(Boolean booleanValue) {
+		this.booleanValue = booleanValue;
+	}
+
+	public String getStringValue() {
+		return stringValue;
+	}
+
+	public void setStringValue(String stringValue) {
+		this.stringValue = stringValue;
+	}
+
+	public Integer getIntegerValue() {
+		return integerValue;
+	}
+
+	public void setIntegerValue(Integer integerValue) {
+		this.integerValue = integerValue;
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java
new file mode 100644
index 000000000..5355f14d3
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java
@@ -0,0 +1,116 @@
+package at.gv.egovernment.moa.id.process.spring.test;
+
+import static at.gv.egovernment.moa.id.process.ProcessInstanceState.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.hibernate.cfg.Configuration;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
+import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils;
+import at.gv.egovernment.moa.id.commons.db.dao.session.InterfederationSessionStore;
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException;
+import at.gv.egovernment.moa.id.process.ProcessEngine;
+import at.gv.egovernment.moa.id.process.ProcessEngineImpl;
+import at.gv.egovernment.moa.id.process.ProcessExecutionException;
+import at.gv.egovernment.moa.id.process.ProcessInstance;
+import at.gv.egovernment.moa.id.process.api.ExecutionContext;
+import at.gv.egovernment.moa.id.process.dao.ProcessInstanceStore;
+import at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator;
+
+/**
+ * Tests the process engine using processes based on Spring EL referencing the process context and further Spring beans.
+ * 
+ * @author tknall
+ * 
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class SpringExpressionAwareProcessEngineTest {
+
+	
+	private static ProcessEngine pe;
+
+	@BeforeClass
+	public static void init() throws IOException, ProcessDefinitionParserException {
+
+		pe = new ProcessEngineImpl();
+		((ProcessEngineImpl) pe).setTransitionConditionExpressionEvaluator(new SpringExpressionEvaluator());
+		try (InputStream in = SpringExpressionAwareProcessEngineTest.class.getResourceAsStream("SampleProcessDefinitionWithExpression1.xml")) {
+			((ProcessEngineImpl) pe).registerProcessDefinition(in);
+		}
+		try (InputStream in = SpringExpressionAwareProcessEngineTest.class.getResourceAsStream("SampleProcessDefinitionForSAML1Authentication.xml")) {
+			((ProcessEngineImpl) pe).registerProcessDefinition(in);
+		}
+
+		initHibernateForTesting();
+	}
+
+	private static void initHibernateForTesting() throws IOException{
+
+		InputStream in = SpringExpressionAwareProcessEngineTest.class.getResourceAsStream("/at/gv/egovernment/moa/id/process/hibernate.configuration.test.properties");
+		Properties props = new Properties();
+		props.load(in);
+
+		try {
+			ConfigurationDBUtils.initHibernate(props);
+			Configuration config = new Configuration();
+			config.addProperties(props);
+			config.addAnnotatedClass(ProcessInstanceStore.class);
+			config.addAnnotatedClass(InterfederationSessionStore.class);
+			MOASessionDBUtils.initHibernate(config, props);
+		} catch (MOADatabaseException e) {
+			e.printStackTrace();
+		}
+	}
+
+
+	@Test
+	public void testSampleProcessDefinitionWithExpression1() throws IOException, ProcessDefinitionParserException, ProcessExecutionException {
+
+		String piId = pe.createProcessInstance("SampleProcessWithExpression1");
+		ProcessInstance pi = pe.getProcessInstance(piId);
+		assertEquals(NOT_STARTED, pi.getState());
+		
+		
+		// start process
+		pe.start(piId);
+		pi = pe.getProcessInstance(piId);
+		assertEquals(ENDED, pi.getState());
+	}
+
+	@Test
+	public void testSampleProcessDefinitionForSAML1Authentication() throws IOException, ProcessDefinitionParserException, ProcessExecutionException {
+
+		String piId = pe.createProcessInstance("SampleProcessDefinitionForSAML1Authentication");
+		ProcessInstance pi = pe.getProcessInstance(piId);
+		assertEquals(NOT_STARTED, pi.getState());
+
+		// start process
+		pe.start(piId);
+		pi = pe.getProcessInstance(piId);
+		assertEquals(ENDED, pi.getState());
+
+		pi = pe.getProcessInstance(piId);
+		ExecutionContext ec = pi.getExecutionContext();
+		assertNotNull(ec);
+		System.out.println(ec.keySet());
+
+		assertNotNull(ec.get("bkuURL"));
+		assertNotNull(ec.get("IdentityLink"));
+		assertNotNull(ec.get("isIdentityLinkValidated"));
+		assertNotNull(ec.get("SignedAuthBlock"));
+		assertNotNull(ec.get("isSignedAuthBlockValidated"));
+		assertNotNull(ec.get("SAML1Assertion"));
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest.java
new file mode 100644
index 000000000..bc9d1d399
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest.java
@@ -0,0 +1,54 @@
+package at.gv.egovernment.moa.id.process.spring.test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator;
+
+/**
+ * Tests the {@link ExpressionEvaluator} using a Spring EL based implementation capable of dereferencing Spring beans.
+ * 
+ * @author tknall
+ * 
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class SpringExpressionEvaluatorTest {
+
+	private ExpressionContextAdapter ctx;
+
+	@Autowired
+	private ExpressionEvaluator expressionEvaluator;
+
+	@Before
+	public void prepareTest() {
+		ctx = new ExpressionContextAdapter();
+	}
+
+	@Test
+	public void testEvaluateSimpleExpression() {
+		assertTrue(expressionEvaluator.evaluate(ctx, "'true'"));
+	}
+
+	@Test
+	public void testEvaluateExpressionWithCtx() {
+		ctx.put("myProperty", false);
+		assertFalse(expressionEvaluator.evaluate(ctx, "ctx['myProperty']"));
+	}
+
+	@Test
+	public void testEvaluateExpressionWithBeanReference() {
+		assertTrue(expressionEvaluator.evaluate(ctx, "@simplePojo.booleanValue"));
+		assertTrue(expressionEvaluator.evaluate(ctx, "'HelloWorld'.equals(@simplePojo.stringValue)"));
+		assertTrue(expressionEvaluator.evaluate(ctx, "@simplePojo.integerValue == 42"));
+		assertTrue(expressionEvaluator.evaluate(ctx, "@simplePojo.stringValue.length() == 10"));
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/CreateSAML1AssertionTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/CreateSAML1AssertionTask.java
new file mode 100644
index 000000000..ebda3c5c3
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/CreateSAML1AssertionTask.java
@@ -0,0 +1,59 @@
+package at.gv.egovernment.moa.id.process.spring.test.task;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.Objects;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;
+import at.gv.egovernment.moa.id.process.api.ExecutionContext;
+import at.gv.egovernment.moa.id.process.api.Task;
+
+/**
+ * A dummy task simulating the creation of a SAML1 assertion.
+ * <p>
+ * Requires context data:
+ * <ul>
+ * <li>{@code IdentityLink}</li>
+ * <li>{@code isIdentityLinkValidated}</li>
+ * <li>{@code SignedAuthBlock}</li>
+ * <li>{@code isSignedAuthBlockValidated}</li>
+ * </ul>
+ * </p>
+ * <p>
+ * Enriches context data with:
+ * <ul>
+ * <li>{@code SAML1Assertion}</li>
+ * </ul>
+ * </p>
+ * 
+ * @author tknall
+ * 
+ */
+public class CreateSAML1AssertionTask implements Task {
+
+	private Logger log = LoggerFactory.getLogger(getClass());
+
+	@Override
+	public void execute(ExecutionContext executionContext) throws TaskExecutionException {
+		Objects.requireNonNull(executionContext.get("IdentityLink"));
+		assert (Boolean.TRUE.equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated"))));
+		Objects.requireNonNull(executionContext.get("SignedAuthBlock"));
+		assert (Boolean.TRUE.equals(Objects.requireNonNull(executionContext.get("isSignedAuthBlockValidated"))));
+
+		log.debug("Using IdentityLink and signed auth block in order to create SAML1 assertion.");
+
+		try (InputStream in = getClass().getResourceAsStream("SAML1Assertion.xml")) {
+			executionContext.put("SAML1Assertion", IOUtils.toString(in, Charset.forName("UTF-8")));
+			
+		} catch (IOException e) {
+			throw new TaskExecutionException("", e);
+		}
+
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/GetIdentityLinkTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/GetIdentityLinkTask.java
new file mode 100644
index 000000000..bd08ec6a1
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/GetIdentityLinkTask.java
@@ -0,0 +1,54 @@
+package at.gv.egovernment.moa.id.process.spring.test.task;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.Objects;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;
+import at.gv.egovernment.moa.id.process.api.ExecutionContext;
+import at.gv.egovernment.moa.id.process.api.Task;
+
+/**
+ * A dummy task simulating the retrieval of an IdentityLink.
+ * <p/>
+ * Asynchonous
+ * <p>
+ * Requires context data:
+ * <ul>
+ * <li>{@code bkuURL}</li>
+ * </ul>
+ * </p>
+ * <p>
+ * Enriches context data with:
+ * <ul>
+ * <li>{@code IdentityLink}</li>
+ * </ul>
+ * </p>
+ * 
+ * @author tknall
+ * 
+ */
+public class GetIdentityLinkTask implements Task {
+
+	private Logger log = LoggerFactory.getLogger(getClass());
+
+	@Override
+	public void execute(ExecutionContext executionContext) throws TaskExecutionException {
+		Objects.requireNonNull(executionContext.get("bkuURL"));
+
+		log.debug("Using bkuURL in order to retrieve IdentityLink.");
+
+		try (InputStream in = getClass().getResourceAsStream("IdentityLink_Max_Mustermann.xml")) {
+			executionContext.put("IdentityLink", IOUtils.toString(in, Charset.forName("UTF-8")));
+			
+		} catch (IOException e) {
+			throw new TaskExecutionException("", e);
+		}
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SelectBKUTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SelectBKUTask.java
new file mode 100644
index 000000000..54195ec91
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SelectBKUTask.java
@@ -0,0 +1,33 @@
+package at.gv.egovernment.moa.id.process.spring.test.task;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.egovernment.moa.id.process.api.ExecutionContext;
+import at.gv.egovernment.moa.id.process.api.Task;
+
+/**
+ * A dummy task simulating a bku selection.
+ * <p/>
+ * Asynchonous
+ * <p>
+ * Enriches context data with:
+ * <ul>
+ * <li>{@code bkuURL}</li>
+ * </ul>
+ * </p>
+ * 
+ * @author tknall
+ * 
+ */
+public class SelectBKUTask implements Task {
+
+	private Logger log = LoggerFactory.getLogger(getClass());
+
+	@Override
+	public void execute(ExecutionContext executionContext) {
+		log.debug("Providing BKU selection.");
+		executionContext.put("bkuURL", "https://127.0.0.1:3496/https-security-layer-request");
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignAuthBlockTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignAuthBlockTask.java
new file mode 100644
index 000000000..8f9b72cea
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignAuthBlockTask.java
@@ -0,0 +1,57 @@
+package at.gv.egovernment.moa.id.process.spring.test.task;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.Objects;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;
+import at.gv.egovernment.moa.id.process.api.ExecutionContext;
+import at.gv.egovernment.moa.id.process.api.Task;
+
+/**
+ * A dummy task simulating the signature of an auth block.
+ * <p/>
+ * Asynchonous
+ * <p>
+ * Requires context data:
+ * <ul>
+ * <li>{@code IdentityLink}</li>
+ * <li>{@code isIdentityLinkValidated}</li>
+ * <li>{@code bkuURL}</li>
+ * </ul>
+ * </p>
+ * <p>
+ * Enriches context data with:
+ * <ul>
+ * <li>{@code SignedAuthBlock}</li>
+ * </ul>
+ * </p>
+ * 
+ * @author tknall
+ * 
+ */
+public class SignAuthBlockTask implements Task {
+
+	private Logger log = LoggerFactory.getLogger(getClass());
+
+	@Override
+	public void execute(ExecutionContext executionContext) throws TaskExecutionException {
+		Objects.requireNonNull(executionContext.get("IdentityLink"));
+		assert (Boolean.TRUE.equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated"))));
+		Objects.requireNonNull(executionContext.get("bkuURL"));
+
+		log.debug("Using validated IdentityLink and bkuURL in order to sign auth block.");
+		try (InputStream in = getClass().getResourceAsStream("SignedAuthBlock.xml")) {
+			executionContext.put("SignedAuthBlock", IOUtils.toString(in, Charset.forName("UTF-8")));
+		} catch (IOException e) {
+			throw new TaskExecutionException("", e);
+			
+		}
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateIdentityLinkTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateIdentityLinkTask.java
new file mode 100644
index 000000000..a8e7df3d7
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateIdentityLinkTask.java
@@ -0,0 +1,42 @@
+package at.gv.egovernment.moa.id.process.spring.test.task;
+
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.egovernment.moa.id.process.api.ExecutionContext;
+import at.gv.egovernment.moa.id.process.api.Task;
+
+/**
+ * Dummy task simulating the validation of an IdentityLink.
+ * <p>
+ * Requires context data:
+ * <ul>
+ * <li>{@code IdentityLink}</li>
+ * </ul>
+ * </p>
+ * <p>
+ * Enriches context data with:
+ * <ul>
+ * <li>{@code isIdentityLinkValidated}</li>
+ * </ul>
+ * </p>
+ * 
+ * @author tknall
+ * 
+ */
+public class ValidateIdentityLinkTask implements Task {
+
+	private Logger log = LoggerFactory.getLogger(getClass());
+
+	@Override
+	public void execute(ExecutionContext executionContext) {
+		Objects.requireNonNull(executionContext.get("IdentityLink"));
+
+		log.debug("Validating IdentityLink.");
+
+		executionContext.put("isIdentityLinkValidated", true);
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateSignedAuthBlockTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateSignedAuthBlockTask.java
new file mode 100644
index 000000000..cece373d4
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateSignedAuthBlockTask.java
@@ -0,0 +1,47 @@
+package at.gv.egovernment.moa.id.process.spring.test.task;
+
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;
+import at.gv.egovernment.moa.id.process.api.ExecutionContext;
+import at.gv.egovernment.moa.id.process.api.Task;
+
+/**
+ * A dummy task simulating the validation of an auth block.
+ * <p>
+ * Requires context data:
+ * <ul>
+ * <li>{@code IdentityLink}</li>
+ * <li>{@code isIdentityLinkValidated}</li>
+ * <li>{@code SignedAuthBlock}</li>
+ * </ul>
+ * </p>
+ * <p>
+ * Enriches context data with:
+ * <ul>
+ * <li>{@code isSignedAuthBlockValidated}</li>
+ * </ul>
+ * </p>
+ * 
+ * @author tknall
+ * 
+ */
+public class ValidateSignedAuthBlockTask implements Task {
+
+	private Logger log = LoggerFactory.getLogger(getClass());
+
+	@Override
+	public void execute(ExecutionContext executionContext) throws TaskExecutionException {
+		Objects.requireNonNull(executionContext.get("IdentityLink"));
+		assert (Boolean.TRUE.equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated"))));
+		Objects.requireNonNull(executionContext.get("SignedAuthBlock"));
+
+		log.debug("Using validated IdentityLink and signed auth block in order to validate signed auth block.");
+
+		executionContext.put("isSignedAuthBlockValidated", true);
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/BooleanStringExpressionEvaluator.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/BooleanStringExpressionEvaluator.java
new file mode 100644
index 000000000..20dfc50ef
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/BooleanStringExpressionEvaluator.java
@@ -0,0 +1,24 @@
+package at.gv.egovernment.moa.id.process.test;
+
+import java.util.Objects;
+
+import org.apache.commons.lang3.BooleanUtils;
+
+import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext;
+import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator;
+
+/**
+ * Expression evaluator that guesses the boolean value from a String. Refer to {@link BooleanUtils#toBoolean(String)}
+ * for further information.
+ * 
+ * @author tknall
+ * 
+ */
+public class BooleanStringExpressionEvaluator implements ExpressionEvaluator {
+
+	@Override
+	public boolean evaluate(ExpressionEvaluationContext expressionContext, String expression) {
+		return BooleanUtils.toBoolean(Objects.requireNonNull(expression, "Expression must not be null."));
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HalloWeltTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HalloWeltTask.java
new file mode 100644
index 000000000..d05200ee8
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HalloWeltTask.java
@@ -0,0 +1,19 @@
+package at.gv.egovernment.moa.id.process.test;
+
+import at.gv.egovernment.moa.id.process.api.ExecutionContext;
+import at.gv.egovernment.moa.id.process.api.Task;
+
+/**
+ * Simple task that just outputs a "Hallo World" text to the console.
+ * 
+ * @author tknall
+ * 
+ */
+public class HalloWeltTask implements Task {
+
+	@Override
+	public void execute(ExecutionContext executionContext) {
+		System.out.println("Hallo Welt");
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HelloWorldTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HelloWorldTask.java
new file mode 100644
index 000000000..e79bb8198
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HelloWorldTask.java
@@ -0,0 +1,19 @@
+package at.gv.egovernment.moa.id.process.test;
+
+import at.gv.egovernment.moa.id.process.api.ExecutionContext;
+import at.gv.egovernment.moa.id.process.api.Task;
+
+/**
+ * Simple task that just outputs a "Hello World" text to the console.
+ * 
+ * @author tknall
+ * 
+ */
+public class HelloWorldTask implements Task {
+
+	@Override
+	public void execute(ExecutionContext executionContext) {
+		System.out.println("Hello World");
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessDefinitionParserTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessDefinitionParserTest.java
new file mode 100644
index 000000000..df13f064b
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessDefinitionParserTest.java
@@ -0,0 +1,137 @@
+package at.gv.egovernment.moa.id.process.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.junit.Test;
+
+import at.gv.egovernment.moa.id.process.ProcessDefinitionParser;
+import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException;
+import at.gv.egovernment.moa.id.process.model.EndEvent;
+import at.gv.egovernment.moa.id.process.model.ProcessDefinition;
+import at.gv.egovernment.moa.id.process.model.ProcessNode;
+import at.gv.egovernment.moa.id.process.model.StartEvent;
+import at.gv.egovernment.moa.id.process.model.TaskInfo;
+import at.gv.egovernment.moa.id.process.model.Transition;
+
+public class ProcessDefinitionParserTest {
+	
+	@Test(expected = ProcessDefinitionParserException.class)
+	public void testParseInvalidProcessDefinition_MultipleStartEvents() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_MultipleStartEvents.xml")) {
+			new ProcessDefinitionParser().parse(in);
+		}
+	}
+	
+	@Test(expected = ProcessDefinitionParserException.class)
+	public void testParseInvalidProcessDefinition_TransitionLoop() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionLoop.xml")) {
+			new ProcessDefinitionParser().parse(in);
+		}
+	}
+	
+	@Test(expected = ProcessDefinitionParserException.class)
+	public void testParseInvalidProcessDefinition_TransitionStartsFromEndEvent() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionStartsFromEndEvent.xml")) {
+			new ProcessDefinitionParser().parse(in);
+		}
+	}
+	
+	@Test(expected = ProcessDefinitionParserException.class)
+	public void testParseInvalidProcessDefinition_TransitionRefsTransition() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionRefsTransition.xml")) {
+			new ProcessDefinitionParser().parse(in);
+		}
+	}
+	
+	@Test(expected = ProcessDefinitionParserException.class)
+	public void testParseInvalidProcessDefinition_NoStartEvents() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_NoStartEvents.xml")) {
+			new ProcessDefinitionParser().parse(in);
+		}
+	}
+	
+	@Test
+	public void testParseSampleProcessDefinition() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("SampleProcessDefinition1.xml")) {
+			
+			ProcessDefinitionParser parser = new ProcessDefinitionParser();
+			ProcessDefinition pd = parser.parse(in);
+			
+			assertNotNull(pd);
+			assertEquals("SampleProcess1", pd.getId());
+			
+			// first assert tasks then transitions
+			// start event
+			StartEvent startEvent = pd.getStartEvent();
+			assertNotNull(startEvent);
+			assertEquals("start", startEvent.getId());
+			assertEquals(startEvent, pd.getProcessNode("start"));
+			// task1
+			ProcessNode processNode = pd.getProcessNode("task1");
+			assertNotNull(processNode);
+			assertTrue(processNode instanceof TaskInfo);
+			TaskInfo task1 = (TaskInfo) processNode;
+			assertEquals("task1", task1.getId());
+			assertFalse(task1.isAsync());
+			// task2 
+			processNode = pd.getProcessNode("task2");
+			assertNotNull(processNode);
+			assertTrue(processNode instanceof TaskInfo);
+			TaskInfo task2 = (TaskInfo) processNode;
+			assertEquals("task2", task2.getId());
+			assertTrue(task2.isAsync());
+			// end event
+			processNode = pd.getProcessNode("end");
+			assertNotNull(processNode);
+			assertTrue(processNode instanceof EndEvent);
+			EndEvent endEvent = (EndEvent) processNode;
+			assertEquals("end", endEvent.getId());
+			
+			// assert transitions
+			// start event
+			assertNotNull(startEvent.getIncomingTransitions());
+			assertTrue(startEvent.getIncomingTransitions().isEmpty());
+			assertNotNull(startEvent.getOutgoingTransitions());
+			assertEquals(1, startEvent.getOutgoingTransitions().size());
+			// transition from start to task1
+			Transition startToTask1 = startEvent.getOutgoingTransitions().get(0);
+			assertEquals("fromStart", startToTask1.getId());
+			assertEquals(startEvent, startToTask1.getFrom());
+			assertEquals(task1, startToTask1.getTo());
+			assertEquals("true", startToTask1.getConditionExpression());
+			// task1
+			assertNotNull(task1.getIncomingTransitions());
+			assertEquals(1, task1.getIncomingTransitions().size());
+			assertEquals(startToTask1, task1.getIncomingTransitions().get(0));
+			assertNotNull(task1.getOutgoingTransitions());
+			assertEquals(1, task1.getOutgoingTransitions().size());
+			// transition from task1 to task2
+			Transition task1ToTask2 = task1.getOutgoingTransitions().get(0);
+			assertNull(task1ToTask2.getId());
+			assertEquals(task1, task1ToTask2.getFrom());
+			assertEquals(task2, task1ToTask2.getTo());
+			assertNull(task1ToTask2.getConditionExpression());
+			// task2
+			assertNotNull(task2.getIncomingTransitions());
+			assertEquals(1, task2.getIncomingTransitions().size());
+			assertEquals(task1ToTask2, task2.getIncomingTransitions().get(0));
+			assertNotNull(task2.getOutgoingTransitions());
+			assertEquals(1, task2.getOutgoingTransitions().size());
+			// transition from task2 to end
+			Transition task2ToEnd = task2.getOutgoingTransitions().get(0);
+			assertNull(task2ToEnd.getId());
+			assertEquals(task2, task2ToEnd.getFrom());
+			assertEquals(endEvent, task2ToEnd.getTo());
+			assertNull(task2ToEnd.getConditionExpression());
+			
+		}
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java
new file mode 100644
index 000000000..4f24468fe
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java
@@ -0,0 +1,108 @@
+package at.gv.egovernment.moa.id.process.test;
+
+import static at.gv.egovernment.moa.id.process.ProcessInstanceState.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.hibernate.cfg.Configuration;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
+import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils;
+import at.gv.egovernment.moa.id.commons.db.dao.session.InterfederationSessionStore;
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.process.ProcessDefinitionParser;
+import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException;
+import at.gv.egovernment.moa.id.process.ProcessEngine;
+import at.gv.egovernment.moa.id.process.ProcessEngineImpl;
+import at.gv.egovernment.moa.id.process.ProcessExecutionException;
+import at.gv.egovernment.moa.id.process.ProcessInstance;
+import at.gv.egovernment.moa.id.process.dao.ProcessInstanceStore;
+
+public class ProcessEngineTest {
+	
+	private static ProcessEngine pe;
+
+	@BeforeClass
+	public static void init() throws IOException, ProcessDefinitionParserException {
+
+		ProcessDefinitionParser pdp = new ProcessDefinitionParser();
+
+		pe = new ProcessEngineImpl();
+
+		((ProcessEngineImpl) pe).setTransitionConditionExpressionEvaluator(new BooleanStringExpressionEvaluator());
+		try (InputStream in = ProcessEngineTest.class.getResourceAsStream("SampleProcessDefinition1.xml")) {
+			((ProcessEngineImpl) pe).registerProcessDefinition(pdp.parse(in));
+		}
+		try (InputStream in = ProcessEngineTest.class.getResourceAsStream("SampleProcessDefinition2.xml")) {
+			((ProcessEngineImpl) pe).registerProcessDefinition(pdp.parse(in));
+		}
+
+		initHibernateForTesting();
+	}
+
+
+	private static void initHibernateForTesting() throws IOException{
+
+		InputStream in = ProcessEngineTest.class.getResourceAsStream("/at/gv/egovernment/moa/id/process/hibernate.configuration.test.properties");
+		Properties props = new Properties();
+		props.load(in);
+
+		try {
+			ConfigurationDBUtils.initHibernate(props);
+			Configuration config = new Configuration();
+			config.addProperties(props);
+			config.addAnnotatedClass(ProcessInstanceStore.class);
+			config.addAnnotatedClass(InterfederationSessionStore.class);
+			MOASessionDBUtils.initHibernate(config, props);
+		} catch (MOADatabaseException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	@Test
+	public void testSampleProcess1() throws IOException, ProcessDefinitionParserException, ProcessExecutionException {
+
+		String piId = pe.createProcessInstance("SampleProcess1");
+		ProcessInstance pi = pe.getProcessInstance(piId);
+		assertEquals(NOT_STARTED, pi.getState());
+
+		// start process
+		pe.start(piId);
+		pi = pe.getProcessInstance(piId);
+		assertEquals(SUSPENDED, pi.getState());
+
+		System.out.println("Do something asynchronously");
+		pe.signal(piId);
+		pi = pe.getProcessInstance(piId);
+		assertEquals(ENDED, pi.getState());
+	}
+	
+	@Test
+	public void testSampleProcess2() throws IOException, ProcessDefinitionParserException, ProcessExecutionException {
+
+		String piId = pe.createProcessInstance("SampleProcess2");
+		ProcessInstance pi = pe.getProcessInstance(piId);
+		assertEquals(NOT_STARTED, pi.getState());
+
+		// start process
+		pe.start(piId);
+		pi = pe.getProcessInstance(piId);
+		assertEquals(SUSPENDED, pi.getState());
+
+		System.out.println("Do something asynchronously");
+		pe.signal(piId);
+		pi = pe.getProcessInstance(piId);
+		assertEquals(ENDED, pi.getState());
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testProcessInstanceDoesNotExist() {
+		pe.getProcessInstance("does not exist");
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/test/tlenz/simpletest.java b/id/server/idserverlib/src/test/java/test/tlenz/simpletest.java
index ec908f78b..549eb4f2b 100644
--- a/id/server/idserverlib/src/test/java/test/tlenz/simpletest.java
+++ b/id/server/idserverlib/src/test/java/test/tlenz/simpletest.java
@@ -1,3 +1,8 @@
+package test.tlenz;
+
+import at.gv.egovernment.moa.id.data.AuthenticationRole;
+import at.gv.egovernment.moa.id.data.AuthenticationRoleFactory;
+
 /*******************************************************************************
  * Copyright 2014 Federal Chancellery Austria
  * MOA-ID has been developed in a cooperation between BRZ, the Federal
@@ -38,12 +43,19 @@
 //import at.gv.egovernment.moa.id.storage.AssertionStorage;
 //import at.gv.egovernment.moa.util.MiscUtil;
 //
-//public class simpletest {
+public class simpletest {
 //
-//	public static void main(String[] args) {
+	public static void main(String[] args) {
+		
+		AuthenticationRole test = AuthenticationRoleFactory.buildFormPVPole("ecas-demo-EUROPEAN_COMMISSION(key=A\\,B)");
+		
+		test = AuthenticationRoleFactory.buildFormPVPole("ecas-demo-EUROPEAN_COMMISSION");
+		test = AuthenticationRoleFactory.buildFormPVPole("ecas-demo-EUROPEAN_COMMISSION(key=A)");
+		test = AuthenticationRoleFactory.buildFormPVPole("ecas-demo-EUROPEAN_COMMISSION(keyA=A,keyB=B)");
+		
 //		
 //		System.setProperty("mandates.configuration", "D:/Projekte/svn/moa-id/moa-id.properties");
-//		String propertiesFileLocation = System.getProperty("mandates.configuration");
+//		String propertiesFileLocation = Systm.getProperty("mandates.configuration");
 //		
 //		MiscUtil.assertNotNull(propertiesFileLocation, "propertiesFileName");
 //		File propertiesFile = new File(propertiesFileLocation);
@@ -95,5 +107,5 @@
 //		
 //		
 //		
-//	}
-//}
+	}
+}