Index: trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/SequenceInstanceOfTest.java
===================================================================
--- trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/SequenceInstanceOfTest.java	(revision 519)
+++ trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/SequenceInstanceOfTest.java	(revision 547)
@@ -25,6 +25,6 @@
 	@Test
 	public void TestIsCollectionOfSequences_1() throws Exception {
-		Collection<List<? extends Event<?>>> sequences = new LinkedList<List<? extends Event<?>>>();
-		List<Event<?>> sequence1 = new ArrayList<Event<?>>();
+		Collection<List<Event>> sequences = new LinkedList<List<Event>>();
+		List<Event> sequence1 = new ArrayList<Event>();
 		sequence1.add(new Event<String>("a"));
 		sequences.add(sequence1);
@@ -36,6 +36,6 @@
 	@Test
 	public void TestIsCollectionOfSequences_2() throws Exception {
-		Collection<List<? extends Event<?>>> sequences = new LinkedList<List<? extends Event<?>>>();
-		List<Event<?>> sequence1 = new ArrayList<Event<?>>();
+		Collection<List<Event>> sequences = new LinkedList<List<Event>>();
+		List<Event> sequence1 = new ArrayList<Event>();
 		sequences.add(sequence1);
 		
@@ -46,5 +46,5 @@
 	@Test
 	public void TestIsCollectionOfSequences_3() throws Exception {
-		Collection<List<? extends Event<?>>> sequences = new LinkedList<List<? extends Event<?>>>();
+		Collection<List<Event>> sequences = new LinkedList<List<Event>>();
 		
 		boolean result = SequenceInstanceOf.isCollectionOfSequences(sequences);
@@ -66,5 +66,5 @@
 	@Test
 	public void TestIsEventSequence_1() throws Exception {
-		List<Event<?>> sequence = new ArrayList<Event<?>>();
+		List<Event> sequence = new ArrayList<Event>();
 		sequence.add(new Event<String>("a"));
 		
@@ -75,5 +75,5 @@
 	@Test
 	public void TestIsEventSequence_2() throws Exception {
-		List<Event<?>> sequence = new ArrayList<Event<?>>();
+		List<Event> sequence = new ArrayList<Event>();
 		
 		boolean result = SequenceInstanceOf.isEventSequence(sequence);
Index: trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/EventTest.java
===================================================================
--- trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/EventTest.java	(revision 519)
+++ trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/EventTest.java	(revision 547)
@@ -1,17 +1,15 @@
+
 package de.ugoe.cs.quest.eventcore;
 
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 
 import org.junit.*;
 
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.eventcore.ReplayableEvent;
 
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 /**
- * The class <code>EventTest</code> contains tests for the class
- * <code>{@link Event}</code>.
+ * The class <code>EventTest</code> contains tests for the class <code>{@link Event}</code>.
  * 
  * @author Steffen Herbold
@@ -20,387 +18,214 @@
 public class EventTest {
 
-	@Test
-	public void testEvent_1() throws Exception {
-		String type = "typeString";
-
-		Event<String> result = new Event<String>(type);
-
-		assertNotNull(result);
-		assertEquals(type, result.type);
-		assertNull(result.target);
-		assertNull(result.targetShort);
-		assertEquals("", result.idInfo);
-	}
-
-	@Test(expected = java.security.InvalidParameterException.class)
-	public void testEvent_2() throws Exception {
-		new Event<String>(null);
-	}
-
-	@Test
-	public void testEquals_1() throws Exception {
-		String type1 = "typeString";
-		String type2 = "typeString";
-		Event<String> fixture = new Event<String>(type1);
-		Event<String> other = new Event<String>(type2);
-
-		boolean result = fixture.equals(other);
-
-		assertTrue(result);
-	}
-
-	@Test
-	public void testEquals_2() throws Exception {
-		String type1 = "typeString1";
-		String type2 = "typeString2";
-		Event<String> fixture = new Event<String>(type1);
-		Event<String> other = new Event<String>(type2);
-
-		boolean result = fixture.equals(other);
-
-		assertFalse(result);
-	}
-
-	@Test
-	public void testEquals_3() throws Exception {
-		String type1 = "typeString";
-		String type2 = "typeString";
-		String target1 = "target";
-		String target2 = "target";
-		Event<String> fixture = new Event<String>(type1);
-		fixture.target = target1;
-		Event<String> other = new Event<String>(type2);
-		other.target = target2;
-
-		boolean result = fixture.equals(other);
-
-		assertTrue(result);
-	}
-
-	@Test
-	public void testEquals_4() throws Exception {
-		String type1 = "typeString1";
-		String type2 = "typeString2";
-		String target1 = "target";
-		String target2 = "target";
-		Event<String> fixture = new Event<String>(type1);
-		fixture.target = target1;
-		Event<String> other = new Event<String>(type2);
-		other.target = target2;
-
-		boolean result = fixture.equals(other);
-
-		assertFalse(result);
-	}
-
-	@Test
-	public void testEquals_5() throws Exception {
-		String type1 = "typeString";
-		String type2 = "typeString";
-		String target1 = "target1";
-		String target2 = "target2";
-		Event<String> fixture = new Event<String>(type1);
-		fixture.target = target1;
-		Event<String> other = new Event<String>(type2);
-		other.target = target2;
-
-		boolean result = fixture.equals(other);
-
-		assertFalse(result);
-	}
-
-	@Test
-	public void testEquals_6() throws Exception {
-		String type = "typeString";
-		Event<String> fixture = new Event<String>(type);
-
-		boolean result = fixture.equals(fixture);
-
-		assertTrue(result);
-	}
-
-	@Test
-	public void testEqualsContract() throws Exception {
-		EqualsVerifier.forClass(Event.class)
-				.suppress(Warning.NONFINAL_FIELDS).withRedefinedSubclass(ReplayableEvent.class)
-				.verify();
-	}
-
-	@Test
-	public void testGetIdInfo_fixture_1() throws Exception {
-		String type = "typeString";
-		String idInfo = "idInfoString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.idInfo = idInfo;
-
-		String result = fixture.getIdInfo();
-
-		assertEquals(idInfo, result);
-	}
-
-	@Test
-	public void testGetShortId_1() throws Exception {
-		String type = "typeString";
-		String targetShort = "targetShortString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.targetShort = targetShort;
-
-		String result = fixture.getShortId();
-
-		assertEquals("targetShortString.typeString", result);
-	}
-
-	@Test
-	public void testGetShortId_2() throws Exception {
-		String type = "typeString";
-		String targetShort = "targetShortString";
-		String idInfo = "idInfoString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.targetShort = targetShort;
-		fixture.idInfo = idInfo;
-
-		String result = fixture.getShortId();
-
-		assertEquals("targetShortString.typeString.idInfoString", result);
-	}
-
-	@Test
-	public void testGetShortId_3() throws Exception {
-		String type = "typeString";
-		String target = "targetString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.target = target;
-
-		String result = fixture.getShortId();
-
-		assertEquals("targetString.typeString", result);
-	}
-
-	@Test
-	public void testGetStandardId_1() throws Exception {
-		String type = "typeString";
-		String target = "targetString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.target = target;
-
-		String result = fixture.getStandardId();
-
-		assertEquals("targetString.typeString", result);
-	}
-
-	@Test
-	public void testGetStandardId_2() throws Exception {
-		String type = "typeString";
-		String target = "targetString";
-		String idInfo = "idInfoString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.target = target;
-		fixture.idInfo = idInfo;
-
-		String result = fixture.getStandardId();
-
-		assertEquals("targetString.typeString.idInfoString", result);
-	}
-
-	@Test
-	public void testGetStandardId_3() throws Exception {
-		String type = "typeString";
-		Event<String> fixture = new Event<String>(type);
-
-		String result = fixture.getStandardId();
-
-		assertEquals("typeString", result);
-	}
-
-	@Test
-	public void testGetStandardId_4() throws Exception {
-		String type = "typeString";
-		String idInfo = "idInfoString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.idInfo = idInfo;
-
-		String result = fixture.getStandardId();
-
-		assertEquals("typeString.idInfoString", result);
-	}
-
-	@Test
-	public void testGetTarget_1() throws Exception {
-		String type = "typeString";
-		String target = "targetString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.target = target;
-
-		String result = fixture.getTarget();
-
-		assertEquals(target, result);
-	}
-
-	@Test
-	public void testGetTarget_2() throws Exception {
-		String type = "typeString";
-		Event<String> fixture = new Event<String>(type);
-
-		String result = fixture.getTarget();
-
-		assertNull(result);
-	}
-
-	@Test
-	public void testGetTargetShort_1() throws Exception {
-		String type = "typeString";
-		String targetShort = "targetShort";
-		Event<String> fixture = new Event<String>(type);
-		fixture.targetShort = targetShort;
-
-		String result = fixture.getTargetShort();
-
-		assertEquals(targetShort, result);
-	}
-
-	@Test
-	public void testGetTargetShort_2() throws Exception {
-		String type = "typeString";
-		Event<String> fixture = new Event<String>(type);
-
-		String result = fixture.getTargetShort();
-
-		assertNull(result);
-	}
-
-	@Test
-	public void testGetType_1() throws Exception {
-		String type = "typeString";
-		Event<String> fixture = new Event<String>(type);
-
-		String result = fixture.getType();
-
-		assertEquals(type, result);
-	}
-
-	@Test
-	public void testSetIdInfo_fixture_1() throws Exception {
-		String type = "typeString";
-		String idInfo = "idInfoString";
-		Event<String> fixture = new Event<String>(type);
-
-		fixture.setIdInfo(idInfo);
-
-		assertEquals(idInfo, fixture.idInfo);
-	}
-
-	@Test
-	public void testSetIdInfo_2() throws Exception {
-		String type = "typeString";
-		String idInfo = null;
-		Event<String> fixture = new Event<String>(type);
-
-		fixture.setIdInfo(idInfo);
-
-		assertEquals(idInfo, fixture.idInfo);
-	}
-
-	@Test
-	public void testSetTarget_1() throws Exception {
-		String type = "typeString";
-		String target = "targetString";
-		Event<String> fixture = new Event<String>(type);
-
-		boolean result = fixture.setTarget(target);
-
-		assertTrue(result);
-		assertEquals(target, fixture.target);
-	}
-
-	@Test
-	public void testSetTarget_2() throws Exception {
-		String type = "typeString";
-		String target1 = "targetString1";
-		String target2 = "targetString2";
-		Event<String> fixture = new Event<String>(type);
-		fixture.target = target1;
-
-		boolean result = fixture.setTarget(target2);
-
-		assertFalse(result);
-		assertEquals(target1, fixture.target);
-	}
-
-	@Test
-	public void testSetTargetShort_1() throws Exception {
-		String type = "typeString";
-		String targetShort = "targetShortString";
-		Event<String> fixture = new Event<String>(type);
-
-		boolean result = fixture.setTargetShort(targetShort);
-
-		assertTrue(result);
-		assertEquals(targetShort, fixture.targetShort);
-	}
-
-	@Test
-	public void testSetTargetShort_2() throws Exception {
-		String type = "typeString";
-		String targetShort1 = "targetShortString1";
-		String targetShort2 = "targetShortString2";
-		Event<String> fixture = new Event<String>(type);
-		fixture.targetShort = targetShort1;
-
-		boolean result = fixture.setTargetShort(targetShort2);
-
-		assertFalse(result);
-		assertEquals(targetShort1, fixture.targetShort);
-	}
-
-	@Test
-	public void testToString_1() throws Exception {
-		String type = "typeString";
-		String target = "targetString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.target = target;
-
-		String result = fixture.toString();
-
-		assertEquals("targetString.typeString", result);
-	}
-
-	@Test
-	public void testToString_2() throws Exception {
-		String type = "typeString";
-		String target = "targetString";
-		String idInfo = "idInfoString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.target = target;
-		fixture.idInfo = idInfo;
-
-		String result = fixture.toString();
-
-		assertEquals("targetString.typeString.idInfoString", result);
-	}
-
-	@Test
-	public void testToString_3() throws Exception {
-		String type = "typeString";
-		Event<String> fixture = new Event<String>(type);
-
-		String result = fixture.toString();
-
-		assertEquals("typeString", result);
-	}
-
-	@Test
-	public void testToString_4() throws Exception {
-		String type = "typeString";
-		String idInfo = "idInfoString";
-		Event<String> fixture = new Event<String>(type);
-		fixture.idInfo = idInfo;
-
-		String result = fixture.toString();
-
-		assertEquals("typeString.idInfoString", result);
-	}
-
-	public static void main(String[] args) {
-		new org.junit.runner.JUnitCore().run(EventTest.class);
-	}
+    @Test
+    public void testEvent_1() throws Exception {
+        Event result = new Event(mock(IEventType.class));
+
+        assertNotNull(result);
+    }
+
+    @Test(expected = java.security.InvalidParameterException.class)
+    public void testEvent_2() throws Exception {
+        new Event(null);
+    }
+
+    /*
+    @Test
+    public void testEquals_1() throws Exception {
+        IEventType type1 = mock(IEventType.class);
+        IEventType type2 = mock(IEventType.class);
+        // when(type1.equals(type2)).thenReturn(true);
+        Event fixture = new Event(type1);
+        Event other = new Event(type2);
+
+        boolean result = fixture.equals(other);
+
+        assertTrue(result);
+    }
+
+    @Test
+    public void testEquals_2() throws Exception {
+        String type1 = "typeString1";
+        String type2 = "typeString2";
+        Event fixture = new Event(type1);
+        Event other = new Event(type2);
+
+        boolean result = fixture.equals(other);
+
+        assertFalse(result);
+    }
+
+    @Test
+    public void testEquals_3() throws Exception {
+        String type1 = "typeString";
+        String type2 = "typeString";
+        String target1 = "target";
+        String target2 = "target";
+        Event fixture = new Event(type1);
+        fixture.target = target1;
+        Event other = new Event(type2);
+        other.target = target2;
+
+        boolean result = fixture.equals(other);
+
+        assertTrue(result);
+    }
+
+    @Test
+    public void testEquals_4() throws Exception {
+        String type1 = "typeString1";
+        String type2 = "typeString2";
+        String target1 = "target";
+        String target2 = "target";
+        Event fixture = new Event(type1);
+        fixture.target = target1;
+        Event other = new Event(type2);
+        other.target = target2;
+
+        boolean result = fixture.equals(other);
+
+        assertFalse(result);
+    }
+
+    @Test
+    public void testEquals_5() throws Exception {
+        String type1 = "typeString";
+        String type2 = "typeString";
+        String target1 = "target1";
+        String target2 = "target2";
+        Event fixture = new Event(type1);
+        fixture.target = target1;
+        Event other = new Event(type2);
+        other.target = target2;
+
+        boolean result = fixture.equals(other);
+
+        assertFalse(result);
+    }
+
+    @Test
+    public void testEquals_6() throws Exception {
+        String type = "typeString";
+        Event fixture = new Event(type);
+
+        boolean result = fixture.equals(fixture);
+
+        assertTrue(result);
+    }
+
+    @Test
+    public void testEqualsContract() throws Exception {
+        EqualsVerifier.forClass(Event.class).suppress(Warning.NONFINAL_FIELDS)
+            .withRedefinedSubclass(ReplayableEvent.class).verify();
+    }
+    */
+
+    @Test
+    public void testGetTarget_1() throws Exception {
+        IEventType type = mock(IEventType.class);
+        IEventTarget target = mock(IEventTarget.class);
+        
+        Event fixture = new Event(type);
+        fixture.setTarget(target);
+
+        IEventTarget result = fixture.getTarget();
+
+        assertSame(target, result);
+    }
+    
+    
+
+    @Test
+    public void testGetTarget_2() throws Exception {
+        IEventType type = mock(IEventType.class);
+        IEventTarget target = mock(IEventTarget.class);
+        
+        Event fixture = new Event(type, target);
+
+        IEventTarget result = fixture.getTarget();
+
+        assertSame(target, result);
+    }
+    
+    @Test
+    public void testGetTarget_3() throws Exception {
+        IEventType type = mock(IEventType.class);
+        
+        Event fixture = new Event(type);
+
+        IEventTarget result = fixture.getTarget();
+
+        assertNull(result);
+    }
+
+    @Test
+    public void testGetType_1() throws Exception {
+        IEventType type = mock(IEventType.class);
+        
+        Event fixture = new Event(type);
+
+        IEventType result = fixture.getType();
+
+        assertEquals(type, result);
+    }
+
+    @Test
+    public void testSetTarget_1() throws Exception {
+        IEventType type = mock(IEventType.class);
+        IEventTarget target = mock(IEventTarget.class);
+        
+        Event fixture = new Event(type);
+
+        boolean result = fixture.setTarget(target);
+
+        assertTrue(result);
+        assertEquals(target, fixture.getTarget());
+    }
+
+    @Test
+    public void testSetTarget_2() throws Exception {
+        IEventType type = mock(IEventType.class);
+        IEventTarget target1 = mock(IEventTarget.class);
+        IEventTarget target2 = mock(IEventTarget.class);
+        
+        Event fixture = new Event(type);
+
+        fixture.setTarget(target1);
+        boolean result = fixture.setTarget(target2);
+        
+        assertFalse(result);
+        assertEquals(target1, fixture.target);
+    }
+    
+    @Test
+    public void testSetTarget_3() throws Exception {
+        IEventType type = mock(IEventType.class);
+        IEventTarget target1 = mock(IEventTarget.class);
+        IEventTarget target2 = mock(IEventTarget.class);
+        
+        Event fixture = new Event(type, target1);
+
+        boolean result = fixture.setTarget(target2);
+        
+        assertFalse(result);
+        assertEquals(target1, fixture.target);
+    }
+
+    @Test
+    public void testToString_1() throws Exception {
+        IEventType type = mock(IEventType.class);
+        when(type.toString()).thenReturn("typeString");
+        IEventTarget target = mock(IEventTarget.class);
+        when(target.toString()).thenReturn("targetString");
+        
+        Event fixture = new Event(type, target);
+
+        String result = fixture.toString();
+
+        assertEquals("(typeString;targetString)", result);
+    }
+
+    public static void main(String[] args) {
+        new org.junit.runner.JUnitCore().run(EventTest.class);
+    }
 }
Index: trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/TestAll.java
===================================================================
--- trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/TestAll.java	(revision 519)
+++ 	(revision )
@@ -1,25 +1,0 @@
-package de.ugoe.cs.quest.eventcore;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * The class <code>TestAll</code> builds a suite that can be used to run all
- * of the tests within its package as well as within any subpackages of its
- * package.
- *
- * @author Steffen Herbold
- * @version 1.0
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	EventTest.class,
-	ReplayableEventTest.class
-})
-public class TestAll {
-
-	public static void main(String[] args) {
-		JUnitCore.runClasses(new Class[] { TestAll.class });
-	}
-}