pcu: TC_stat_pdch_avail_occ: test gprs/egprs stats

Extend the test to verify that TTCN3.bts.0.pdch.occupied.gprs and
TTCN3.bts.0.pdch.occupied.egprs work as expected. These new stats are
needed for performance measurements in 3GPP TS 52.402 ยง B.2.1.54-55.

Related: SYS#4878
Depends: osmo-pcu I0c0a1121b4ae5f031782e7e63a0c28eb0b6c8b42
Change-Id: Ia98de17187810acb2e1b327c37beab79a0c211b8
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 6e6104b..07d35c3 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -6045,18 +6045,25 @@
 	/* 8 PDCHs available, 0 occupied */
 	var StatsDExpects expect := {
 		{ name := "TTCN3.bts.0.pdch.available", mtype := "g", min := 8, max := 8 },
-		{ name := "TTCN3.bts.0.pdch.occupied", mtype := "g", min := 0, max := 0 }
+		{ name := "TTCN3.bts.0.pdch.occupied", mtype := "g", min := 0, max := 0 },
+		{ name := "TTCN3.bts.0.pdch.occupied.gprs", mtype := "g", min := 0, max := 0 },
+		{ name := "TTCN3.bts.0.pdch.occupied.egprs", mtype := "g", min := 0, max := 0 }
 	};
 	f_statsd_expect(expect);
 
-	/* Establish an Uplink TBF for each GprsMS instance */
+	/* Establish an Uplink TBF for each GprsMS instance (3x GPRS, 1x EGPRS) */
 	f_multi_ms_bssgp_register();
-	f_multi_ms_establish_tbf(do_activate := false);
+	f_ms_establish_ul_tbf(g_ms[0]);
+	f_ms_establish_ul_tbf(g_ms[1]);
+	f_ms_establish_ul_tbf(g_ms[2]);
+	f_ms_establish_ul_tbf_2phase_access(g_ms[3], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[3].tlli, ms_racap_egprs_def));
 
 	/* 4 PDCHs occupied */
 	expect := {
 		{ name := "TTCN3.bts.0.pdch.available", mtype := "g", min := 8, max := 8 },
-		{ name := "TTCN3.bts.0.pdch.occupied", mtype := "g", min := 4, max := 4 }
+		{ name := "TTCN3.bts.0.pdch.occupied", mtype := "g", min := 4, max := 4 },
+		{ name := "TTCN3.bts.0.pdch.occupied.gprs", mtype := "g", min := 3, max := 3 },
+		{ name := "TTCN3.bts.0.pdch.occupied.egprs", mtype := "g", min := 1, max := 1 }
 	};
 	f_statsd_expect(expect);