refactor: refactor Redis test setup for improved reusability and cleanup

- Refactor `TestWithRedis` to use a new `setupRedisContainer` function
- Remove redundant container setup code from `TestRedisDefaultFlow`
- Add endpoint retrieval and error handling in `setupRedisContainer` function
- Ensure container cleanup in `TestRedisDefaultFlow` using defer

Signed-off-by: appleboy <[email protected]>

Author: appleboy

redis_test.go

@@ -38,8 +38,7 @@ func (m mockMessage) Bytes() []byte {
 	return []byte(m.Message)
 }
 
-func TestWithRedis(t *testing.T) {
-	ctx := context.Background()
+func setupRedisContainer(ctx context.Context, t *testing.T) (testcontainers.Container, string) {
 	req := testcontainers.ContainerRequest{
 		Image:        "redis:6",
 		ExposedPorts: []string{"6379/tcp"},
@@ -49,25 +48,24 @@ func TestWithRedis(t *testing.T) {
 		ContainerRequest: req,
 		Started:          true,
 	})
-	testcontainers.CleanupContainer(t, redisC)
 	require.NoError(t, err)
+
+	endpoint, err := redisC.Endpoint(ctx, "")
+	require.NoError(t, err)
+
+	return redisC, endpoint
 }
 
-func TestRedisDefaultFlow(t *testing.T) {
+func TestWithRedis(t *testing.T) {
 	ctx := context.Background()
-	req := testcontainers.ContainerRequest{
-		Image:        "redis:6",
-		ExposedPorts: []string{"6379/tcp"},
-		WaitingFor:   wait.ForLog("Ready to accept connections"),
-	}
-	redisC, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
-		ContainerRequest: req,
-		Started:          true,
-	})
-	require.NoError(t, err)
+	redisC, _ := setupRedisContainer(ctx, t)
+	testcontainers.CleanupContainer(t, redisC)
+}
 
-	endpoint, err := redisC.Endpoint(ctx, "")
-	require.NoError(t, err)
+func TestRedisDefaultFlow(t *testing.T) {
+	ctx := context.Background()
+	redisC, endpoint := setupRedisContainer(ctx, t)
+	defer testcontainers.CleanupContainer(t, redisC)
 
 	m := &mockMessage{
 		Message: "foo",