From 3fada6cef21c9b16467177d866df778203b51b4d Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 5 Dec 2019 09:52:48 +0100 Subject: some code code-style modifications active code-quality checks! --- .../spring/test/DummyTransactionStorage.java | 17 +++++++------ .../spring/test/ExpressionContextAdapter.java | 14 ++++++----- .../impl/idp/process/spring/test/SimplePojo.java | 3 ++- .../SpringExpressionAwareProcessEngineTest.java | 28 +++++++++++----------- .../spring/test/SpringExpressionEvaluatorTest.java | 8 ++++--- .../spring/test/task/CreateSaml1AssertionTask.java | 18 +++++++------- .../spring/test/task/GetIdentityLinkTask.java | 10 ++++---- .../process/spring/test/task/SelectBkuTask.java | 7 +++--- .../spring/test/task/SignAuthBlockTask.java | 14 ++++++----- .../spring/test/task/ValidateIdentityLinkTask.java | 8 ++++--- .../test/task/ValidateSignedAuthBlockTask.java | 12 ++++++---- .../test/BooleanStringExpressionEvaluator.java | 4 +++- .../core/impl/idp/process/test/HalloWeltTask.java | 3 ++- .../core/impl/idp/process/test/HelloWorldTask.java | 3 ++- .../process/test/ProcessDefinitionParserTest.java | 5 +++- .../impl/idp/process/test/ProcessEngineTest.java | 23 +++++++++--------- .../impl/idp/process/test/StopProcessFlagTask.java | 3 ++- .../impl/idp/process/test/ThrowExceptionTask.java | 3 ++- 18 files changed, 104 insertions(+), 79 deletions(-) (limited to 'eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process') diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/DummyTransactionStorage.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/DummyTransactionStorage.java index cc1d57cd..fb326eba 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/DummyTransactionStorage.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/DummyTransactionStorage.java @@ -23,15 +23,18 @@ import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; + import javax.sql.DataSource; -import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage; -import at.gv.egiz.eaaf.core.exceptions.EaafException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage; +import at.gv.egiz.eaaf.core.exceptions.EaafException; + /** - * Dummy DataSource implementation for convenience in test cases where a database connection will - * never actually be acquired. + * Dummy DataSource implementation for convenience in test cases where a + * database connection will never actually be acquired. * * @see DataSource * @author Chris Beams @@ -40,7 +43,6 @@ public class DummyTransactionStorage implements ITransactionStorage { private static final Logger log = LoggerFactory.getLogger(DummyTransactionStorage.class); - public class DummyDbEntry { public DummyDbEntry(final String key, final Object value) { this.obj = value; @@ -69,8 +71,6 @@ public class DummyTransactionStorage implements ITransactionStorage { private final ArrayList ds = new ArrayList<>(); - - @Override public boolean containsKey(final String key) { // TODO Auto-generated method stub @@ -114,7 +114,7 @@ public class DummyTransactionStorage implements ITransactionStorage { } try { @SuppressWarnings("unchecked") - final T test = (clazz.cast(o.getObj())); + final T test = clazz.cast(o.getObj()); return test; } catch (final Exception e) { @@ -182,5 +182,4 @@ public class DummyTransactionStorage implements ITransactionStorage { // // } - } diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/ExpressionContextAdapter.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/ExpressionContextAdapter.java index c00cc628..fff256bf 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/ExpressionContextAdapter.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/ExpressionContextAdapter.java @@ -19,15 +19,16 @@ package at.gv.egiz.eaaf.core.impl.idp.process.spring.test; - import java.io.Serializable; import java.util.Collections; import java.util.HashMap; import java.util.Map; + import at.gv.egiz.eaaf.core.api.idp.process.ExpressionEvaluationContext; /** - * Adapter class for {@link ExpressionEvaluationContext}. Intended to be used for testing purposes. + * Adapter class for {@link ExpressionEvaluationContext}. Intended to be used + * for testing purposes. * * @author tknall * @@ -40,11 +41,12 @@ public class ExpressionContextAdapter implements ExpressionEvaluationContext { Collections.synchronizedMap(new HashMap()); /** - * Returns a certain {@link Serializable} object associated with a certain {@code key}. + * 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. + * @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(final String key) { return ctxData.get(key); @@ -53,7 +55,7 @@ public class ExpressionContextAdapter implements ExpressionEvaluationContext { /** * Stores a {@link Serializable} with a certain {@code key}. * - * @param key The key. + * @param key The key. * @param object The object. */ void put(final String key, final Serializable object) { diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SimplePojo.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SimplePojo.java index 28dc57b4..96576b2d 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SimplePojo.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SimplePojo.java @@ -22,7 +22,8 @@ package at.gv.egiz.eaaf.core.impl.idp.process.spring.test; import at.gv.egiz.eaaf.core.api.idp.process.ExpressionEvaluator; /** - * A dummy pojo used to test {@link ExpressionEvaluator} with Spring EL referencing Spring beans. + * A dummy pojo used to test {@link ExpressionEvaluator} with Spring EL + * referencing Spring beans. * * @author tknall * diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionAwareProcessEngineTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionAwareProcessEngineTest.java index 1d139b5e..23d99837 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionAwareProcessEngineTest.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionAwareProcessEngineTest.java @@ -23,8 +23,18 @@ import static at.gv.egiz.eaaf.core.impl.idp.process.ProcessInstanceState.NOT_STA import static at.gv.egiz.eaaf.core.impl.idp.process.ProcessInstanceState.SUSPENDED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; + import java.io.IOException; import java.io.InputStream; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; import at.gv.egiz.eaaf.core.api.idp.process.ProcessEngine; import at.gv.egiz.eaaf.core.exceptions.ProcessExecutionException; @@ -33,17 +43,10 @@ import at.gv.egiz.eaaf.core.impl.idp.process.ProcessDefinitionParserException; import at.gv.egiz.eaaf.core.impl.idp.process.ProcessEngineImpl; import at.gv.egiz.eaaf.core.impl.idp.process.ProcessInstance; import at.gv.egiz.eaaf.core.impl.idp.process.spring.SpringExpressionEvaluator; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** - * Tests the process engine using processes based on Spring EL referencing the process context and - * further Spring beans. + * Tests the process engine using processes based on Spring EL referencing the + * process context and further Spring beans. * * @author tknall * @@ -62,8 +65,8 @@ public class SpringExpressionAwareProcessEngineTest { /** * jUnit test set-up. * - * @throws IOException in case of an error - * @throws ProcessDefinitionParserException in case of an error + * @throws IOException in case of an error + * @throws ProcessDefinitionParserException in case of an error */ @Before public void init() throws IOException, ProcessDefinitionParserException { @@ -100,7 +103,6 @@ public class SpringExpressionAwareProcessEngineTest { ProcessInstance pi = pe.getProcessInstance(piId); assertEquals(NOT_STARTED, pi.getState()); - // start process req.setProcessInstanceID(piId); pe.start(req); @@ -157,8 +159,6 @@ public class SpringExpressionAwareProcessEngineTest { } - - } } diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionEvaluatorTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionEvaluatorTest.java index 5697365e..26e2e17b 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionEvaluatorTest.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionEvaluatorTest.java @@ -21,7 +21,7 @@ package at.gv.egiz.eaaf.core.impl.idp.process.spring.test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import at.gv.egiz.eaaf.core.api.idp.process.ExpressionEvaluator; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -29,9 +29,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import at.gv.egiz.eaaf.core.api.idp.process.ExpressionEvaluator; + /** - * Tests the {@link ExpressionEvaluator} using a Spring EL based implementation capable of - * dereferencing Spring beans. + * Tests the {@link ExpressionEvaluator} using a Spring EL based implementation + * capable of dereferencing Spring beans. * * @author tknall * diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/CreateSaml1AssertionTask.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/CreateSaml1AssertionTask.java index c699f093..f29fa265 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/CreateSaml1AssertionTask.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/CreateSaml1AssertionTask.java @@ -22,15 +22,17 @@ package at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task; import java.io.IOException; import java.io.InputStream; import java.util.Objects; -import at.gv.egiz.eaaf.core.api.IRequest; -import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; -import at.gv.egiz.eaaf.core.api.idp.process.Task; -import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; + import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import at.gv.egiz.eaaf.core.api.IRequest; +import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; +import at.gv.egiz.eaaf.core.api.idp.process.Task; +import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; + /** * A dummy task simulating the creation of a SAML1 assertion. *

@@ -61,11 +63,11 @@ public class CreateSaml1AssertionTask implements Task { public IRequest execute(final IRequest penReq, final ExecutionContext executionContext) throws TaskExecutionException { Objects.requireNonNull(executionContext.get("IdentityLink")); - assert (Boolean.TRUE - .equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated")))); + assert Boolean.TRUE + .equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated"))); Objects.requireNonNull(executionContext.get("SignedAuthBlock")); - assert (Boolean.TRUE - .equals(Objects.requireNonNull(executionContext.get("isSignedAuthBlockValidated")))); + assert Boolean.TRUE + .equals(Objects.requireNonNull(executionContext.get("isSignedAuthBlockValidated"))); log.debug("Using IdentityLink and signed auth block in order to create SAML1 assertion."); diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/GetIdentityLinkTask.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/GetIdentityLinkTask.java index 93fcf6db..b4f3d7c8 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/GetIdentityLinkTask.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/GetIdentityLinkTask.java @@ -22,15 +22,17 @@ package at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task; import java.io.IOException; import java.io.InputStream; import java.util.Objects; -import at.gv.egiz.eaaf.core.api.IRequest; -import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; -import at.gv.egiz.eaaf.core.api.idp.process.Task; -import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; + import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import at.gv.egiz.eaaf.core.api.IRequest; +import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; +import at.gv.egiz.eaaf.core.api.idp.process.Task; +import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; + /** * A dummy task simulating the retrieval of an IdentityLink. *

diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/SelectBkuTask.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/SelectBkuTask.java index a6e2ac2c..4d1edd53 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/SelectBkuTask.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/SelectBkuTask.java @@ -19,13 +19,14 @@ package at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task; -import at.gv.egiz.eaaf.core.api.IRequest; -import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; -import at.gv.egiz.eaaf.core.api.idp.process.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import at.gv.egiz.eaaf.core.api.IRequest; +import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; +import at.gv.egiz.eaaf.core.api.idp.process.Task; + /** * A dummy task simulating a bku selection. *

diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/SignAuthBlockTask.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/SignAuthBlockTask.java index 41beefc8..16c375c9 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/SignAuthBlockTask.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/SignAuthBlockTask.java @@ -22,15 +22,17 @@ package at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task; import java.io.IOException; import java.io.InputStream; import java.util.Objects; -import at.gv.egiz.eaaf.core.api.IRequest; -import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; -import at.gv.egiz.eaaf.core.api.idp.process.Task; -import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; + import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import at.gv.egiz.eaaf.core.api.IRequest; +import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; +import at.gv.egiz.eaaf.core.api.idp.process.Task; +import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; + /** * A dummy task simulating the signature of an auth block. *

@@ -62,8 +64,8 @@ public class SignAuthBlockTask implements Task { public IRequest execute(final IRequest penReq, final ExecutionContext executionContext) throws TaskExecutionException { Objects.requireNonNull(executionContext.get("IdentityLink")); - assert (Boolean.TRUE - .equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated")))); + 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."); diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/ValidateIdentityLinkTask.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/ValidateIdentityLinkTask.java index 1a2cf5ee..be1bfb01 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/ValidateIdentityLinkTask.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/ValidateIdentityLinkTask.java @@ -20,13 +20,15 @@ package at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task; import java.util.Objects; -import at.gv.egiz.eaaf.core.api.IRequest; -import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; -import at.gv.egiz.eaaf.core.api.idp.process.Task; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import at.gv.egiz.eaaf.core.api.IRequest; +import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; +import at.gv.egiz.eaaf.core.api.idp.process.Task; + /** * Dummy task simulating the validation of an IdentityLink. *

diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/ValidateSignedAuthBlockTask.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/ValidateSignedAuthBlockTask.java index f07920cd..6e42d19c 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/ValidateSignedAuthBlockTask.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/task/ValidateSignedAuthBlockTask.java @@ -20,13 +20,15 @@ package at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task; import java.util.Objects; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + import at.gv.egiz.eaaf.core.api.IRequest; import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; import at.gv.egiz.eaaf.core.api.idp.process.Task; import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; /** * A dummy task simulating the validation of an auth block. @@ -57,8 +59,8 @@ public class ValidateSignedAuthBlockTask implements Task { public IRequest execute(final IRequest penReq, final ExecutionContext executionContext) throws TaskExecutionException { Objects.requireNonNull(executionContext.get("IdentityLink")); - assert (Boolean.TRUE - .equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated")))); + assert Boolean.TRUE + .equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated"))); Objects.requireNonNull(executionContext.get("SignedAuthBlock")); log.debug( diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/BooleanStringExpressionEvaluator.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/BooleanStringExpressionEvaluator.java index aa079f86..4540a01d 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/BooleanStringExpressionEvaluator.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/BooleanStringExpressionEvaluator.java @@ -20,9 +20,11 @@ package at.gv.egiz.eaaf.core.impl.idp.process.test; import java.util.Objects; + +import org.apache.commons.lang3.BooleanUtils; + import at.gv.egiz.eaaf.core.api.idp.process.ExpressionEvaluationContext; import at.gv.egiz.eaaf.core.api.idp.process.ExpressionEvaluator; -import org.apache.commons.lang3.BooleanUtils; /** * Expression evaluator that guesses the boolean value from a String. Refer to diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/HalloWeltTask.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/HalloWeltTask.java index 40892476..eadb023d 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/HalloWeltTask.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/HalloWeltTask.java @@ -19,10 +19,11 @@ package at.gv.egiz.eaaf.core.impl.idp.process.test; +import org.springframework.stereotype.Service; + import at.gv.egiz.eaaf.core.api.IRequest; import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; import at.gv.egiz.eaaf.core.api.idp.process.Task; -import org.springframework.stereotype.Service; /** * Simple task that just outputs a "Hallo World" text to the console. diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/HelloWorldTask.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/HelloWorldTask.java index ce49e33d..e3e01b90 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/HelloWorldTask.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/HelloWorldTask.java @@ -19,10 +19,11 @@ package at.gv.egiz.eaaf.core.impl.idp.process.test; +import org.springframework.stereotype.Service; + import at.gv.egiz.eaaf.core.api.IRequest; import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; import at.gv.egiz.eaaf.core.api.idp.process.Task; -import org.springframework.stereotype.Service; /** * Simple task that just outputs a "Hello World" text to the console. diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ProcessDefinitionParserTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ProcessDefinitionParserTest.java index 2238ad09..56259663 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ProcessDefinitionParserTest.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ProcessDefinitionParserTest.java @@ -24,8 +24,12 @@ 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.egiz.eaaf.core.impl.idp.process.ProcessDefinitionParser; import at.gv.egiz.eaaf.core.impl.idp.process.ProcessDefinitionParserException; import at.gv.egiz.eaaf.core.impl.idp.process.model.EndEvent; @@ -34,7 +38,6 @@ import at.gv.egiz.eaaf.core.impl.idp.process.model.ProcessNode; import at.gv.egiz.eaaf.core.impl.idp.process.model.StartEvent; import at.gv.egiz.eaaf.core.impl.idp.process.model.TaskInfo; import at.gv.egiz.eaaf.core.impl.idp.process.model.Transition; -import org.junit.Test; public class ProcessDefinitionParserTest { diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ProcessEngineTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ProcessEngineTest.java index 9e8ce781..7ce4c6b3 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ProcessEngineTest.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ProcessEngineTest.java @@ -22,16 +22,10 @@ package at.gv.egiz.eaaf.core.impl.idp.process.test; import static at.gv.egiz.eaaf.core.impl.idp.process.ProcessInstanceState.NOT_STARTED; import static at.gv.egiz.eaaf.core.impl.idp.process.ProcessInstanceState.SUSPENDED; import static org.junit.Assert.assertEquals; + import java.io.IOException; import java.io.InputStream; -import at.gv.egiz.eaaf.core.api.idp.process.ProcessEngine; -import at.gv.egiz.eaaf.core.exceptions.ProcessExecutionException; -import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; -import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl; -import at.gv.egiz.eaaf.core.impl.idp.process.ProcessDefinitionParser; -import at.gv.egiz.eaaf.core.impl.idp.process.ProcessDefinitionParserException; -import at.gv.egiz.eaaf.core.impl.idp.process.ProcessEngineImpl; -import at.gv.egiz.eaaf.core.impl.idp.process.ProcessInstance; + import org.apache.commons.lang3.RandomStringUtils; import org.junit.Assert; import org.junit.Before; @@ -42,6 +36,15 @@ import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import at.gv.egiz.eaaf.core.api.idp.process.ProcessEngine; +import at.gv.egiz.eaaf.core.exceptions.ProcessExecutionException; +import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; +import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl; +import at.gv.egiz.eaaf.core.impl.idp.process.ProcessDefinitionParser; +import at.gv.egiz.eaaf.core.impl.idp.process.ProcessDefinitionParserException; +import at.gv.egiz.eaaf.core.impl.idp.process.ProcessEngineImpl; +import at.gv.egiz.eaaf.core.impl.idp.process.ProcessInstance; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml") public class ProcessEngineTest { @@ -57,7 +60,7 @@ public class ProcessEngineTest { /** * jUnit test set-up. * - * @throws IOException in case of an error + * @throws IOException in case of an error * @throws ProcessDefinitionParserException in case of an error */ @Before @@ -203,7 +206,6 @@ public class ProcessEngineTest { "Wrong Exception in TaskExecutionException"); } - } @Test @@ -229,7 +231,6 @@ public class ProcessEngineTest { } - } @Test(expected = IllegalArgumentException.class) diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/StopProcessFlagTask.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/StopProcessFlagTask.java index 2ef58729..e2fd80a8 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/StopProcessFlagTask.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/StopProcessFlagTask.java @@ -19,10 +19,11 @@ package at.gv.egiz.eaaf.core.impl.idp.process.test; +import org.springframework.stereotype.Service; + import at.gv.egiz.eaaf.core.api.IRequest; import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; import at.gv.egiz.eaaf.core.api.idp.process.Task; -import org.springframework.stereotype.Service; /** * Simple task that just outputs a "Hello World" text to the console. diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ThrowExceptionTask.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ThrowExceptionTask.java index 639121d6..759e3460 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ThrowExceptionTask.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/test/ThrowExceptionTask.java @@ -19,11 +19,12 @@ package at.gv.egiz.eaaf.core.impl.idp.process.test; +import org.springframework.stereotype.Service; + import at.gv.egiz.eaaf.core.api.IRequest; import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; import at.gv.egiz.eaaf.core.api.idp.process.Task; import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; -import org.springframework.stereotype.Service; /** * Simple task that just outputs a "Hello World" text to the console. -- cgit v1.2.3