Behavior correction + Tests and bug fix

Author: AjroudRami

src/main/java/stateMachine/AbstractStateMachine.java

@@ -88,4 +88,8 @@ public void linkStates(){
             }
         }
     }
+
+    public void triggerEvent(String name) {
+        this.currentState = this.currentState.notifyEvent(name);
+    }
 }

src/main/java/stateMachine/Event.java

@@ -16,6 +16,7 @@ public enum Type {SEND, RAISE}
 
     public Event(String name){
         this.name = name;
+        this.type = Type.SEND;
         this.callables = new ArrayList<Callable>();
     }
 

src/main/java/stateMachine/EventHandler.java

@@ -23,7 +23,7 @@ public void run() {
         while(run){
             Event e = getNextEvent();
             if(e != null){
-                stateMachine.getCurrentState().notifyEvent(e.getName());
+                stateMachine.triggerEvent(e.getName());
             }
         }
     }

src/main/java/stateMachine/Transition.java

@@ -66,6 +66,7 @@ public Transition addTriggeredEvent(Event e){
     }
 
     public void trigger(){
+        System.out.println("Triggering transition");
         for(int i=0; i<sentEvents.size(); i++){
             sentEvents.get(i).trigger();
         }

src/test/java/integration/SimpleStateMachineTest.java

@@ -3,10 +3,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.xml.sax.SAXException;
-import stateMachine.AbstractStateMachine;
-import stateMachine.GStateMachine;
-import stateMachine.SCXMLToJava;
-import stateMachine.State;
+import stateMachine.*;
 
 import javax.tools.JavaCompiler;
 import javax.tools.ToolProvider;
@@ -95,12 +92,32 @@ public void testNBOfTransitions(){
     @Test
     public void testTransition(){
         List<State> states =  this.stateMachine.getStateList();
-        System.out.println(states.get(0).getTransitions().get(0));
         assertEquals(states.get(0).getTransitions().get(0).from(), states.get(0));
         assertEquals(states.get(0).getTransitions().get(0).to(), states.get(1));
 
         assertEquals(states.get(1).getTransitions().get(0).from(), states.get(1));
         assertEquals(states.get(1).getTransitions().get(0).to(), states.get(0));
 
     }
+
+    @Test
+    public void testSendingEvent(){
+        this.stateMachine.start();
+        this.stateMachine.notifyEvent(new Event("event1"));
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        assertEquals("State2", this.stateMachine.getCurrentState().getId());
+
+        this.stateMachine.start();
+        this.stateMachine.notifyEvent(new Event("event2"));
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        assertEquals("State1", this.stateMachine.getCurrentState().getId());
+    }
 }