1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-09-15 18:57:04 +00:00

Ensure that LocalizedError are returned by parsers

This commit is contained in:
Frédéric Guillot 2017-11-20 16:11:55 -08:00
parent 557cf9c21d
commit 0e6717b7c8
15 changed files with 71 additions and 30 deletions

View file

@ -6,9 +6,10 @@ package json
import (
"encoding/json"
"fmt"
"github.com/miniflux/miniflux2/model"
"io"
"github.com/miniflux/miniflux2/errors"
"github.com/miniflux/miniflux2/model"
)
// Parse returns a normalized feed struct.
@ -16,7 +17,7 @@ func Parse(data io.Reader) (*model.Feed, error) {
jsonFeed := new(JsonFeed)
decoder := json.NewDecoder(data)
if err := decoder.Decode(&jsonFeed); err != nil {
return nil, fmt.Errorf("Unable to parse JSON Feed: %v", err)
return nil, errors.NewLocalizedError("Unable to parse JSON Feed: %v", err)
}
return jsonFeed.Transform(), nil

View file

@ -9,6 +9,8 @@ import (
"strings"
"testing"
"time"
"github.com/miniflux/miniflux2/errors"
)
func TestParseJsonFeed(t *testing.T) {
@ -343,3 +345,15 @@ func TestParseTruncateItemTitle(t *testing.T) {
t.Errorf("Incorrect entry title, got: %s", feed.Entries[0].Title)
}
}
func TestParseInvalidJSON(t *testing.T) {
data := `garbage`
_, err := Parse(bytes.NewBufferString(data))
if err == nil {
t.Error("Parse should returns an error")
}
if _, ok := err.(errors.LocalizedError); !ok {
t.Error("The error returned must be a LocalizedError")
}
}