Fix broken ParseDocument function for Discovery files + improve tests. (

#199)

discovery/discovery_test.go

@@ -0,0 +1,48 @@
+// Copyright 2020 Google LLC. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package discovery_v1
+
+import (
+	"io/ioutil"
+	"testing"
+)
+
+func TestParseDocument(t *testing.T) {
+	filename := "../examples/discovery/discovery-v1.json"
+	b, err := ioutil.ReadFile(filename)
+	if err != nil {
+		t.Logf("unable to read file %s", filename)
+		t.FailNow()
+	}
+	d, err := ParseDocument(b)
+	if err != nil {
+		t.Logf("%s", err.Error())
+		t.FailNow()
+	}
+	// expected values
+	name := "discovery"
+	version := "v1"
+	title := "API Discovery Service"
+	// check actual values
+	if d.Name != name {
+		t.Errorf("unexpected value for Name: %s (expected %s)", d.Name, name)
+	}
+	if d.Version != version {
+		t.Errorf("unexpected value for Version: %s (expected %s)", d.Version, version)
+	}
+	if d.Title != title {
+		t.Errorf("unexpected value for Title: %s (expected %s)", d.Title, title)
+	}
+}

discovery/document.go

@@ -15,26 +15,19 @@
 package discovery_v1
 
 import (
-	"errors"
-	"log"
-
 	"github.com/googleapis/gnostic/compiler"
 )
 
+// FetchDocumentBytes downloads the bytes of a discovery document from a URL.
 func FetchDocumentBytes(documentURL string) ([]byte, error) {
 	return compiler.FetchFile(documentURL)
 }
 
-func ParseDocument(bytes []byte) (*Document, error) {
-	// Unpack the discovery document.
-	info, err := compiler.ReadInfoFromBytes("", bytes)
+// ParseDocument reads a Discovery description from a YAML/JSON representation.
+func ParseDocument(b []byte) (*Document, error) {
+	info, err := compiler.ReadInfoFromBytes("", b)
 	if err != nil {
 		return nil, err
 	}
-	m, ok := compiler.UnpackMap(info)
-	if !ok {
-		log.Printf("%s", string(bytes))
-		return nil, errors.New("Invalid input")
-	}
-	return NewDocument(m, compiler.NewContext("$root", nil))
+	return NewDocument(info.Content[0], compiler.NewContext("$root", nil))
 }