From ebd3288b597a1ae9f374cf7a5b60114dd1d94a5b Mon Sep 17 00:00:00 2001
From: Tom Strassner <tstrassner@mitre.org>
Date: Thu, 21 Nov 2024 10:46:18 -0600
Subject: [PATCH] Resolve naming conflicts between static and adaptive tests

---
 .../adaptive_next_questionnaire_expressions_test.rb         | 6 +++---
 .../adaptive_next_questionnaire_extensions_test.rb          | 6 +++---
 .../payer_server_groups/payer_server_adaptive_group.rb      | 4 ++--
 .../static_form_questionnaire_expressions_test.rb           | 2 +-
 .../static_form_questionnaire_extensions_test.rb            | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/davinci_dtr_test_kit/payer_server_groups/adaptive_next_questionnaire_expressions_test.rb b/lib/davinci_dtr_test_kit/payer_server_groups/adaptive_next_questionnaire_expressions_test.rb
index 610d9e3..2551893 100644
--- a/lib/davinci_dtr_test_kit/payer_server_groups/adaptive_next_questionnaire_expressions_test.rb
+++ b/lib/davinci_dtr_test_kit/payer_server_groups/adaptive_next_questionnaire_expressions_test.rb
@@ -1,10 +1,10 @@
 require_relative '../cql_test'
 module DaVinciDTRTestKit
-  class PayerStaticFormExpressionsTest < Inferno::Test
+  class PayerAdaptiveNextQuestionExpressionsTest < Inferno::Test
     include DaVinciDTRTestKit::CQLTest
 
-    id :dtr_v201_payer_adaptive_next_form_expressions_test
-    title 'Questionnaire(s) contains items with expressions necessary for pre-population'
+    id :dtr_v201_payer_adaptive_next_question_expressions_test
+    title 'Adaptive Next Question questionnaire(s) contain items with expressions necessary for pre-population'
     description %(
       Inferno checks that the payer server response to $next-question operation has appropriate expressions and that
       expressions are written in cql.
diff --git a/lib/davinci_dtr_test_kit/payer_server_groups/adaptive_next_questionnaire_extensions_test.rb b/lib/davinci_dtr_test_kit/payer_server_groups/adaptive_next_questionnaire_extensions_test.rb
index f5b88ed..aa9cc28 100644
--- a/lib/davinci_dtr_test_kit/payer_server_groups/adaptive_next_questionnaire_extensions_test.rb
+++ b/lib/davinci_dtr_test_kit/payer_server_groups/adaptive_next_questionnaire_extensions_test.rb
@@ -1,10 +1,10 @@
 require_relative '../cql_test'
 module DaVinciDTRTestKit
-  class PayerStaticFormExtensionsTest < Inferno::Test
+  class PayerAdaptiveNexQuestionExtensionsTest < Inferno::Test
     include DaVinciDTRTestKit::CQLTest
 
-    id :dtr_v201_payer_adaptive_next_form_extensions_test
-    title 'Questionnaire(s) contains extensions necessary for pre-population'
+    id :dtr_v201_payer_adaptive_next_question_extensions_test
+    title 'Adaptive Next Question questionnaire(s) contain extensions necessary for pre-population'
     description %(
       Inferno checks that the payer server response has appropriate extensions and references to libraries within
       those extensions.
diff --git a/lib/davinci_dtr_test_kit/payer_server_groups/payer_server_adaptive_group.rb b/lib/davinci_dtr_test_kit/payer_server_groups/payer_server_adaptive_group.rb
index 37e306c..b03fb86 100644
--- a/lib/davinci_dtr_test_kit/payer_server_groups/payer_server_adaptive_group.rb
+++ b/lib/davinci_dtr_test_kit/payer_server_groups/payer_server_adaptive_group.rb
@@ -81,8 +81,8 @@ class DTRPayerServerAdaptiveQuestionnairePackageGroup < Inferno::TestGroup
 
     # pass request to payer server, validate adaptive questionnaire response
     test from: :payer_server_next_response_validation_test
-    test from: :dtr_v201_payer_adaptive_next_form_extensions_test
-    test from: :dtr_v201_payer_adaptive_next_form_expressions_test
+    test from: :dtr_v201_payer_adaptive_next_question_extensions_test
+    test from: :dtr_v201_payer_adaptive_next_question_expressions_test
     test from: :payer_server_adaptive_completion_test
   end
 end
diff --git a/lib/davinci_dtr_test_kit/payer_server_groups/static_form_questionnaire_expressions_test.rb b/lib/davinci_dtr_test_kit/payer_server_groups/static_form_questionnaire_expressions_test.rb
index 4d89ec3..42ae329 100644
--- a/lib/davinci_dtr_test_kit/payer_server_groups/static_form_questionnaire_expressions_test.rb
+++ b/lib/davinci_dtr_test_kit/payer_server_groups/static_form_questionnaire_expressions_test.rb
@@ -4,7 +4,7 @@ class PayerStaticFormExpressionsTest < Inferno::Test
     include DaVinciDTRTestKit::CQLTest
 
     id :dtr_v201_payer_static_form_expressions_test
-    title 'Questionnaire(s) contains items with expressions necessary for pre-population'
+    title 'Static questionnaire(s) contain items with expressions necessary for pre-population'
     description %(
       Inferno checks that the payer server response has appropriate expressions and that expressions are
        written in cql.
diff --git a/lib/davinci_dtr_test_kit/payer_server_groups/static_form_questionnaire_extensions_test.rb b/lib/davinci_dtr_test_kit/payer_server_groups/static_form_questionnaire_extensions_test.rb
index c270e31..d4d6945 100644
--- a/lib/davinci_dtr_test_kit/payer_server_groups/static_form_questionnaire_extensions_test.rb
+++ b/lib/davinci_dtr_test_kit/payer_server_groups/static_form_questionnaire_extensions_test.rb
@@ -4,7 +4,7 @@ class PayerStaticFormExtensionsTest < Inferno::Test
     include DaVinciDTRTestKit::CQLTest
 
     id :dtr_v201_payer_static_form_extensions_test
-    title 'Questionnaire(s) contains extensions necessary for pre-population'
+    title 'Static questionnaire(s) contain extensions necessary for pre-population'
     description %(
       Inferno checks that the payer server response has appropriate extensions and references to libraries within
       those extensions.