pespin submitted this change.

View Change

stp: Rename STP_Tests.ttcn -> STP_Tests_IPA_M3UA.ttcn

The previous name usually causes confusion since it seems to indicate
either:
* Some sort of common placeholder for STP_Tests_IPA and STP_Tests_M3UA
  (it's not the case, we already have STP_Tests_Common.ttcn for that)
* A placeholder for tests not IPA or M3UA related (it's not the case,
  since it only contains IPA<->M3UA tests).

Hence, rename it to denote better the aim of that file, ie. testing
forwarding between IPA and M3UA AS(P)s.

Change-Id: Id2963407adf11add01630c3899a062d764c8ad75
---
M stp/README.md
M stp/STP_Tests.cfg
M stp/STP_Tests_Common.ttcn
M stp/STP_Tests_IPA.ttcn
R stp/STP_Tests_IPA_M3UA.ttcn
M stp/STP_Tests_M3UA.ttcn
M stp/expected-results.xml
7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/stp/README.md b/stp/README.md
index 20a42b5..d79b741 100644
--- a/stp/README.md
+++ b/stp/README.md
@@ -1,4 +1,4 @@
-# STP_Tests.ttcn
+# STP_Tests_*.ttcn
 
 * external interfaces
     * M3UA/SCTP (can emulate both client and server side)
@@ -9,7 +9,7 @@
 digraph G {
   rankdir=LR;
   STP [label="IUT\nosmo-stp",shape="box"];
-  ATS [label="ATS\nSTP_Tests.ttcn"];
+  ATS [label="ATS\nSTP_Tests_*.ttcn"];
 
   ATS -> STP [label="M3UA", dir="both"];
   ATS -> STP [label="IPA", dir="both"];
diff --git a/stp/STP_Tests.cfg b/stp/STP_Tests.cfg
index 945ef8f..169185e 100644
--- a/stp/STP_Tests.cfg
+++ b/stp/STP_Tests.cfg
@@ -17,4 +17,4 @@
 [EXECUTE]
 STP_Tests_M3UA.control
 STP_Tests_IPA.control
-STP_Tests.control
+STP_Tests_IPA_M3UA.control
diff --git a/stp/STP_Tests_Common.ttcn b/stp/STP_Tests_Common.ttcn
index a540b10..463e935 100644
--- a/stp/STP_Tests_Common.ttcn
+++ b/stp/STP_Tests_Common.ttcn
@@ -10,9 +10,9 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-friend module STP_Tests;
 friend module STP_Tests_M3UA;
 friend module STP_Tests_IPA;
+friend module STP_Tests_IPA_M3UA;
 
 import from TELNETasp_PortType all;
 import from Osmocom_VTY_Functions all;
diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn
index ae7e1da..b7da439 100644
--- a/stp/STP_Tests_IPA.ttcn
+++ b/stp/STP_Tests_IPA.ttcn
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-friend module STP_Tests;
+friend module STP_Tests_IPA_M3UA;
 
 import from General_Types all;
 import from Osmocom_Types all;
diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn
similarity index 99%
rename from stp/STP_Tests.ttcn
rename to stp/STP_Tests_IPA_M3UA.ttcn
index b7f6ec1..08ca5aa 100644
--- a/stp/STP_Tests.ttcn
+++ b/stp/STP_Tests_IPA_M3UA.ttcn
@@ -1,4 +1,4 @@
-module STP_Tests {
+module STP_Tests_IPA_M3UA {
 
 /* Osmocom STP test suite in in TTCN-3
  * (C) 2019 Harald Welte <laforge@gnumonks.org>
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 0d2e87d..eddd0b1 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-friend module STP_Tests;
+friend module STP_Tests_IPA_M3UA;
 
 import from General_Types all;
 import from Osmocom_Types all;
diff --git a/stp/expected-results.xml b/stp/expected-results.xml
index dbe97bf..c0fb22f 100644
--- a/stp/expected-results.xml
+++ b/stp/expected-results.xml
@@ -52,8 +52,8 @@
   <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_roundrobin' time='MASKED'/>
   <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_sls' time='MASKED'/>
   <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_loadshare' time='MASKED'/>
-  <testcase classname='STP_Tests' name='TC_m3ua_to_ipa' time='MASKED'/>
-  <testcase classname='STP_Tests' name='TC_ipa_to_m3ua' time='MASKED'/>
-  <testcase classname='STP_Tests' name='TC_ipa_to_m3ua_ni' time='MASKED'/>
-  <testcase classname='STP_Tests' name='TC_ipa_to_m3ua_patch_sccp' time='MASKED'/>
+  <testcase classname='STP_Tests_IPA_M3UA' name='TC_m3ua_to_ipa' time='MASKED'/>
+  <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua' time='MASKED'/>
+  <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua_ni' time='MASKED'/>
+  <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua_patch_sccp' time='MASKED'/>
 </testsuite>

To view, visit change 40308. To unsubscribe, or for help writing mail filters, visit settings.