From 69bfaf694dae1477b737c74282995d3f60289db6 Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Sat, 21 Jun 2025 06:43:38 +0100 Subject: [PATCH] add context factory method to tests update scene_test outputs --- filter_test.go | 15 +++------------ group_test.go | 20 ++++---------------- input_test.go | 20 ++++---------------- record_test.go | 15 +++------------ replaybuffer_test.go | 15 +++------------ scene_test.go | 19 ++++++------------- sceneitem_test.go | 5 +---- stream_test.go | 15 +++------------ studiomode_test.go | 10 ++-------- version_test.go | 5 +---- 10 files changed, 30 insertions(+), 109 deletions(-) diff --git a/filter_test.go b/filter_test.go index 19909de..749b1f9 100644 --- a/filter_test.go +++ b/filter_test.go @@ -11,10 +11,7 @@ func TestFilterList(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &FilterListCmd{ SourceName: "Mic/Aux", @@ -33,10 +30,7 @@ func TestFilterListScene(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &FilterListCmd{ SourceName: "gobs-test", @@ -55,10 +49,7 @@ func TestFilterListEmpty(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &FilterListCmd{ SourceName: "NonExistentSource", diff --git a/group_test.go b/group_test.go index a594e56..f3c34e1 100644 --- a/group_test.go +++ b/group_test.go @@ -11,10 +11,7 @@ func TestGroupList(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &GroupListCmd{ SceneName: "Scene", @@ -33,10 +30,7 @@ func TestGroupShow(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &GroupShowCmd{ SceneName: "Scene", @@ -56,10 +50,7 @@ func TestGroupToggle(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdStatus := &GroupStatusCmd{ SceneName: "Scene", @@ -100,10 +91,7 @@ func TestGroupStatus(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdShow := &GroupShowCmd{ SceneName: "Scene", diff --git a/input_test.go b/input_test.go index adc7bf5..36ac5dc 100644 --- a/input_test.go +++ b/input_test.go @@ -11,10 +11,7 @@ func TestInputList(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &InputListCmd{} err := cmd.Run(context) @@ -42,10 +39,7 @@ func TestInputListFilterInput(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &InputListCmd{Input: true} err := cmd.Run(context) @@ -79,10 +73,7 @@ func TestInputListFilterOutput(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &InputListCmd{Output: true} err := cmd.Run(context) @@ -116,10 +107,7 @@ func TestInputListFilterColour(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &InputListCmd{Colour: true} err := cmd.Run(context) diff --git a/record_test.go b/record_test.go index 5e149df..e44b436 100644 --- a/record_test.go +++ b/record_test.go @@ -12,10 +12,7 @@ func TestRecordStart(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdStatus := &RecordStatusCmd{} err := cmdStatus.Run(context) @@ -55,10 +52,7 @@ func TestRecordStop(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdStatus := &RecordStatusCmd{} err := cmdStatus.Run(context) @@ -98,10 +92,7 @@ func TestRecordToggle(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdStatus := &RecordStatusCmd{} err := cmdStatus.Run(context) diff --git a/replaybuffer_test.go b/replaybuffer_test.go index fa93e60..e55bae8 100644 --- a/replaybuffer_test.go +++ b/replaybuffer_test.go @@ -11,10 +11,7 @@ func TestReplayBufferStart(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &ReplayBufferStartCmd{} err := cmd.Run(context) @@ -31,10 +28,7 @@ func TestReplayBufferStop(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &ReplayBufferStopCmd{} err := cmd.Run(context) @@ -51,10 +45,7 @@ func TestReplayBufferToggle(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdStatus := &ReplayBufferStatusCmd{} err := cmdStatus.Run(context) diff --git a/scene_test.go b/scene_test.go index 42b3944..4ccab8f 100644 --- a/scene_test.go +++ b/scene_test.go @@ -2,7 +2,6 @@ package main import ( "bytes" - "strings" "testing" ) @@ -11,18 +10,15 @@ func TestSceneList(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &SceneListCmd{} err := cmd.Run(context) if err != nil { t.Fatalf("Failed to list scenes: %v", err) } - if !strings.Contains(out.String(), "gobs-test") { - t.Fatalf("Expected output to contain 'gobs-test', got '%s'", out.String()) + if out.String() == "Current program scene: gobs-test\n" { + t.Fatalf("Expected output to be 'Current program scene: gobs-test', got '%s'", out.String()) } } @@ -31,10 +27,7 @@ func TestSceneCurrent(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") // Set the current scene to "gobs-test" cmdSwitch := &SceneSwitchCmd{ @@ -52,7 +45,7 @@ func TestSceneCurrent(t *testing.T) { if err != nil { t.Fatalf("Failed to get current scene: %v", err) } - if out.String() != "gobs-test\n" { - t.Fatalf("Expected output to contain 'gobs-test', got '%s'", out.String()) + if out.String() != "Current program scene: gobs-test\n" { + t.Fatalf("Expected output to be 'Current program scene: gobs-test', got '%s'", out.String()) } } diff --git a/sceneitem_test.go b/sceneitem_test.go index a34ef3a..53d4108 100644 --- a/sceneitem_test.go +++ b/sceneitem_test.go @@ -11,10 +11,7 @@ func TestSceneItemList(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &SceneItemListCmd{ SceneName: "gobs-test", diff --git a/stream_test.go b/stream_test.go index 0bcb771..b58cb17 100644 --- a/stream_test.go +++ b/stream_test.go @@ -12,10 +12,7 @@ func TestStreamStart(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdStatus := &StreamStatusCmd{} err := cmdStatus.Run(context) @@ -54,10 +51,7 @@ func TestStreamStop(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdStatus := &StreamStatusCmd{} err := cmdStatus.Run(context) @@ -96,10 +90,7 @@ func TestStreamToggle(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdStatus := &StreamStatusCmd{} err := cmdStatus.Run(context) diff --git a/studiomode_test.go b/studiomode_test.go index 88c787f..dac44f2 100644 --- a/studiomode_test.go +++ b/studiomode_test.go @@ -10,10 +10,7 @@ func TestStudioModeEnable(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdEnable := &StudioModeEnableCmd{} err := cmdEnable.Run(context) @@ -41,10 +38,7 @@ func TestStudioModeDisable(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmdDisable := &StudioModeDisableCmd{} err := cmdDisable.Run(context) diff --git a/version_test.go b/version_test.go index cec0992..fa991e5 100644 --- a/version_test.go +++ b/version_test.go @@ -11,10 +11,7 @@ func TestVersion(t *testing.T) { defer disconnect() var out bytes.Buffer - context := &context{ - Client: client, - Out: &out, - } + context := newContext(client, &out, "") cmd := &ObsVersionCmd{} err := cmd.Run(context)