Move const variable to test_case.rb because it is used in some utility files

ono-max · ono-max · commit 9819666f9640 · 2022-03-05T20:52:20.000+09:00
diff --git a/test/dap/boot_config_test.rb b/test/dap/boot_config_test.rb
@@ -20,7 +20,7 @@ class BootConfigTest1638611290 < TestCase
     def test_boot_configuration_works_correctly
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 1,
             type: "response",
diff --git a/test/dap/break_test.rb b/test/dap/break_test.rb
@@ -20,7 +20,7 @@ class BreakTest1638674577 < TestCase
     def test_break_works_correctly
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
@@ -846,7 +846,7 @@ class BreakTest1643981380 < TestCase
     def test_check_run_to_line_works_correctly
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/call_stack_test.rb b/test/dap/call_stack_test.rb
@@ -20,7 +20,7 @@ class CallStackTest1643805481 < TestCase
     def test_call_stack_works_correctly_1643805481
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/catch_test.rb b/test/dap/catch_test.rb
@@ -19,7 +19,7 @@ class CatchTest1643891417 < TestCase
     def test_catching_runtime_error_works_correctly_1643891417
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
@@ -388,7 +388,7 @@ class CatchTest1643892185 < TestCase
     def test_catching_any_exception_works_correctly
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/detach_test.rb b/test/dap/detach_test.rb
@@ -23,7 +23,7 @@ class DetachTest1639218122 < TestCase
     def test_1639218122
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/eval_test.rb b/test/dap/eval_test.rb
@@ -17,7 +17,7 @@ class EvalTest1643807667 < TestCase
     def test_eval_works_correctly_1643807667
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/finish_test.rb b/test/dap/finish_test.rb
@@ -20,7 +20,7 @@ class FinishTest1638674323 < TestCase
     def test_finish_works_correctly
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/hover_test.rb b/test/dap/hover_test.rb
@@ -16,7 +16,7 @@ class HoverTest1638791703 < TestCase
     def test_hover_works_correctly
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
@@ -880,7 +880,7 @@ class HoverTest1641198331 < TestCase
     def test_1641198331
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/next_test.rb b/test/dap/next_test.rb
@@ -20,7 +20,7 @@ class NextTest1638676688 < TestCase
     def test_next_works_correctly
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/restart_test.rb b/test/dap/restart_test.rb
@@ -23,7 +23,7 @@ class RestartTest1644070899 < TestCase
     def test_restart_works_correctly_1644070899
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/step_back_test.rb b/test/dap/step_back_test.rb
@@ -22,7 +22,7 @@ class StepBackTest1638698086 < TestCase
     def test_step_back_works_correctly
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/step_test.rb b/test/dap/step_test.rb
@@ -20,7 +20,7 @@ class StepTest1638676609 < TestCase
     def test_step_works_correctly
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/dap/watch_test.rb b/test/dap/watch_test.rb
@@ -18,7 +18,7 @@ class WatchTest1643810224 < TestCase
     def test_watch_works_correctly_1643810224
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           {
             seq: 7,
             type: "event",
diff --git a/test/support/dap_utils.rb b/test/support/dap_utils.rb
@@ -77,73 +77,6 @@ def create_protocol_msg test_info, fail_msg
       MSG
     end
 
-    INITIALIZE_MSG = [
-      {
-        seq: 1,
-        command: "initialize",
-        arguments: {
-          clientID: "vscode",
-          clientName: "Visual Studio Code",
-          adapterID: "rdbg",
-          pathFormat: "path",
-          linesStartAt1: true,
-          columnsStartAt1: true,
-          supportsVariableType: true,
-          supportsVariablePaging: true,
-          supportsRunInTerminalRequest: true,
-          locale: "en-us",
-          supportsProgressReporting: true,
-          supportsInvalidatedEvent: true,
-          supportsMemoryReferences: true
-        },
-        type: "request"
-      },
-      {
-        seq: 2,
-        command: "attach",
-        arguments: {
-          type: "rdbg",
-          name: "Attach with rdbg",
-          request: "attach",
-          rdbgPath: File.expand_path('../../exe/rdbg', __dir__),
-          debugPort: "/var/folders/kv/w1k6nh1x5fl7vx47b2pd005w0000gn/T/ruby-debug-sock-501/ruby-debug-naotto-8845",
-          autoAttach: true,
-          __sessionId: "141d9c79-3669-43ec-ac1f-e62598c5a65a"
-        },
-        type: "request"
-      },
-      {
-        seq: 3,
-        command: "setFunctionBreakpoints",
-        arguments: {
-          breakpoints: [
-
-          ]
-        },
-        type: "request"
-      },
-      {
-        seq: 4,
-        command: "setExceptionBreakpoints",
-        arguments: {
-          filters: [
-
-          ],
-          filterOptions: [
-            {
-              filterId: "RuntimeError"
-            }
-          ]
-        },
-        type: "request"
-      },
-      {
-        seq: 5,
-        command: "configurationDone",
-        type: "request"
-      }
-    ]
-
     DAP_TestInfo = Struct.new(:res_backlog, :backlog, :failed_process, :reader_thread, :remote_info)
 
     class Detach < StandardError
diff --git a/test/support/test_case.rb b/test/support/test_case.rb
@@ -71,4 +71,72 @@ def program_with_line_numbers(program)
       lines_with_number.join("\n")
     end
   end
+
+  # When constant variables are referred from modules, they have to be defined outside the class.
+  INITIALIZE_DAP_MSGS = [
+    {
+      seq: 1,
+      command: "initialize",
+      arguments: {
+        clientID: "vscode",
+        clientName: "Visual Studio Code",
+        adapterID: "rdbg",
+        pathFormat: "path",
+        linesStartAt1: true,
+        columnsStartAt1: true,
+        supportsVariableType: true,
+        supportsVariablePaging: true,
+        supportsRunInTerminalRequest: true,
+        locale: "en-us",
+        supportsProgressReporting: true,
+        supportsInvalidatedEvent: true,
+        supportsMemoryReferences: true
+      },
+      type: "request"
+    },
+    {
+      seq: 2,
+      command: "attach",
+      arguments: {
+        type: "rdbg",
+        name: "Attach with rdbg",
+        request: "attach",
+        rdbgPath: File.expand_path('../../exe/rdbg', __dir__),
+        debugPort: "/var/folders/kv/w1k6nh1x5fl7vx47b2pd005w0000gn/T/ruby-debug-sock-501/ruby-debug-naotto-8845",
+        autoAttach: true,
+        __sessionId: "141d9c79-3669-43ec-ac1f-e62598c5a65a"
+      },
+      type: "request"
+    },
+    {
+      seq: 3,
+      command: "setFunctionBreakpoints",
+      arguments: {
+        breakpoints: [
+
+        ]
+      },
+      type: "request"
+    },
+    {
+      seq: 4,
+      command: "setExceptionBreakpoints",
+      arguments: {
+        filters: [
+
+        ],
+        filterOptions: [
+          {
+            filterId: "RuntimeError"
+          }
+        ]
+      },
+      type: "request"
+    },
+    {
+      seq: 5,
+      command: "configurationDone",
+      type: "request"
+    }
+  ]
 end
diff --git a/test/tool/test_builder.rb b/test/tool/test_builder.rb
@@ -354,7 +354,7 @@ def create_scenario
     def #{@method}
       run_dap_scenario PROGRAM do
         [
-          *INITIALIZE_MSG,
+          *INITIALIZE_DAP_MSGS,
           #{format_scenario}
         ]
       end

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class BootConfigTest1638611290 < TestCase`
`20`	`20`	`def test_boot_configuration_works_correctly`
`21`	`21`	`run_dap_scenario PROGRAM do`
`22`	`22`	`[`
`23`		`- *INITIALIZE_MSG,`
	`23`	`+ *INITIALIZE_DAP_MSGS,`
`24`	`24`	`{`
`25`	`25`	`seq: 1,`
`26`	`26`	`type: "response",`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class BreakTest1638674577 < TestCase`
`20`	`20`	`def test_break_works_correctly`
`21`	`21`	`run_dap_scenario PROGRAM do`
`22`	`22`	`[`
`23`		`- *INITIALIZE_MSG,`
	`23`	`+ *INITIALIZE_DAP_MSGS,`
`24`	`24`	`{`
`25`	`25`	`seq: 7,`
`26`	`26`	`type: "event",`
`@@ -846,7 +846,7 @@ class BreakTest1643981380 < TestCase`
`846`	`846`	`def test_check_run_to_line_works_correctly`
`847`	`847`	`run_dap_scenario PROGRAM do`
`848`	`848`	`[`
`849`		`- *INITIALIZE_MSG,`
	`849`	`+ *INITIALIZE_DAP_MSGS,`
`850`	`850`	`{`
`851`	`851`	`seq: 7,`
`852`	`852`	`type: "event",`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class CallStackTest1643805481 < TestCase`
`20`	`20`	`def test_call_stack_works_correctly_1643805481`
`21`	`21`	`run_dap_scenario PROGRAM do`
`22`	`22`	`[`
`23`		`- *INITIALIZE_MSG,`
	`23`	`+ *INITIALIZE_DAP_MSGS,`
`24`	`24`	`{`
`25`	`25`	`seq: 7,`
`26`	`26`	`type: "event",`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class CatchTest1643891417 < TestCase`
`19`	`19`	`def test_catching_runtime_error_works_correctly_1643891417`
`20`	`20`	`run_dap_scenario PROGRAM do`
`21`	`21`	`[`
`22`		`- *INITIALIZE_MSG,`
	`22`	`+ *INITIALIZE_DAP_MSGS,`
`23`	`23`	`{`
`24`	`24`	`seq: 7,`
`25`	`25`	`type: "event",`
`@@ -388,7 +388,7 @@ class CatchTest1643892185 < TestCase`
`388`	`388`	`def test_catching_any_exception_works_correctly`
`389`	`389`	`run_dap_scenario PROGRAM do`
`390`	`390`	`[`
`391`		`- *INITIALIZE_MSG,`
	`391`	`+ *INITIALIZE_DAP_MSGS,`
`392`	`392`	`{`
`393`	`393`	`seq: 7,`
`394`	`394`	`type: "event",`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class DetachTest1639218122 < TestCase`
`23`	`23`	`def test_1639218122`
`24`	`24`	`run_dap_scenario PROGRAM do`
`25`	`25`	`[`
`26`		`- *INITIALIZE_MSG,`
	`26`	`+ *INITIALIZE_DAP_MSGS,`
`27`	`27`	`{`
`28`	`28`	`seq: 7,`
`29`	`29`	`type: "event",`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class EvalTest1643807667 < TestCase`
`17`	`17`	`def test_eval_works_correctly_1643807667`
`18`	`18`	`run_dap_scenario PROGRAM do`
`19`	`19`	`[`
`20`		`- *INITIALIZE_MSG,`
	`20`	`+ *INITIALIZE_DAP_MSGS,`
`21`	`21`	`{`
`22`	`22`	`seq: 7,`
`23`	`23`	`type: "event",`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class FinishTest1638674323 < TestCase`
`20`	`20`	`def test_finish_works_correctly`
`21`	`21`	`run_dap_scenario PROGRAM do`
`22`	`22`	`[`
`23`		`- *INITIALIZE_MSG,`
	`23`	`+ *INITIALIZE_DAP_MSGS,`
`24`	`24`	`{`
`25`	`25`	`seq: 7,`
`26`	`26`	`type: "event",`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class HoverTest1638791703 < TestCase`
`16`	`16`	`def test_hover_works_correctly`
`17`	`17`	`run_dap_scenario PROGRAM do`
`18`	`18`	`[`
`19`		`- *INITIALIZE_MSG,`
	`19`	`+ *INITIALIZE_DAP_MSGS,`
`20`	`20`	`{`
`21`	`21`	`seq: 7,`
`22`	`22`	`type: "event",`
`@@ -880,7 +880,7 @@ class HoverTest1641198331 < TestCase`
`880`	`880`	`def test_1641198331`
`881`	`881`	`run_dap_scenario PROGRAM do`
`882`	`882`	`[`
`883`		`- *INITIALIZE_MSG,`
	`883`	`+ *INITIALIZE_DAP_MSGS,`
`884`	`884`	`{`
`885`	`885`	`seq: 7,`
`886`	`886`	`type: "event",`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class NextTest1638676688 < TestCase`
`20`	`20`	`def test_next_works_correctly`
`21`	`21`	`run_dap_scenario PROGRAM do`
`22`	`22`	`[`
`23`		`- *INITIALIZE_MSG,`
	`23`	`+ *INITIALIZE_DAP_MSGS,`
`24`	`24`	`{`
`25`	`25`	`seq: 7,`
`26`	`26`	`type: "event",`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class RestartTest1644070899 < TestCase`
`23`	`23`	`def test_restart_works_correctly_1644070899`
`24`	`24`	`run_dap_scenario PROGRAM do`
`25`	`25`	`[`
`26`		`- *INITIALIZE_MSG,`
	`26`	`+ *INITIALIZE_DAP_MSGS,`
`27`	`27`	`{`
`28`	`28`	`seq: 7,`
`29`	`29`	`type: "event",`