Added testcases for negative verify statements (#1756)

* Added testcases for negative verify statements

* newly generated c test

* Don't initialize the callCount anymore

* Newly generated OperationsTest for cpp

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/sct/generator/java/test/OperationsTest.java

@@ -5,9 +5,7 @@ package org.yakindu.sct.generator.java.test;
 import static org.mockito.Mockito.*;
 import static org.mockito.Matchers.*;
 import static org.hamcrest.CoreMatchers.*;
-import org.yakindu.scr.operations.IOperationsStatemachine.*;
-import org.mockito.ArgumentCaptor;
-import static org.mockito.ArgumentCaptor.forClass;		
+import org.yakindu.scr.operations.IOperationsStatemachine.*;	
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.junit.*;
@@ -70,78 +68,123 @@ public class OperationsTest {
 		assertTrue(statemachine.isStateActive(State.main_region_B));
 		verify(internalMock, atLeastOnce()).internalOperation1();
 		 
-		ArgumentCaptor<Long> longCaptureinternalOperation2_6_0 = forClass(Long.class);
-		verify(internalMock, atLeastOnce()).internalOperation2(longCaptureinternalOperation2_6_0.capture());
-		assertThat(longCaptureinternalOperation2_6_0.getValue(), is(4l));
+		verify(internalMock, atLeastOnce()).internalOperation2((4l));
 		 
 		verify(internalMock, atLeastOnce()).internalOperation3();
 		 
-		ArgumentCaptor<Double> doubleCaptureinternalOperation3a_8_0 = forClass(Double.class);
-		verify(internalMock, atLeastOnce()).internalOperation3a(doubleCaptureinternalOperation3a_8_0.capture());
-		assertThat(doubleCaptureinternalOperation3a_8_0.getValue(), is(1.0));
+		verify(internalMock, atLeastOnce()).internalOperation3a((1.0));
 		 
 		verify(internalMock, atLeastOnce()).internalOperation4();
 		 
-		ArgumentCaptor<Long> longCaptureinternalOperation4a_10_0 = forClass(Long.class);
-		verify(internalMock, atLeastOnce()).internalOperation4a(longCaptureinternalOperation4a_10_0.capture());
-		assertThat(longCaptureinternalOperation4a_10_0.getValue(), is(5l));
+		verify(internalMock, atLeastOnce()).internalOperation4a((5l));
 		 
 		verify(internalMock, atLeastOnce()).internalOperation5();
 		 
-		ArgumentCaptor<String> stringCaptureinternalOperation5a_12_0 = forClass(String.class);
-		verify(internalMock, atLeastOnce()).internalOperation5a(stringCaptureinternalOperation5a_12_0.capture());
+		verify(internalMock, atLeastOnce()).internalOperation5a(anyString());
 		 
 		statemachine.raiseEv();
 		timer.cycleLeap(1);
 		assertTrue(statemachine.isStateActive(State.main_region_C));
 		verify(interface1Mock, atLeastOnce()).interfaceOperation1();
 		 
-		ArgumentCaptor<Long> longCaptureinterfaceOperation2_17_0 = forClass(Long.class);
-		verify(interface1Mock, atLeastOnce()).interfaceOperation2(longCaptureinterfaceOperation2_17_0.capture());
-		assertThat(longCaptureinterfaceOperation2_17_0.getValue(), is(4l));
+		verify(interface1Mock, atLeastOnce()).interfaceOperation2((4l));
 		 
 		verify(interface1Mock, atLeastOnce()).interfaceOperation3();
 		 
-		ArgumentCaptor<Double> doubleCaptureinterfaceOperation3a_19_0 = forClass(Double.class);
-		verify(interface1Mock, atLeastOnce()).interfaceOperation3a(doubleCaptureinterfaceOperation3a_19_0.capture());
-		assertThat(doubleCaptureinterfaceOperation3a_19_0.getValue(), is(1.0));
+		verify(interface1Mock, atLeastOnce()).interfaceOperation3a((1.0));
 		 
 		verify(interface1Mock, atLeastOnce()).interfaceOperation4();
 		 
-		ArgumentCaptor<Long> longCaptureinterfaceOperation4a_21_0 = forClass(Long.class);
-		verify(interface1Mock, atLeastOnce()).interfaceOperation4a(longCaptureinterfaceOperation4a_21_0.capture());
-		assertThat(longCaptureinterfaceOperation4a_21_0.getValue(), is(5l));
+		verify(interface1Mock, atLeastOnce()).interfaceOperation4a((5l));
 		 
 		verify(interface1Mock, atLeastOnce()).interfaceOperation5();
 		 
-		ArgumentCaptor<String> stringCaptureinterfaceOperation5a_23_0 = forClass(String.class);
-		verify(interface1Mock, atLeastOnce()).interfaceOperation5a(stringCaptureinterfaceOperation5a_23_0.capture());
+		verify(interface1Mock, atLeastOnce()).interfaceOperation5a(anyString());
 		 
 		statemachine.raiseEv();
 		timer.cycleLeap(1);
 		assertTrue(statemachine.isStateActive(State.main_region_D));
 		verify(defaultMock, atLeastOnce()).unnamedInterfaceOperation1();
 		 
-		ArgumentCaptor<Long> longCaptureunnamedInterfaceOperation2_28_0 = forClass(Long.class);
-		verify(defaultMock, atLeastOnce()).unnamedInterfaceOperation2(longCaptureunnamedInterfaceOperation2_28_0.capture());
-		assertThat(longCaptureunnamedInterfaceOperation2_28_0.getValue(), is(4l));
+		verify(defaultMock, atLeastOnce()).unnamedInterfaceOperation2((4l));
 		 
 		verify(defaultMock, atLeastOnce()).unnamedOperation3();
 		 
-		ArgumentCaptor<Double> doubleCaptureunnamedOperation3a_30_0 = forClass(Double.class);
-		verify(defaultMock, atLeastOnce()).unnamedOperation3a(doubleCaptureunnamedOperation3a_30_0.capture());
-		assertThat(doubleCaptureunnamedOperation3a_30_0.getValue(), is(1.0));
+		verify(defaultMock, atLeastOnce()).unnamedOperation3a((1.0));
 		 
 		verify(defaultMock, atLeastOnce()).unnamedOperation4();
 		 
-		ArgumentCaptor<Long> longCaptureunnamedOperation4a_32_0 = forClass(Long.class);
-		verify(defaultMock, atLeastOnce()).unnamedOperation4a(longCaptureunnamedOperation4a_32_0.capture());
-		assertThat(longCaptureunnamedOperation4a_32_0.getValue(), is(5l));
+		verify(defaultMock, atLeastOnce()).unnamedOperation4a((5l));
 		 
 		verify(defaultMock, atLeastOnce()).unnamedOperation5();
 		 
-		ArgumentCaptor<String> stringCaptureunnamedOperation5a_34_0 = forClass(String.class);
-		verify(defaultMock, atLeastOnce()).unnamedOperation5a(stringCaptureunnamedOperation5a_34_0.capture());
+		verify(defaultMock, atLeastOnce()).unnamedOperation5a(anyString());
+		 
+	}
+	@Test
+	public void operationsNotCalled() {
+		when(defaultMock.alwaysTrue()).thenAnswer(new Answer<Boolean>() {
+			@Override
+			public Boolean answer(InvocationOnMock invocation) {
+				return true;
+			}
+		});
+		 
+		statemachine.enter();
+		assertTrue(statemachine.isStateActive(State.main_region_A));
+		verify(internalMock, never()).internalOperation1();
+		 
+		verify(internalMock, never()).internalOperation2((4l));
+		 
+		verify(internalMock, never()).internalOperation3();
+		 
+		verify(internalMock, never()).internalOperation3a((1.0));
+		 
+		verify(internalMock, never()).internalOperation4();
+		 
+		verify(internalMock, never()).internalOperation4a((5l));
+		 
+		verify(internalMock, never()).internalOperation5();
+		 
+		verify(internalMock, never()).internalOperation5a(anyString());
+		 
+		statemachine.raiseEv();
+		timer.cycleLeap(1);
+		assertTrue(statemachine.isStateActive(State.main_region_B));
+		verify(interface1Mock, never()).interfaceOperation1();
+		 
+		verify(interface1Mock, never()).interfaceOperation2((4l));
+		 
+		verify(interface1Mock, never()).interfaceOperation3();
+		 
+		verify(interface1Mock, never()).interfaceOperation3a((1.0));
+		 
+		verify(interface1Mock, never()).interfaceOperation4();
+		 
+		verify(interface1Mock, never()).interfaceOperation4a((5l));
+		 
+		verify(interface1Mock, never()).interfaceOperation5();
+		 
+		verify(interface1Mock, never()).interfaceOperation5a(anyString());
+		 
+		statemachine.raiseEv();
+		timer.cycleLeap(1);
+		assertTrue(statemachine.isStateActive(State.main_region_C));
+		verify(defaultMock, never()).unnamedInterfaceOperation1();
+		 
+		verify(defaultMock, never()).unnamedInterfaceOperation2((4l));
+		 
+		verify(defaultMock, never()).unnamedOperation3();
+		 
+		verify(defaultMock, never()).unnamedOperation3a((1.0));
+		 
+		verify(defaultMock, never()).unnamedOperation4();
+		 
+		verify(defaultMock, never()).unnamedOperation4a((5l));
+		 
+		verify(defaultMock, never()).unnamedOperation5();
+		 
+		verify(defaultMock, never()).unnamedOperation5a(anyString());
 		 
 	}
 }

test-plugins/org.yakindu.sct.test.models/tests/OperationsTest.sctunit

@@ -9,11 +9,11 @@ testclass OperationsTest for statechart Operations {
 
 		assert active ( Operations.main_region.B )
 		assert called internalOperation1 
-		assert called InternalOperation2 with ( 4 )
+		assert called InternalOperation2(4)
 		assert called internalOperation3 
-		assert called internalOperation3a with (1.0)
+		assert called internalOperation3a(1.0)
 		assert called internalOperation4
-		assert called internalOperation4a with ( 5 )
+		assert called internalOperation4a(5)
 		assert called internalOperation5 
 		assert called internalOperation5a
 		
@@ -23,11 +23,11 @@ testclass OperationsTest for statechart Operations {
 
 		assert active(Operations.main_region.C)
 		assert called Interface1.interfaceOperation1  
-		assert called Interface1.InterfaceOperation2 with ( 4 ) 
+		assert called Interface1.InterfaceOperation2(4) 
 		assert called Interface1.interfaceOperation3
-		assert called Interface1.interfaceOperation3a with ( 1.0 )
+		assert called Interface1.interfaceOperation3a(1.0)
 		assert called Interface1.interfaceOperation4
-		assert called Interface1.interfaceOperation4a with ( 5 )
+		assert called Interface1.interfaceOperation4a(5)
 		assert called Interface1.interfaceOperation5
 		assert called Interface1.interfaceOperation5a
 		
@@ -37,14 +37,58 @@ testclass OperationsTest for statechart Operations {
 		
 		assert active(Operations.main_region.D)
 		assert called unnamedInterfaceOperation1 
-		assert called UnnamedInterfaceOperation2 with ( 4 )
+		assert called UnnamedInterfaceOperation2(4)
 		assert called unnamedOperation3 
-		assert called unnamedOperation3a with ( 1.0 )
+		assert called unnamedOperation3a(1.0)
 		assert called unnamedOperation4
-		assert called unnamedOperation4a with ( 5 )
+		assert called unnamedOperation4a(5)
 		assert called unnamedOperation5 
 		assert called unnamedOperation5a
 			
 	}
+	
+	@Test
+	operation operationsNotCalled (){
+		mock alwaysTrue returns ( true )
+		
+		enter
+
+		assert active ( Operations.main_region.A )
+		assert !called internalOperation1 
+		assert !called InternalOperation2(4)
+		assert !called internalOperation3 
+		assert !called internalOperation3a(1.0)
+		assert !called internalOperation4
+		assert !called internalOperation4a(5)
+		assert !called internalOperation5 
+		assert !called internalOperation5a
+		
+		raise ev
+		proceed 1 cycle
+
+		assert active(Operations.main_region.B)
+		assert !called Interface1.interfaceOperation1  
+		assert !called Interface1.InterfaceOperation2(4) 
+		assert !called Interface1.interfaceOperation3
+		assert !called Interface1.interfaceOperation3a(1.0)
+		assert !called Interface1.interfaceOperation4
+		assert !called Interface1.interfaceOperation4a(5)
+		assert !called Interface1.interfaceOperation5
+		assert !called Interface1.interfaceOperation5a
+		
+		raise ev
+		proceed 1 cycle
+		
+		assert active(Operations.main_region.C)
+		assert !called unnamedInterfaceOperation1 
+		assert !called UnnamedInterfaceOperation2(4)
+		assert !called unnamedOperation3 
+		assert !called unnamedOperation3a(1.0)
+		assert !called unnamedOperation4
+		assert !called unnamedOperation4a(5)
+		assert !called unnamedOperation5 
+		assert !called unnamedOperation5a
+			
+	}
 }