Imporve unit test cover for supportive code

laodouya · laodouya · commit 6611843f9c1c · 2019-02-15T17:27:18.000+08:00
diff --git a/storage/dsn_test.go b/storage/dsn_test.go
@@ -43,5 +43,24 @@ func TestDSN(t *testing.T) {
 
 		dsn.AddParam("key", "value")
 		t.Logf("Test set add param: formatted = %s", dsn.Format())
+
+		dsn.AddParam("key", "")
+		t.Logf("Test delete param by set empty to add param: formatted = %s", dsn.Format())
+		if _, ok := dsn.GetParam("key"); ok {
+			t.Errorf("Should not have deleted key")
+		}
+	}
+
+	invalidString1 := "file:test.db?p1"
+	dsn, err := NewDSN(invalidString1)
+	if err == nil {
+		t.Errorf("Should occurred unrecognized parameter error: %v", dsn)
+	}
+
+	dsn = &DSN{}
+	dsn.AddParam("clone", "true")
+	clone := dsn.Clone()
+	if _, ok := clone.GetParam("clone"); !ok {
+		t.Errorf("Should cloned params")
 	}
 }
diff --git a/storage/storage_test.go b/storage/storage_test.go
@@ -53,13 +53,26 @@ func newNamedQuery(query string, args map[string]interface{}) (q Query) {
 }
 
 func TestBadType(t *testing.T) {
-	fl, err := ioutil.TempFile("", "sqlite3-")
+	// invalid storage
+	invalidString1 := "file:test.db?p1"
 
-	if err != nil {
-		t.Fatalf("error occurred: %v", err)
+	st, err := New(invalidString1)
+	if err == nil {
+		defer st.Close()
+		t.Fatalf("should occurred error: %v", st)
 	}
 
-	st, err := New(fmt.Sprintf("file:%s", fl.Name()))
+	st = &Storage{
+		dsn: invalidString1,
+		db:  nil,
+	}
+	err = st.Close()
+	if err == nil {
+		t.Fatalf("should occurred error: %v", st)
+	}
+
+	// valid storage
+	st, err = New("file::memory:")
 	defer st.Close()
 
 	if err != nil {
@@ -83,6 +96,16 @@ func TestBadType(t *testing.T) {
 	} else {
 		t.Logf("Error occurred as expected: %v", err)
 	}
+
+	// empty query
+	_, _, _, err = st.Query(context.Background(), []Query{})
+	if err != nil {
+		t.Fatal("empty query should be successed")
+	}
+	_, err = st.Exec(context.Background(), []Query{})
+	if err != nil {
+		t.Fatal("empty exec should be successed")
+	}
 }
 
 func TestStorage(t *testing.T) {
diff --git a/types/account_test.go b/types/account_test.go
@@ -33,7 +33,7 @@ func TestUserPermissionFromRole(t *testing.T) {
 		err = json.Unmarshal([]byte(`"Write"`), &r)
 		So(err, ShouldBeNil)
 		So(r, ShouldEqual, Write)
-		err = json.Unmarshal([]byte(`"Read,Write"`), &r)
+		err = r.UnmarshalJSON([]byte(`"Read,Write"`))
 		So(err, ShouldBeNil)
 		So(r, ShouldEqual, ReadWrite)
 	})
@@ -42,8 +42,18 @@ func TestUserPermissionFromRole(t *testing.T) {
 		So(r, ShouldEqual, Void)
 		r.FromString(Read.String())
 		So(r, ShouldEqual, Read)
+		r.FromString(Void.String())
+		So(r, ShouldEqual, Void)
 		r.FromString(ReadWrite.String())
 		So(r, ShouldEqual, ReadWrite)
+		r.FromString(Admin.String())
+		So(r, ShouldEqual, Admin)
+
+		// tricky case
+		trickyStr := "Write,Super"
+		r.FromString(trickyStr)
+		So(r, ShouldEqual, Write|Super)
+		So(r.String(), ShouldEqual, trickyStr)
 	})
 }
 
diff --git a/utils/log/logwrapper_test.go b/utils/log/logwrapper_test.go
@@ -102,6 +102,7 @@ func TestWithField(t *testing.T) {
 
 	call0()
 
+	WithError(errors.New("new")).WithField("newfieldkey", "newfieldvalue").WithTime(time.Now()).Debug("debug")
 	f := new(Fields)
 	WithError(errors.New("new")).WithFields(*f).WithTime(time.Now()).Debug("debug")
 
@@ -179,10 +180,23 @@ func TestSimpleLog(t *testing.T) {
 	Debug("Debug")
 	Debugln("Debugln")
 	Debugf("Debugf %d", 1)
+}
+
+func TestFatalLog(t *testing.T) {
+	SetStringLevel("willusenextparam", ErrorLevel)
+	if GetLevel() != ErrorLevel {
+		t.Fail()
+	}
 
 	logrus.StandardLogger().ExitFunc = func(code int) {}
 	Fatal("Fatal")
 	Fatalln("Fatalln")
 	Fatalf("Fatalf %d", 1)
+
+	entry := WithError(errors.New("new"))
+	entry.Fatal("entry Fatal")
+	entry.Fatalln("entry Fatalln")
+	entry.Fatalf("entry Fatal %d", 1)
+
 	logrus.StandardLogger().ExitFunc = nil
 }
