Unquote string correctly.

Author: defrager

triple/predicate/predicate.go

@@ -18,6 +18,7 @@ package predicate
 import (
 	"encoding/base64"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -80,7 +81,11 @@ func Parse(s string) (*Predicate, error) {
 	if idx < 0 {
 		return nil, fmt.Errorf("predicate.Parse could not find anchor definition in %s", raw)
 	}
-	id, ta := raw[1:idx], raw[idx+3:len(raw)-1]
+	id, ta := raw[0:idx+1], raw[idx+3:len(raw)-1]
+	id, err := strconv.Unquote(id)
+	if err != nil {
+		return nil, fmt.Errorf("predicate.Parse can't unquote id in %s: %v", raw, err)
+	}
 	// TODO: if id has \" inside, it should be unquoted.
 	if ta == "" {
 		return &Predicate{

triple/predicate/predicate_test.go

@@ -106,7 +106,7 @@ func TestParse(t *testing.T) {
 	pretty := fmt.Sprintf("\"bar\"@[%s]", date)
 	got, err := Parse(pretty)
 	if err != nil {
-		t.Errorf("predicate.Parse could not create a predicate for %s with error %v", pretty, err)
+		t.Fatalf("predicate.Parse could not create a predicate for %s with error %v", pretty, err)
 	}
 	if got.Type() != Temporal {
 		t.Errorf("predicate.Parse should have returned a temporal predicate, instead returned %s", got)
@@ -121,9 +121,29 @@ func TestParse(t *testing.T) {
 
 	imm, err := Parse("\"foo\"@[]")
 	if err != nil {
-		t.Errorf("predicate.Parse failed to immutable predicate \"foo\"@[] with error %v", err)
+		t.Errorf("predicate.Parse failed to parse immutable predicate \"foo\"@[] with error %v", err)
 	}
 	if imm.Type() != Immutable || imm.ID() != "foo" {
-		t.Errorf("predicate.Parse failed to immutable predicate \"foo\"@[]; got %v instead", imm)
+		t.Errorf("predicate.Parse failed to parse immutable predicate \"foo\"@[]; got %v instead", imm)
+	}
+}
+
+func TestQuotedID(t *testing.T) {
+	const id = "ba\"r"
+	const pretty = "\"ba\\\"r\"@[]"
+	immut, err := NewImmutable(id)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got, want := immut.String(), pretty; got != want {
+		t.Fatalf("predicate.String() = %v; want %v", got, want)
+	}
+
+	immut, err = Parse(pretty)
+	if err != nil {
+		t.Fatalf("predicate.Parse failed to parse immutable predicate \"foo\"@[] with error %v", err)
+	}
+	if immut.Type() != Immutable || immut.ID() != id {
+		t.Errorf("predicate.Parse failed to parse immutable predicate %v; got %v instead", pretty, immut)
 	}
 }