Add BellAssertion for terminal bell events

internal/assertions/bell_assertion.go

@@ -0,0 +1,36 @@
+package assertions
+
+import (
+	"time"
+)
+
+// BellAssertion asserts that ...
+type BellAssertion struct {
+	// Vt *virtual_terminal.VirtualTerminal
+	BellChannel chan bool
+}
+
+func (a BellAssertion) Inspect() string {
+	return "BellAssertion"
+}
+
+func (a BellAssertion) Run(screenState [][]string, startRowIndex int) (processedRowCount int, err *AssertionError) {
+	if !checkIfBellReceived(a.BellChannel) {
+		return 0, &AssertionError{
+			StartRowIndex: startRowIndex,
+			ErrorRowIndex: startRowIndex,
+			Message:       "Expected bell to ring, but it didn't",
+		}
+	} else {
+		return 0, nil
+	}
+}
+
+func checkIfBellReceived(bellChannel chan bool) bool {
+	select {
+	case <-bellChannel:
+		return true
+	case <-time.After(100 * time.Millisecond): // Add reasonable timeout
+		return false
+	}
+}

internal/test_cases/command_autocomplete_test_case.go

@@ -2,7 +2,6 @@ package test_cases
 
 import (
 	"fmt"
-	"time"
 
 	"github.com/codecrafters-io/shell-tester/internal/assertions"
 	"github.com/codecrafters-io/shell-tester/internal/logged_shell_asserter"
@@ -82,15 +81,23 @@ func (t CommandAutocompleteTestCase) Run(asserter *logged_shell_asserter.LoggedS
 
 	// Only if we attempted to autocomplete, print the success message
 	logger.Successf("✓ Prompt line matches %q", t.ExpectedReflection)
+	// The space at the end of the reflection won't be present, so replace that assertion
+	asserter.PopAssertion()
 
 	if t.CheckForBell {
-		if err := RunBellAssertion(shell, logger); err != nil {
+		bellChannel := shell.VTBellChannel()
+		asserter.AddAssertion(assertions.BellAssertion{
+			BellChannel: bellChannel,
+		})
+		// Run the assertion, before sending the enter key
+		if err := asserter.AssertWithoutPrompt(); err != nil {
 			return err
 		}
-	}
 
-	// The space at the end of the reflection won't be present, so replace that assertion
-	asserter.PopAssertion()
+		logger.Successf("✓ Received bell")
+		// Pop the bell assertion after running
+		asserter.PopAssertion()
+	}
 
 	var assertFuncToRun func() error
 	if t.SkipPromptAssertion {
@@ -117,20 +124,3 @@ func logTab(logger *logger.Logger, expectedReflection string) {
 func logCommand(logger *logger.Logger, command string) {
 	logger.Infof("Typed %q", command)
 }
-
-func RunBellAssertion(shell *shell_executable.ShellExecutable, logger *logger.Logger) error {
-	if !checkIfBellReceived(shell) {
-		return fmt.Errorf("Expected bell to ring, but it didn't")
-	}
-	logger.Successf("✓ Received bell")
-	return nil
-}
-
-func checkIfBellReceived(shell *shell_executable.ShellExecutable) bool {
-	select {
-	case <-shell.VTBellChannel():
-		return true
-	case <-time.After(50 * time.Millisecond): // Add reasonable timeout
-		return false
-	}
-}

internal/test_cases/command_multiple_completions_test_case.go

@@ -73,9 +73,18 @@ func (t CommandMultipleCompletionsTestCase) Run(asserter *logged_shell_asserter.
 	}
 
 	if t.CheckForBell {
-		if err := RunBellAssertion(shell, logger); err != nil {
+		bellChannel := shell.VTBellChannel()
+		asserter.AddAssertion(assertions.BellAssertion{
+			BellChannel: bellChannel,
+		})
+		// Run the assertion, before sending the enter key
+		if err := asserter.AssertWithoutPrompt(); err != nil {
 			return err
 		}
+
+		logger.Successf("✓ Received bell")
+		// Pop the bell assertion after running
+		asserter.PopAssertion()
 	}
 
 	commandReflection := t.ExpectedReflection