Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

more tests

goenningd8e5fe99db3b
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
index 40ce51b7a..6f84b2f88 100644
--- a/app/pkg/dbx/dbx.go
+++ b/app/pkg/dbx/dbx.go
@@ -16,7 +16,7 @@ import (
func New() (*Database, error) {
conn, err := sql.Open("postgres", env.MustGet("DATABASE_URL"))
if err != nil {
- return nil, throw(err)
+ return nil, err
}
db := &Database{conn}
@@ -35,22 +35,11 @@ type Database struct {
func (db Database) Execute(command string, args ...interface{}) error {
_, err := db.conn.Exec(command, args...)
if err != nil {
- return throw(err)
+ return err
}
return nil
}
-// QueryInt executes given SQL command and return first integer of first row
-func (db Database) QueryInt(command string, args ...interface{}) (int, error) {
- var data int
- row := db.conn.QueryRow(command, args...)
- err := row.Scan(&data)
- if err != nil {
- return 0, err
- }
- return data, nil
-}
-
// QueryIntArray executes given SQL command and return first column as int
func (db Database) QueryIntArray(command string, args ...interface{}) ([]int, error) {
values := make([]int, 0)
@@ -75,17 +64,6 @@ func (db Database) QueryIntArray(command string, args ...interface{}) ([]int, er
return values, nil
}
-// QueryString executes given SQL command and return first string of first row
-func (db Database) QueryString(command string, args ...interface{}) (string, error) {
- var data string
- row := db.conn.QueryRow(command, args...)
- err := row.Scan(&data)
- if err != nil {
- return "", err
- }
- return data, nil
-}
-
// Query the database with given SQL command
func (db Database) Query(command string, args ...interface{}) (*sql.Rows, error) {
return db.conn.Query(command, args...)
@@ -206,10 +184,11 @@ func scan(rows *sql.Rows, data interface{}) error {
}
// Close connection to database
-func (db Database) Close() {
+func (db Database) Close() error {
if db.conn != nil {
- throw(db.conn.Close())
+ return db.conn.Close()
}
+ return nil
}
func (db Database) load(path string) {
@@ -223,10 +202,3 @@ func (db Database) load(path string) {
panic(err)
}
}
-
-func throw(err error) error {
- if err != nil && env.IsTest() {
- panic(err)
- }
- return err
-}
diff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.go
index 26bd5ee8a..023679fd3 100644
--- a/app/pkg/dbx/dbx_test.go
+++ b/app/pkg/dbx/dbx_test.go
@@ -27,6 +27,7 @@ type tenant struct {
func TestBind_SimpleStruct(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
+ defer db.Close()
u := user{}
@@ -40,6 +41,7 @@ func TestBind_SimpleStruct(t *testing.T) {
func TestBind_SimpleStruct_SingleField(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
+ defer db.Close()
u := user{}
@@ -52,6 +54,7 @@ func TestBind_SimpleStruct_SingleField(t *testing.T) {
func TestBind_SimpleStruct_Multiple(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
+ defer db.Close()
u := []*user{}
@@ -66,6 +69,7 @@ func TestBind_SimpleStruct_Multiple(t *testing.T) {
func TestBind_NestedStruct(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
+ defer db.Close()
u := userWithTenant{}
@@ -88,6 +92,7 @@ func TestBind_NestedStruct(t *testing.T) {
func TestBind_NestedStruct_Multiple(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
+ defer db.Close()
u := []*userWithTenant{}
@@ -105,3 +110,43 @@ func TestBind_NestedStruct_Multiple(t *testing.T) {
Expect(u[1].Name).To(Equal("Arya Stark"))
Expect(u[1].Tenant.Name).To(Equal("Demonstration"))
}
+
+func TestExists_True(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ exists, err := db.Exists("SELECT 1 FROM users WHERE id = 300")
+ Expect(err).To(BeNil())
+ Expect(exists).To(BeTrue())
+}
+
+func TestExists_False(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ exists, err := db.Exists("SELECT 1 FROM users WHERE id = 0")
+ Expect(err).To(BeNil())
+ Expect(exists).To(BeFalse())
+}
+
+func TestCount(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ count, err := db.Count("SELECT 1 FROM users WHERE id = 300")
+ Expect(err).To(BeNil())
+ Expect(count).To(Equal(1))
+}
+
+func TestCount_Empty(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ count, err := db.Count("SELECT 1 FROM users WHERE id = 0")
+ Expect(err).To(BeNil())
+ Expect(count).To(Equal(0))
+}
diff --git a/app/pkg/jwt/jwt_test.go b/app/pkg/jwt/jwt_test.go
index cbbe2b502..e5cc27691 100644
--- a/app/pkg/jwt/jwt_test.go
+++ b/app/pkg/jwt/jwt_test.go
@@ -39,3 +39,19 @@ func TestJWT_Decode(t *testing.T) {
Expect(decoded.UserName).To(Equal(claims.UserName))
Expect(decoded.UserEmail).To(Equal(claims.UserEmail))
}
+
+func TestJWT_DecodeChangedToken(t *testing.T) {
+ RegisterTestingT(t)
+
+ claims := &models.WechyClaims{
+ UserID: 424,
+ UserName: "Jon Snow",
+ UserEmail: "[email protected]",
+ }
+
+ token, _ := jwt.Encode(claims)
+
+ decoded, err := jwt.Decode(token + "foo")
+ Expect(err).ToNot(BeNil())
+ Expect(decoded).To(BeNil())
+}