started work on table tests

Author: xrotwang

csvw/table/table.go

@@ -74,10 +74,13 @@ func New(jsonTable map[string]interface{}) (*Table, error) {
 		}
 	}
 	var pk []string
-	for _, col := range jsonTable["tableSchema"].(map[string]interface{})["primaryKey"].([]interface{}) {
-		val, ok := col.(string)
-		if ok {
-			pk = append(pk, val)
+	jsonPk, ok := jsonTable["tableSchema"].(map[string]interface{})["primaryKey"]
+	if ok {
+		for _, col := range jsonPk.([]interface{}) {
+			val, ok := col.(string)
+			if ok {
+				pk = append(pk, val)
+			}
 		}
 	}
 	res := &Table{

csvw/table/table_test.go

@@ -1,10 +1,18 @@
 package table
 
-/*
-func makeTable(url string, schema string) Table {
-	var result map[string]interface{}
+import (
+	"encoding/json"
+	"os"
+	"testing"
+)
 
-	err := json.Unmarshal([]byte(jsonString), &result)
+func makeTable(fname string) Table {
+	data, err := os.ReadFile("testdata/" + fname)
+	if err != nil {
+		panic(err)
+	}
+	var result map[string]interface{}
+	err = json.Unmarshal(data, &result)
 	if err != nil {
 		panic(err)
 	}
@@ -15,22 +23,27 @@ func makeTable(url string, schema string) Table {
 	return *tbl
 }
 
-func TestTable_t(t *testing.T) {
-	var tests = []struct {
-		jsonCol string
-		input   string
-	}{
-		{`{}`, "string"},
-		{`{"datatype": "boolean"}`, "boolean"},
-		{`{"datatype": {"base": "boolean"}}`, "boolean"},
-	}
-	for _, tt := range tests {
-		t.Run("Datatype", func(t *testing.T) {
-			col := makeCol(tt.jsonCol)
-			if tt.input != col.Datatype.Base {
-				t.Errorf(`problem: %q vs %q`, tt.input, col.Datatype.Base)
-			}
-		})
+func TestTable_simple(t *testing.T) {
+	tbl := makeTable("table_simple.json")
+	if len(tbl.PrimaryKey) > 0 {
+		t.Errorf(`problem: %q vs %q`, len(tbl.PrimaryKey), 0)
+	}
+	if len(tbl.Columns) != 1 {
+		t.Errorf(`problem: %q vs %q`, len(tbl.Columns), 1)
+	}
+	if tbl.CanonicalName != "table_simple.csv" {
+		t.Errorf(`problem: %q vs %q`, len(tbl.CanonicalName), "table_simple.csv")
+	}
+	result := make(chan TableRead, 1)
+	go tbl.Read("testdata/", result)
+	tableRead := <-result
+	if tableRead.Err != nil || tableRead.Url != "table_simple.csv" {
+		t.Errorf(`problem`)
+	}
+	if len(tbl.Data) != 3 {
+		t.Errorf(`problem`)
+	}
+	if tbl.Data[0]["ID"] != "a" {
+		t.Errorf(`problem`)
 	}
 }
-*/

csvw/table/testdata/table_simple.csv

@@ -0,0 +1,4 @@
+ID
+a
+b
+c

csvw/table/testdata/table_simple.json

@@ -0,0 +1,14 @@
+{
+  "url": "table_simple.csv",
+  "tableSchema": {
+    "columns": [
+      {
+        "datatype": {
+          "base": "string",
+          "format": "[a-zA-Z0-9_\\-]+"
+        },
+        "name": "ID"
+      }
+    ]
+  }
+}