1 files changed, 23 insertions, 8 deletions

diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 6e36f68..dfd380d 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -131,7 +131,8 @@ module PCU_Tests {
 		log("NS Expected: ", b);
 
 		if (a != b) {
-			setverdict(fail);
+			setverdict(fail, "Values mismatch", a, b);
+			mtc.stop;
 		} else {
 			setverdict(pass);
 		}
@@ -188,7 +189,10 @@ module PCU_Tests {
 		alt {
 			[] BSSGP.receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { }
 			[] BSSGP.receive { repeat; }
-			[] T.timeout { setverdict(fail); }
+			[] T.timeout {
+				setverdict(fail, "Timeout establishing BSSGP connection");
+				mtc.stop;
+			}
 		}
 		T.stop
 		log("BSSGP successfully initialized");
@@ -233,7 +237,7 @@ module PCU_Tests {
 			[] L1.receive { repeat; }
 			[] T.timeout {
 				setverdict(fail, "Timeout establishing UL TBF");
-				self.stop;
+				mtc.stop;
 			}
 		}
 		T.stop;
@@ -275,6 +279,7 @@ function f_bssgp_wait_ul_ud(template BssgpDecoded bd_exp) runs on dummy_CT {
 		}
 	[] T.timeout {
 		setverdict(fail, "Timeout waiting for ", bd_exp);
+		mtc.stop;
 		}
 	}
 }
@@ -365,7 +370,8 @@ function f_ul_tbf(inout UlTbfState us) runs on dummy_CT {
 		log("LLC Expected: ", b);
 
 		if (a != b) {
-			setverdict(fail);
+			setverdict(fail, "LLC input ", b, " != expected ", a);
+			mtc.stop;
 		} else {
 			setverdict(pass);
 		}
@@ -437,7 +443,10 @@ function f_ul_tbf(inout UlTbfState us) runs on dummy_CT {
 		log("Dec: ", udb);
 		var octetstring enc := enc_RlcmacUlBlock(udb);
 		log("Enc: ", enc);
-		if (enc != buf) { setverdict(fail, "Re-encoded data doesn't equal input data"); }
+		if (enc != buf) {
+			setverdict(fail, "Re-encoded data doesn't equal input data");
+			mtc.stop;
+		}
 	}
 
 	function f_rlcmac_uld_decenc(in octetstring buf) {
@@ -447,7 +456,10 @@ function f_ul_tbf(inout UlTbfState us) runs on dummy_CT {
 		log("Dec: ", udb);
 		var octetstring enc := enc_RlcmacUlDataBlock(udb);
 		log("Enc: ", enc);
-		if (enc != buf) { setverdict(fail, "Re-encoded data doesn't equal input data"); }
+		if (enc != buf) {
+			setverdict(fail, "Re-encoded data doesn't equal input data");
+			mtc.stop;
+		}
 	}
 
 	function f_rlcmac_dld_decenc(in octetstring buf) {
@@ -457,7 +469,10 @@ function f_ul_tbf(inout UlTbfState us) runs on dummy_CT {
 		log("Dec: ", udb);
 		var octetstring enc := enc_RlcmacDlDataBlock(udb);
 		log("Enc: ", enc);
-		if (enc != buf) { setverdict(fail, "Re-encoded data doesn't equal input data"); }
+		if (enc != buf) {
+			setverdict(fail, "Re-encoded data doesn't equal input data");
+			mtc.stop;
+		}
 	}
 
 
@@ -561,7 +576,7 @@ function f_ul_tbf(inout UlTbfState us) runs on dummy_CT {
 		[] L1.receive { repeat };
 		[] T.timeout {
 			setverdict(fail, "Timeout waiting for IMM ASS")
-			self.stop;
+			mtc.stop;
 			}
 		}
 		T.stop;