Browse Source

Generated java code uses FQN state names.
Refactoring of SCTUnit java testcase generator.
Refactoring of testcases.

markus.muehlbrandt@gmail.com 13 years ago
parent
commit
714290ac63

+ 1 - 1
examples/org.yakindu.sct.examples.trafficlight/GenModelJava.sgen

@@ -1,6 +1,6 @@
 GeneratorModel for yakindu::java {
 
-	statechart  TrafficLightWaiting {
+	statechart TrafficLightWaiting {
 	 	
 		feature Outlet {
 			targetProject = "org.yakindu.sct.examples.trafficlight"

+ 47 - 0
examples/org.yakindu.sct.examples.trafficlight/src-gen/org/yakindu/sct/examples/trafficlight/cyclebased/trafficlightwaiting/ITrafficLightWaitingStatemachine.java

@@ -0,0 +1,47 @@
+package org.yakindu.sct.examples.trafficlight.cyclebased.trafficlightwaiting;
+
+import org.yakindu.sct.examples.trafficlight.cyclebased.IStatemachine;
+import org.yakindu.sct.examples.trafficlight.cyclebased.ITimedStatemachine;
+
+public interface ITrafficLightWaitingStatemachine
+		extends
+			ITimedStatemachine,
+			IStatemachine {
+
+	public interface SCITrafficLight {
+
+		public boolean getRed();
+		public void setRed(boolean value);
+		public boolean getYellow();
+		public void setYellow(boolean value);
+		public boolean getGreen();
+		public void setGreen(boolean value);
+
+	}
+
+	public interface SCIPedestrian {
+
+		public boolean getRequest();
+		public void setRequest(boolean value);
+		public boolean getRed();
+		public void setRed(boolean value);
+		public boolean getGreen();
+		public void setGreen(boolean value);
+
+	}
+
+	public interface SCIDefault {
+
+		public void raisePedestrianRequest();
+
+		public void raiseOnOff();
+
+	}
+
+	public SCITrafficLight getSCITrafficLight();
+
+	public SCIPedestrian getSCIPedestrian();
+
+	public SCIDefault getSCIDefault();
+
+}

File diff suppressed because it is too large
+ 1293 - 0
examples/org.yakindu.sct.examples.trafficlight/src-gen/org/yakindu/sct/examples/trafficlight/cyclebased/trafficlightwaiting/TrafficLightWaitingStatemachine.java


+ 10 - 10
examples/org.yakindu.sct.examples.trafficlight/src/org/yakindu/sct/examples/java/trafficlight/CrossingDemoCycleBased.java

@@ -11,7 +11,7 @@
 package org.yakindu.sct.examples.java.trafficlight;
 
 import org.yakindu.sct.examples.trafficlight.cyclebased.TimerService;
-import org.yakindu.sct.examples.trafficlight.cyclebased.trafficlightwaiting.TrafficlightwaitingStatemachine;
+import org.yakindu.sct.examples.trafficlight.cyclebased.trafficlightwaiting.TrafficLightWaitingStatemachine;
 
 /**
  * Example to show how to integrate the generated statemachine code into
@@ -24,7 +24,7 @@ import org.yakindu.sct.examples.trafficlight.cyclebased.trafficlightwaiting.Traf
 
 public class CrossingDemoCycleBased extends CrossingDemoBase {
 
-	private TrafficlightwaitingStatemachine statemachine;
+	private TrafficLightWaitingStatemachine statemachine;
 
 	public static void main(String[] args) {
 
@@ -34,7 +34,7 @@ public class CrossingDemoCycleBased extends CrossingDemoBase {
 	@Override
 	protected void setUpAndRunStatemachine() {
 
-		statemachine = new TrafficlightwaitingStatemachine();
+		statemachine = new TrafficLightWaitingStatemachine();
 
 		Thread thread = new Thread() {
 			@Override
@@ -43,7 +43,7 @@ public class CrossingDemoCycleBased extends CrossingDemoBase {
 				// enterSequence. A default TimerHandler generated by the Java
 				// Generator is used in this case. You can add your own
 				// implementation of a TimerHandler. It has to implement the
-				// ITimerHandler interface.
+				// ITimerHandler Interface.
 				statemachine.setTimerService(new TimerService());
 				statemachine.enter();
 				while (!isInterrupted()) {
@@ -67,18 +67,18 @@ public class CrossingDemoCycleBased extends CrossingDemoBase {
 
 	@Override
 	protected void readStatemachineOutput() {
-		trafficLightFigure.setRed(statemachine.getInterfaceTrafficLight()
+		trafficLightFigure.setRed(statemachine.getSCITrafficLight()
 				.getRed());
-		trafficLightFigure.setYellow(statemachine.getInterfaceTrafficLight()
+		trafficLightFigure.setYellow(statemachine.getSCITrafficLight()
 				.getYellow());
-		trafficLightFigure.setGreen(statemachine.getInterfaceTrafficLight()
+		trafficLightFigure.setGreen(statemachine.getSCITrafficLight()
 				.getGreen());
 
-		pedestrianLightFigure.setWhite(statemachine.getInterfacePedestrian()
+		pedestrianLightFigure.setWhite(statemachine.getSCIPedestrian()
 				.getRequest());
-		pedestrianLightFigure.setRed(statemachine.getInterfacePedestrian()
+		pedestrianLightFigure.setRed(statemachine.getSCIPedestrian()
 				.getRed());
-		pedestrianLightFigure.setGreen(statemachine.getInterfacePedestrian()
+		pedestrianLightFigure.setGreen(statemachine.getSCIPedestrian()
 				.getGreen());
 	}