refactor: refactor transaction test case to accept an array of assert…

…ions

Update tests accordingly

internal/resp/value/value.go

@@ -41,7 +41,6 @@ func NewIntegerValue(i int) Value {
 	return Value{
 		Type:    INTEGER,
 		integer: i,
-		bytes:   []byte(fmt.Sprintf("%d", i)),
 	}
 }
 
@@ -71,8 +70,7 @@ func NewArrayValue(arr []Value) Value {
 
 func NewNilValue() Value {
 	return Value{
-		Type:  NIL,
-		bytes: []byte("$-1\r\n"),
+		Type: NIL,
 	}
 }
 
@@ -97,7 +95,10 @@ func (v *Value) Integer() int {
 }
 
 func (v *Value) Error() string {
-	return string(v.String())
+	if v.Type == ERROR {
+		return string(v.String())
+	}
+	return ""
 }
 
 func (v *Value) FormattedString() string {

internal/resp_assertions/ordered_array_assertion.go

@@ -1,7 +1,6 @@
 package resp_assertions
 
 import (
-	"bytes"
 	"fmt"
 
 	resp_value "github.com/codecrafters-io/redis-tester/internal/resp/value"
@@ -10,11 +9,12 @@ import (
 // OrderedArrayAssertion : Order of the actual and expected values matters.
 // All RESP values are accepted as elements in this array.
 // We don't alter the ordering.
+// For each element in the array, we run the corresponding assertion.
 type OrderedArrayAssertion struct {
-	ExpectedValue []resp_value.Value
+	ExpectedValue []RESPAssertion
 }
 
-func NewOrderedArrayAssertion(expectedValue []resp_value.Value) RESPAssertion {
+func NewOrderedArrayAssertion(expectedValue []RESPAssertion) RESPAssertion {
 	return OrderedArrayAssertion{ExpectedValue: expectedValue}
 }
 
@@ -27,22 +27,11 @@ func (a OrderedArrayAssertion) Run(value resp_value.Value) error {
 		return fmt.Errorf("Expected %d elements in array, got %d (%s)", len(a.ExpectedValue), len(value.Array()), value.FormattedString())
 	}
 
-	for i, expectedValue := range a.ExpectedValue {
+	for i, assertion := range a.ExpectedValue {
 		actualElement := value.Array()[i]
 
-		if actualElement.Type != expectedValue.Type {
-			return fmt.Errorf("Expected element #%d to be a %s, got %s", i+1, expectedValue.Type, actualElement.Type)
-		}
-
-		if expectedValue.Bytes() == nil {
-			// This should never happen, but just in case
-			// This is the case for ArrayValues
-			return fmt.Errorf("CodeCrafters internal error. expectedValue Bytes of type: %s is nil", expectedValue.Type)
-		}
-
-		// ToDo: Equal or EqualFold ?
-		if !bytes.Equal(actualElement.Bytes(), expectedValue.Bytes()) {
-			return fmt.Errorf("Expected element #%d to be %s, got %s", i+1, expectedValue.FormattedString(), actualElement.FormattedString())
+		if err := assertion.Run(actualElement); err != nil {
+			return err
 		}
 	}
 

internal/test_cases/transaction_test_case.go

@@ -2,7 +2,6 @@ package test_cases
 
 import (
 	resp_client "github.com/codecrafters-io/redis-tester/internal/resp/connection"
-	resp_value "github.com/codecrafters-io/redis-tester/internal/resp/value"
 	"github.com/codecrafters-io/redis-tester/internal/resp_assertions"
 	"github.com/codecrafters-io/tester-utils/logger"
 )
@@ -19,9 +18,10 @@ type TransactionTestCase struct {
 	CommandQueue [][]string
 
 	// After queueing all the commands,
-	// if ShouldSkipExec is false, "EXEC" is sent
-	// And the response is compared with this ExpectedResponseArray
-	ExpectedResponseArray []resp_value.Value
+	// if "EXEC" is sent (based on which function is called)
+	// The elements in the response array are asserted based on the
+	// assertions in the  ExpectedResponseArray
+	ExpectedResponseArray []resp_assertions.RESPAssertion
 }
 
 func (t TransactionTestCase) RunAll(client *resp_client.RespConnection, logger *logger.Logger) error {

internal/test_txn_discard.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/codecrafters-io/redis-tester/internal/redis_executable"
-	resp_value "github.com/codecrafters-io/redis-tester/internal/resp/value"
 	"github.com/codecrafters-io/redis-tester/internal/resp_assertions"
 
 	"github.com/codecrafters-io/redis-tester/internal/instrumented_resp_connection"
@@ -47,7 +46,6 @@ func testTxDiscard(stageHarness *test_case_harness.TestCaseHarness) error {
 			{"SET", key1, fmt.Sprint(randomInt1)},
 			{"INCR", key1},
 		},
-		ExpectedResponseArray: []resp_value.Value{},
 	}
 
 	if err := transactionTestCase.RunWithoutExec(client, logger); err != nil {

internal/test_txn_empty.go

@@ -2,7 +2,6 @@ package internal
 
 import (
 	"github.com/codecrafters-io/redis-tester/internal/redis_executable"
-	resp_value "github.com/codecrafters-io/redis-tester/internal/resp/value"
 	"github.com/codecrafters-io/redis-tester/internal/resp_assertions"
 
 	"github.com/codecrafters-io/redis-tester/internal/instrumented_resp_connection"
@@ -25,10 +24,7 @@ func testTxEmpty(stageHarness *test_case_harness.TestCaseHarness) error {
 	}
 	defer client.Close()
 
-	emptyTransactionTestCase := test_cases.TransactionTestCase{
-		CommandQueue:          [][]string{},
-		ExpectedResponseArray: []resp_value.Value{},
-	}
+	emptyTransactionTestCase := test_cases.TransactionTestCase{}
 
 	if err := emptyTransactionTestCase.RunAll(client, logger); err != nil {
 		return err

internal/test_txn_multi.go

@@ -2,7 +2,6 @@ package internal
 
 import (
 	"github.com/codecrafters-io/redis-tester/internal/redis_executable"
-	resp_value "github.com/codecrafters-io/redis-tester/internal/resp/value"
 
 	"github.com/codecrafters-io/redis-tester/internal/instrumented_resp_connection"
 	"github.com/codecrafters-io/redis-tester/internal/test_cases"
@@ -24,10 +23,7 @@ func testTxMulti(stageHarness *test_case_harness.TestCaseHarness) error {
 	}
 	defer client.Close()
 
-	transactionTestCase := test_cases.TransactionTestCase{
-		CommandQueue:          [][]string{},
-		ExpectedResponseArray: []resp_value.Value{},
-	}
+	transactionTestCase := test_cases.TransactionTestCase{}
 
 	return transactionTestCase.RunMulti(client, logger)
 }

internal/test_txn_multi_tx.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/codecrafters-io/redis-tester/internal/redis_executable"
-	resp_value "github.com/codecrafters-io/redis-tester/internal/resp/value"
 	"github.com/codecrafters-io/redis-tester/internal/resp_assertions"
 
 	"github.com/codecrafters-io/redis-tester/internal/test_cases"
@@ -68,7 +67,7 @@ func testTxMultiTx(stageHarness *test_case_harness.TestCaseHarness) error {
 			// Inside each transaction, we run 1x INCR key1, key2
 			// So it increases by 1 for each transaction
 			// `i` here is 0-indexed, so we add 1 to the expected value
-			ExpectedResponseArray: []resp_value.Value{resp_value.NewIntegerValue(3 + (1 + i)), resp_value.NewIntegerValue(randomIntegerValue + (1 + i))},
+			ExpectedResponseArray: []resp_assertions.RESPAssertion{resp_assertions.NewIntegerAssertion(3 + (1 + i)), resp_assertions.NewIntegerAssertion(randomIntegerValue + (1 + i))},
 		}
 		if err := transactionTestCase.RunExec(client, logger); err != nil {
 			return err

internal/test_txn_queue.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/codecrafters-io/redis-tester/internal/redis_executable"
-	resp_value "github.com/codecrafters-io/redis-tester/internal/resp/value"
 	"github.com/codecrafters-io/redis-tester/internal/resp_assertions"
 
 	"github.com/codecrafters-io/redis-tester/internal/test_cases"
@@ -36,7 +35,6 @@ func testTxQueue(stageHarness *test_case_harness.TestCaseHarness) error {
 			{"SET", key, fmt.Sprint(randomIntegerValue)},
 			{"INCR", key},
 		},
-		ExpectedResponseArray: []resp_value.Value{},
 	}
 
 	if err := transactionTestCase.RunWithoutExec(clients[0], logger); err != nil {

internal/test_txn_tx.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/codecrafters-io/redis-tester/internal/redis_executable"
-	resp_value "github.com/codecrafters-io/redis-tester/internal/resp/value"
 	"github.com/codecrafters-io/redis-tester/internal/resp_assertions"
 
 	"github.com/codecrafters-io/redis-tester/internal/test_cases"
@@ -39,7 +38,7 @@ func testTxSuccess(stageHarness *test_case_harness.TestCaseHarness) error {
 			{"INCR", key2},
 			{"GET", key2},
 		},
-		ExpectedResponseArray: []resp_value.Value{resp_value.NewSimpleStringValue("OK"), resp_value.NewIntegerValue(randomIntegerValue + 1), resp_value.NewIntegerValue(1), resp_value.NewBulkStringValue("1")},
+		ExpectedResponseArray: []resp_assertions.RESPAssertion{resp_assertions.NewStringAssertion("OK"), resp_assertions.NewIntegerAssertion(randomIntegerValue + 1), resp_assertions.NewIntegerAssertion(1), resp_assertions.NewStringAssertion("1")},
 	}
 
 	if err := transactionTestCase.RunAll(clients[0], logger); err != nil {

internal/test_txn_tx_failure.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/codecrafters-io/redis-tester/internal/redis_executable"
-	resp_value "github.com/codecrafters-io/redis-tester/internal/resp/value"
 
 	"github.com/codecrafters-io/redis-tester/internal/resp_assertions"
 	"github.com/codecrafters-io/redis-tester/internal/test_cases"
@@ -53,8 +52,8 @@ func testTxErr(stageHarness *test_case_harness.TestCaseHarness) error {
 			{"INCR", key1},
 			{"INCR", key2},
 		},
-		ExpectedResponseArray: []resp_value.Value{
-			resp_value.NewErrorValue("ERR value is not an integer or out of range"), resp_value.NewIntegerValue(randomIntegerValue + 1)},
+		ExpectedResponseArray: []resp_assertions.RESPAssertion{
+			resp_assertions.NewErrorAssertion("ERR value is not an integer or out of range"), resp_assertions.NewIntegerAssertion(randomIntegerValue + 1)},
 	}
 
 	if err := transactionTestCase.RunAll(clients[0], logger); err != nil {