#102, add test for invalid json

fairDataSociety · Nov 24, 2021 · 421cdb1 · 421cdb1
1 parent b8e3eed
commit 421cdb1
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 25 deletions.
diff --git a/pkg/collection/document.go b/pkg/collection/document.go
@@ -1080,11 +1080,6 @@ func (d *Document) DocBatchPut(docBatch *DocBatch, doc []byte, index int64) erro
 		return err
 	}
 	switch t.(type) {
-	case []interface{}:
-		// it's an array
-		// TODO: handle array of objects
-		d.logger.Errorf("inserting in batch: unknown json format")
-		return errors.New("unknown json format")
 	case map[string]interface{}:
 		// it's an object
 		docMap := t.(map[string]interface{})
@@ -1283,7 +1278,7 @@ func (d *Document) DocBatchPut(docBatch *DocBatch, doc []byte, index int64) erro
 	default:
 		// it's something else
 		d.logger.Errorf("inserting in batch: unknown json format")
-		return errors.New("unknown json format")
+		return ErrUnknownJsonFormat
 	}
 
 	return nil

diff --git a/pkg/collection/document_test.go b/pkg/collection/document_test.go
@@ -863,25 +863,51 @@ func addDocument(t *testing.T, docStore *collection.Document, dbName, id, fname,
 
 func addBatchDocument(t *testing.T, docStore *collection.Document, docBatch *collection.DocBatch, id, fname, lname string, age float64, tagMap map[string]string, tagList []string) {
 	t.Helper()
-	// create the doc
-	doc := &TestDocument{
-		ID:        id,
-		FirstName: fname,
-		LastName:  lname,
-		Age:       age,
-		TagMap:    tagMap,
-		TagList:   tagList,
-	}
+	t.Run("valid-json", func(t *testing.T) {
+		// create the doc
+		doc := &TestDocument{
+			ID:        id,
+			FirstName: fname,
+			LastName:  lname,
+			Age:       age,
+			TagMap:    tagMap,
+			TagList:   tagList,
+		}
 
-	// marshall the doc
-	data, err := json.Marshal(doc)
-	if err != nil {
-		t.Fatal(err)
-	}
+		// marshall the doc
+		data, err := json.Marshal(doc)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		// insert the document in the batch
+		err = docStore.DocBatchPut(docBatch, data, 0)
+		if err != nil {
+			t.Fatal(err)
+		}
+	})
+	t.Run("invalid-json", func(t *testing.T) {
+		// create the doc
+		doc := TestDocument{
+			ID:        id,
+			FirstName: fname,
+			LastName:  lname,
+			Age:       age,
+			TagMap:    tagMap,
+			TagList:   tagList,
+		}
+
+		// marshall the doc
+		data, err := json.Marshal([]TestDocument{doc})
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		// insert the document in the batch
+		err = docStore.DocBatchPut(docBatch, data, 0)
+		if err != collection.ErrUnknownJsonFormat {
+			t.Fatal(err)
+		}
+	})
 
-	// insert the document in the batch
-	err = docStore.DocBatchPut(docBatch, data, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
 }
diff --git a/pkg/collection/errors.go b/pkg/collection/errors.go
@@ -50,4 +50,5 @@ var (
 	ErrReadOnlyIndex                  = errors.New("read only index")
 	ErrCannotModifyImmutableIndex     = errors.New("trying to modify immutable index")
 	ErrCouldNotUpdatePostageBatch     = errors.New("could not procure new postage batch")
+	ErrUnknownJsonFormat              = errors.New("unknown json format")
 )