barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename triple entities were relevant

Browse source
This commit is contained in:
kortschak 2014-08-27 21:27:01 +09:30
parent ddf8849e60
commit 443a091b72
62 changed files with 664 additions and 664 deletions
Download patch file Download diff file Expand all files Collapse all files

6
quad/cquads/cquads.go
View file

@ -65,14 +65,14 @@ func (dec *Decoder) Unmarshal() (quad.Quad, error) {
}
dec.line = dec.line[:0]
}
triple, err := Parse(string(line))
q, err := Parse(string(line))
if err != nil {
return quad.Quad{}, fmt.Errorf("failed to parse %q: %v", dec.line, err)
}
if !triple.IsValid() {
if !q.IsValid() {
return dec.Unmarshal()
}
return triple, nil
return q, nil
}
func unEscape(r []rune, isQuoted, isEscaped bool) string {

12
quad/cquads/cquads_test.go
View file

@ -28,7 +28,7 @@ import (
"github.com/google/cayley/quad"
)
var testNTriples = []struct {
var testNQuads = []struct {
message string
input string
expect quad.Quad
@ -596,7 +596,7 @@ var testNTriples = []struct {
}
func TestParse(t *testing.T) {
for _, test := range testNTriples {
for _, test := range testNQuads {
got, err := Parse(test.input)
_ = err
if err != test.err && (err != nil && err.Error() != test.err.Error()) {
@ -641,20 +641,20 @@ func TestDecoder(t *testing.T) {
dec := NewDecoder(strings.NewReader(document))
var n int
for {
triple, err := dec.Unmarshal()
q, err := dec.Unmarshal()
if err != nil {
if err != io.EOF {
t.Fatalf("Failed to read document:", err)
}
break
}
if triple.Subject == "" || triple.Predicate == "" || triple.Object == "" {
t.Errorf("Unexpected triple, got:%v", triple)
if q.Subject == "" || q.Predicate == "" || q.Object == "" {
t.Errorf("Unexpected quad, got:%v", q)
}
n++
}
if n != 20 {
t.Errorf("Unexpected number of triples read, got:%d expect:20", n)
t.Errorf("Unexpected number of quads read, got:%d expect:20", n)
}
}