go-shiori/shiori
1
1
Fork 0
mirror of https://github.com/go-shiori/shiori.git synced 2025-12-09 21:45:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #20 from peteretelej/wip/tests

Browse source 
Add unit tests for ./cmd
This commit is contained in:
Radhi 2018-03-06 16:59:21 +07:00 • committed by GitHub
commit 035e83746b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 265 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/account.go
View file

@ -2,6 +2,8 @@ package cmd
import (
"fmt"
"io"
"os"
"syscall"
"github.com/spf13/cobra"
@ -45,7 +47,7 @@ var (
Args: cobra.NoArgs,
Run: func(cmd *cobra.Command, args []string) {
keyword, _ := cmd.Flags().GetString("search")
err := printAccounts(keyword)
err := printAccounts(keyword, os.Stdout)
if err != nil {
cError.Println(err)
return
@ -103,7 +105,7 @@ func init() {
func addAccount(username, password string) error {
if username == "" {
return fmt.Errorf("Username must not empty")
return fmt.Errorf("Username must not be empty")
}
if len(password) < 8 {
@ -118,15 +120,15 @@ func addAccount(username, password string) error {
return nil
}
func printAccounts(keyword string) error {
func printAccounts(keyword string, wr io.Writer) error {
accounts, err := DB.GetAccounts(keyword, false)
if err != nil {
return err
}
for _, account := range accounts {
cIndex.Print("- ")
fmt.Println(account.Username)
cIndex.Fprint(wr, "- ")
fmt.Fprintln(wr, account.Username)
}
return nil

50
cmd/account_test.go Normal file
View file

@ -0,0 +1,50 @@
package cmd
import (
"bytes"
"strings"
"testing"
)
func TestAddAccount(t *testing.T) {
tests := []struct {
username string
password string
want string
}{
{"", "", "Username must not be empty"},
{"abc", "abc", "Password must be at least"},
{"abc", "fooBar123", ""},
}
for _, tt := range tests {
err := addAccount(tt.username, tt.password)
if err != nil {
if tt.want == "" {
t.Errorf("got unexpected error: %v", err)
}
if !strings.Contains(err.Error(), tt.want) {
t.Errorf("expected error containing '%s', got error '%v'", err, tt.want)
}
continue
}
if tt.want != "" {
t.Errorf("expected error '%s', got no error", tt.want)
}
}
}
func TestPrintAccounts(t *testing.T) {
if err := addAccount("foo", "fooBar123"); err != nil {
t.Errorf("failed to add test account: %v", err)
return
}
b := bytes.NewBufferString("")
err := printAccounts("", b)
if err != nil {
t.Errorf("got unexpected error: %v", err)
}
got := b.String()
if !strings.Contains(got, "foo") {
t.Errorf("expected string containing 'foo', got '%s'", got)
}
}

3
cmd/add.go
View file

@ -1,7 +1,6 @@
package cmd
import (
"html/template"
nurl "net/url"
"strings"
"time"
@ -81,7 +80,7 @@ func addBookmark(base model.Bookmark, offline bool) (book model.Bookmark, err er
book.MinReadTime = article.Meta.MinReadTime
book.MaxReadTime = article.Meta.MaxReadTime
book.Content = article.Content
book.HTML = template.HTML(article.RawContent)
book.HTML = article.RawContent
if book.Title == "" {
book.Title = article.Meta.Title

73
cmd/add_test.go Normal file
View file

@ -0,0 +1,73 @@
package cmd
import (
"strings"
"testing"
"github.com/RadhiFadlillah/shiori/model"
)
func TestAddBookMark(t *testing.T) {
tests := []struct {
bookmark model.Bookmark
offline bool
want string
}{
{
model.Bookmark{},
true, "URL must not be empty",
},
{
model.Bookmark{
URL: "https://github.com/RadhiFadlillah/shiori",
},
true, "Title must not be empty",
},
{model.Bookmark{URL: "foo", Title: "Foo"}, true, ""},
{
model.Bookmark{
URL: "https://github.com/RadhiFadlillah/shiori",
Title: "Shiori",
},
true, "",
},
{
model.Bookmark{
URL: "https://github.com/RadhiFadlillah/shiori/issues",
},
false, "",
},
}
for _, tt := range tests {
bk, err := addBookmark(tt.bookmark, tt.offline)
if err != nil {
if tt.want == "" {
t.Errorf("got unexpected error: '%v'", err)
continue
}
if !strings.Contains(err.Error(), tt.want) {
t.Errorf("expected error '%s', got '%v'", tt.want, err)
}
continue
}
if tt.bookmark.URL == "" {
t.Errorf("expected error '%s', got '%v'", tt.want, err)
continue
}
if tt.offline && tt.bookmark.Title == "" {
t.Error("expected error 'Title must not be empty', got no error")
continue
}
if tt.want != "" {
t.Errorf("expected error '%s', got no error", tt.want)
continue
}
if tt.offline && bk.Title != tt.bookmark.Title {
t.Errorf("expected title '%s', got '%s'", tt.bookmark.Title, bk.Title)
}
if !tt.offline && bk.Title == "" {
t.Error("expected title, got empty string ''")
}
}
}

28
cmd/cmd_test.go Normal file
View file

@ -0,0 +1,28 @@
package cmd
import (
"fmt"
"os"
"testing"
db "github.com/RadhiFadlillah/shiori/database"
_ "github.com/mattn/go-sqlite3"
)
func TestMain(m *testing.M) {
testDBFile := "shiori_test.db"
sqliteDB, err := db.OpenSQLiteDatabase(testDBFile)
if err != nil {
fmt.Printf("failed to create tests DB: %v", err)
os.Exit(1)
}
DB = sqliteDB
code := m.Run()
if err := os.Remove(testDBFile); err != nil {
fmt.Printf("failed to delete tests DB: %v", err)
}
os.Exit(code)
}

3
cmd/update.go
View file

@ -2,7 +2,6 @@ package cmd
import (
"fmt"
"html/template"
"strconv"
"strings"
"sync"
@ -121,7 +120,7 @@ func updateBookmarks(indices []string, url, title, excerpt string, tags []string
book.MinReadTime = article.Meta.MinReadTime
book.MaxReadTime = article.Meta.MaxReadTime
book.Content = article.Content
book.HTML = template.HTML(article.RawContent)
book.HTML = article.RawContent
mutex.Lock()
bookmarks[pos] = book

91
cmd/update_test.go Normal file
View file

@ -0,0 +1,91 @@
package cmd
import (
"fmt"
"strings"
"testing"
"github.com/RadhiFadlillah/shiori/model"
)
func TestUpdateBookMark(t *testing.T) {
testbks := []model.Bookmark{
{
URL: "https://github.com/RadhiFadlillah/shiori/releases",
Title: "Releases",
},
{
URL: "https://github.com/RadhiFadlillah/shiori/projects",
Title: "Projects",
},
}
for i, tb := range testbks {
bk, err := addBookmark(tb, true)
if err != nil {
t.Fatalf("failed to create testing bookmarks: %v", err)
}
testbks[i].ID = bk.ID
}
tests := []struct {
indices []string
url string
title string
excerpt string
tags []string
offline bool
want string
}{
{
indices: []string{"9000"},
want: "No matching index found",
},
{
indices: []string{"-1"},
want: "Index is not valid",
},
{
indices: []string{"3", "-1"},
want: "Index is not valid",
},
{
indices: []string{fmt.Sprintf("%d", testbks[0].ID)},
url: testbks[0].URL,
title: testbks[0].Title + " updated",
offline: true,
},
{
indices: []string{fmt.Sprintf("%d", testbks[0].ID)},
offline: false,
},
{
indices: []string{fmt.Sprintf("%d", testbks[1].ID)},
offline: true,
},
}
for _, tt := range tests {
bks, err := updateBookmarks(tt.indices, tt.url, tt.title, tt.excerpt, tt.tags, tt.offline)
if err != nil {
if tt.want == "" {
t.Errorf("got unexpected error: '%v'", err)
continue
}
if !strings.Contains(err.Error(), tt.want) {
t.Errorf("expected error '%s', got '%v'", tt.want, err)
}
continue
}
if tt.want != "" {
t.Errorf("expected error '%s', got no errors", tt.want)
continue
}
if len(bks) == 0 {
t.Error("expected at least 1 bookmark, got 0")
continue
}
bk := bks[0]
if tt.title == "" && bk.Title == tt.title {
t.Errorf("expected title as '%s', got '%s'", tt.title, bk.Title)
}
}
}

4
database/sqlite.go
View file

@ -81,11 +81,11 @@ func OpenSQLiteDatabase(databasePath string) (*SQLiteDatabase, error) {
func (db *SQLiteDatabase) CreateBookmark(bookmark model.Bookmark) (bookmarkID int64, err error) {
// Check URL and title
if bookmark.URL == "" {
return -1, fmt.Errorf("URL must not empty")
return -1, fmt.Errorf("URL must not be empty")
}
if bookmark.Title == "" {
return -1, fmt.Errorf("Title must not empty")
return -1, fmt.Errorf("Title must not be empty")
}
if bookmark.Modified == "" {

26
model/model.go
View file

@ -1,7 +1,5 @@
package model
import "html/template"
// Tag is tag for the bookmark
type Tag struct {
ID int64 `db:"id" json:"id"`
@ -11,18 +9,18 @@ type Tag struct {
// Bookmark is record of a specified URL
type Bookmark struct {
ID int64 `db:"id" json:"id"`
URL string `db:"url" json:"url"`
Title string `db:"title" json:"title"`
ImageURL string `db:"image_url" json:"imageURL"`
Excerpt string `db:"excerpt" json:"excerpt"`
Author string `db:"author" json:"author"`
MinReadTime int `db:"min_read_time" json:"minReadTime"`
MaxReadTime int `db:"max_read_time" json:"maxReadTime"`
Modified string `db:"modified" json:"modified"`
Content string `db:"content" json:"-"`
HTML template.HTML `db:"html" json:"-"`
Tags []Tag `json:"tags"`
ID int64 `db:"id" json:"id"`
URL string `db:"url" json:"url"`
Title string `db:"title" json:"title"`
ImageURL string `db:"image_url" json:"imageURL"`
Excerpt string `db:"excerpt" json:"excerpt"`
Author string `db:"author" json:"author"`
MinReadTime int `db:"min_read_time" json:"minReadTime"`
MaxReadTime int `db:"max_read_time" json:"maxReadTime"`
Modified string `db:"modified" json:"modified"`
Content string `db:"content" json:"-"`
HTML string `db:"html" json:"-"`
Tags []Tag `json:"tags"`
}
// Account is account for accessing bookmarks from web interface