diff --git a/context_test.go b/context_test.go index 45b8411..3f2f9cc 100644 --- a/context_test.go +++ b/context_test.go @@ -16,6 +16,43 @@ var execTests = []struct { {"echo.php", "Hello World"}, } +var bindTests = []struct { + value interface{} // Value to bind + expected string // Serialized form of value +}{ + {42, "i:42;"}, // Integer + {3.14159, "d:3.1415899999999999;"}, // Floating point + {"Such bind", `s:9:"Such bind";`}, // String +} + +type MockWriter struct { + buffer []byte +} + +func (m *MockWriter) Write(p []byte) (int, error) { + if m.buffer == nil { + m.buffer = p + } else { + m.buffer = append(m.buffer, p...) + } + + return len(p), nil +} + +func (m *MockWriter) String() string { + if m.buffer == nil { + return "" + } + + return string(m.buffer) +} + +func (m *MockWriter) Reset() { + if m.buffer != nil { + m.buffer = m.buffer[:0] + } +} + func TestContextExec(t *testing.T) { var w MockWriter @@ -40,15 +77,6 @@ func TestContextExec(t *testing.T) { } } -var bindTests = []struct { - value interface{} // Value to bind - expected string // Serialized form of value -}{ - {42, "i:42;"}, // Integer - {3.14159, "d:3.1415899999999999;"}, // Floating point - {"Such bind", `s:9:"Such bind";`}, // String -} - func TestContextBind(t *testing.T) { var w MockWriter diff --git a/engine_test.go b/engine_test.go index f7f3055..8524c04 100644 --- a/engine_test.go +++ b/engine_test.go @@ -1,37 +1,10 @@ package php import ( + "os" "testing" ) -type MockWriter struct { - buffer []byte -} - -func (m *MockWriter) Write(p []byte) (int, error) { - if m.buffer == nil { - m.buffer = p - } else { - m.buffer = append(m.buffer, p...) - } - - return len(p), nil -} - -func (m *MockWriter) String() string { - if m.buffer == nil { - return "" - } - - return string(m.buffer) -} - -func (m *MockWriter) Reset() { - if m.buffer != nil { - m.buffer = m.buffer[:0] - } -} - func TestNewEngineContext(t *testing.T) { e, err := New() if err != nil { @@ -40,7 +13,7 @@ func TestNewEngineContext(t *testing.T) { defer e.Destroy() - ctx, err := e.NewContext(&MockWriter{}) + ctx, err := e.NewContext(os.Stdout) if err != nil { t.Errorf("NewContext(): %s", err) }