@@ -2,6 +2,7 @@ package xormrediscache
2
2
3
3
import (
4
4
"database/sql"
5
+ _ "encoding/gob"
5
6
"testing"
6
7
7
8
_ "github.com/go-sql-driver/mysql"
@@ -14,7 +15,6 @@ import (
14
15
CREATE DATABASE IF NOT EXISTS xorm_test CHARACTER SET
15
16
utf8 COLLATE utf8_general_ci;
16
17
*/
17
-
18
18
func TestMysqlWithCache (t * testing.T ) {
19
19
err := mysqlDdlImport ()
20
20
if err != nil {
@@ -28,11 +28,9 @@ func TestMysqlWithCache(t *testing.T) {
28
28
t .Error (err )
29
29
return
30
30
}
31
- engine .SetDefaultCacher (NewRedisCacher ("localhost:6379" , "" , DEFAULT_EXPIRATION , engine .Logger ))
32
- engine .ShowSQL = ShowTestSql
33
- engine .ShowErr = ShowTestSql
34
- engine .ShowWarn = ShowTestSql
35
- engine .ShowDebug = ShowTestSql
31
+ engine .SetDefaultCacher (NewRedisCacher ("localhost:6379" , "" , DEFAULT_EXPIRATION , engine .Logger ()))
32
+ engine .ShowSQL (true )
33
+ engine .Logger ().SetLevel (core .LOG_DEBUG )
36
34
37
35
BaseTestAll (engine , t )
38
36
BaseTestAllSnakeMapper (engine , t )
@@ -53,11 +51,9 @@ func TestMysqlWithCacheSameMapper(t *testing.T) {
53
51
return
54
52
}
55
53
engine .SetMapper (core.SameMapper {})
56
- engine .SetDefaultCacher (NewRedisCacher ("localhost:6379" , "" , DEFAULT_EXPIRATION , engine .Logger ))
57
- engine .ShowSQL = ShowTestSql
58
- engine .ShowErr = ShowTestSql
59
- engine .ShowWarn = ShowTestSql
60
- engine .ShowDebug = ShowTestSql
54
+ engine .SetDefaultCacher (NewRedisCacher ("localhost:6379" , "" , DEFAULT_EXPIRATION , engine .Logger ()))
55
+ engine .ShowSQL (true )
56
+ engine .Logger ().SetLevel (core .LOG_DEBUG )
61
57
62
58
BaseTestAll (engine , t )
63
59
BaseTestAllSameMapper (engine , t )
@@ -71,7 +67,7 @@ func newMysqlEngine() (*xorm.Engine, error) {
71
67
func newMysqlEngineWithCacher () (* xorm.Engine , error ) {
72
68
engine , err := newMysqlEngine ()
73
69
if err == nil {
74
- engine .SetDefaultCacher (NewRedisCacher ("localhost:6379" , "" , DEFAULT_EXPIRATION , engine .Logger ))
70
+ engine .SetDefaultCacher (NewRedisCacher ("localhost:6379" , "" , DEFAULT_EXPIRATION , engine .Logger () ))
75
71
}
76
72
return engine , err
77
73
}
@@ -81,13 +77,11 @@ func mysqlDdlImport() error {
81
77
if err != nil {
82
78
return err
83
79
}
84
- engine .ShowSQL = ShowTestSql
85
- engine .ShowErr = ShowTestSql
86
- engine .ShowWarn = ShowTestSql
87
- engine .ShowDebug = ShowTestSql
80
+ engine .ShowSQL (true )
81
+ engine .Logger ().SetLevel (core .LOG_DEBUG )
88
82
89
83
sqlResults , _ := engine .ImportFile ("../testdata/mysql_ddl.sql" )
90
- engine .LogDebug ("sql results: %v" , sqlResults )
84
+ engine .Logger (). Debugf ("sql results: %v" , sqlResults )
91
85
engine .Close ()
92
86
return nil
93
87
}
0 commit comments