expressions:remove unnecessary test

pingcap · Sep 7, 2015 · 213793b · 213793b
1 parent 329721d
commit 213793b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 45 deletions.
diff --git a/expression/expressions/binop_test.go b/expression/expressions/binop_test.go
@@ -15,7 +15,6 @@ package expressions
 
 import (
 	"errors"
-	"time"
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb/expression"
@@ -106,44 +105,6 @@ func (s *testBinOpSuite) TestComparisonOp(c *C) {
 		c.Assert(v, IsNil)
 	}
 
-	// test evalCompare function
-	cmpTbl := []struct {
-		lhs interface{}
-		rhs interface{}
-		ret int // 0, 1, -1
-	}{
-		{float64(1), float64(1), 0},
-		{float64(1), "1", 0},
-		{int64(1), int64(1), 0},
-		{int64(-1), uint64(1), -1},
-		{int64(-1), "-1", 0},
-		{uint64(1), uint64(1), 0},
-		{uint64(1), int64(-1), 1},
-		{uint64(1), "1", 0},
-		{mysql.NewDecimalFromInt(1, 0), mysql.NewDecimalFromInt(1, 0), 0},
-		{mysql.NewDecimalFromInt(1, 0), "1", 0},
-		{"1", "1", 0},
-		{"1", int64(-1), 1},
-		{"1", float64(2), -1},
-		{"1", uint64(1), 0},
-		{"1", mysql.NewDecimalFromInt(1, 0), 0},
-		{"2011-01-01 11:11:11", mysql.Time{Time: time.Now(), Type: mysql.TypeDatetime, Fsp: 0}, -1},
-		{"12:00:00", mysql.ZeroDuration, 1},
-		{mysql.ZeroDuration, mysql.ZeroDuration, 0},
-		{mysql.Time{Time: time.Now().Add(time.Second * 10), Type: mysql.TypeDatetime, Fsp: 0},
-			mysql.Time{Time: time.Now(), Type: mysql.TypeDatetime, Fsp: 0}, 1},
-	}
-
-	for _, t := range cmpTbl {
-		ret, err := evalCompare(t.lhs, t.rhs)
-		c.Assert(err, IsNil)
-		c.Assert(ret, Equals, t.ret)
-
-		ret, err = evalCompare(t.rhs, t.lhs)
-		c.Assert(err, IsNil)
-		c.Assert(ret, Equals, -t.ret)
-	}
-
 	// test error
 	mock := mockExpr{
 		isStatic: false,
@@ -194,9 +155,6 @@ func (s *testBinOpSuite) TestComparisonOp(c *C) {
 	expr := BinaryOperation{Op: opcode.Plus, L: Value{1}, R: Value{1}}
 	_, err := expr.evalComparisonOp(nil, nil)
 	c.Assert(err, NotNil)
-
-	_, err = evalCompare(1, 1)
-	c.Assert(err, NotNil)
 }
 
 func (s *testBinOpSuite) TestIdentRelOp(c *C) {

diff --git a/util/types/compare_test.go b/util/types/compare_test.go
@@ -46,11 +46,11 @@ func (s *testCompareSuite) TestCompare(c *C) {
 		{"1", float64(2), -1},
 		{"1", uint64(1), 0},
 		{"1", mysql.NewDecimalFromInt(1, 0), 0},
-		{"2011-01-01 11:11:11", mysql.Time{time.Now(), mysql.TypeDatetime, 0}, -1},
+		{"2011-01-01 11:11:11", mysql.Time{Time: time.Now(), Type: mysql.TypeDatetime, Fsp: 0}, -1},
 		{"12:00:00", mysql.ZeroDuration, 1},
 		{mysql.ZeroDuration, mysql.ZeroDuration, 0},
-		{mysql.Time{time.Now().Add(time.Second * 10), mysql.TypeDatetime, 0},
-			mysql.Time{time.Now(), mysql.TypeDatetime, 0}, 1},
+		{mysql.Time{Time: time.Now().Add(time.Second * 10), Type: mysql.TypeDatetime, Fsp: 0},
+			mysql.Time{Time: time.Now(), Type: mysql.TypeDatetime, Fsp: 0}, 1},
 
 		{nil, 2, -1},
 		{nil, nil, 0},