X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=binapigen%2Fgenerate_test.go;h=2fa5dc6762283b4ec400fb19d62e5fceac72f117;hb=e517439567ad843033257664fdfe90a9173b0aa6;hp=5a2a07aab53b0a7369852cebe78ebee77fa7b856;hpb=94620e85f0bdbb054af07ce3670fadc1f76cfdf0;p=govpp.git

diff --git a/binapigen/generate_test.go b/binapigen/generate_test.go
index 5a2a07a..2fa5dc6 100644
--- a/binapigen/generate_test.go
+++ b/binapigen/generate_test.go
@@ -20,36 +20,30 @@ import (
 
 	. "github.com/onsi/gomega"
 
+	"git.fd.io/govpp.git/binapi/ip_types"
 	"git.fd.io/govpp.git/binapigen/vppapi"
 )
 
-const testOutputDir = "test_output_directory"
+const testOutputDir = "test_output_dir"
 
-func GenerateFromFile(apiDir, outputDir string, opts Options) error {
-	// parse API files
-	apifiles, err := vppapi.ParseDir(apiDir)
+func GenerateFromFile(file string, opts Options) error {
+	apifile, err := vppapi.ParseFile(file)
 	if err != nil {
 		return err
 	}
-
-	g, err := New(opts, apifiles)
+	gen, err := New(opts, []*vppapi.File{apifile}, nil)
 	if err != nil {
 		return err
 	}
-	for _, file := range g.Files {
+	for _, file := range gen.Files {
 		if !file.Generate {
 			continue
 		}
-		GenerateBinapiFile(g, file, outputDir)
-		if file.Service != nil {
-			GenerateRPC(g, file, outputDir)
-		}
+		GenerateAPI(gen, file)
 	}
-
-	if err = g.Generate(); err != nil {
+	if err = gen.Generate(); err != nil {
 		return err
 	}
-
 	return nil
 }
 
@@ -59,7 +53,8 @@ func TestGenerateFromFile(t *testing.T) {
 	// remove directory created during test
 	defer os.RemoveAll(testOutputDir)
 
-	err := GenerateFromFile("testdata/acl.api.json", testOutputDir, Options{})
+	opts := Options{OutputDir: testOutputDir}
+	err := GenerateFromFile("vppapi/testdata/acl.api.json", opts)
 	Expect(err).ShouldNot(HaveOccurred())
 	fileInfo, err := os.Stat(testOutputDir + "/acl/acl.ba.go")
 	Expect(err).ShouldNot(HaveOccurred())
@@ -70,17 +65,19 @@ func TestGenerateFromFile(t *testing.T) {
 func TestGenerateFromFileInputError(t *testing.T) {
 	RegisterTestingT(t)
 
-	err := GenerateFromFile("testdata/nonexisting.json", testOutputDir, Options{})
+	opts := Options{OutputDir: testOutputDir}
+	err := GenerateFromFile("vppapi/testdata/nonexisting.json", opts)
 	Expect(err).Should(HaveOccurred())
-	Expect(err.Error()).To(ContainSubstring("invalid input file name"))
+	Expect(err.Error()).To(ContainSubstring("unsupported"))
 }
 
 func TestGenerateFromFileReadJsonError(t *testing.T) {
 	RegisterTestingT(t)
 
-	err := GenerateFromFile("testdata/input-read-json-error.json", testOutputDir, Options{})
+	opts := Options{OutputDir: testOutputDir}
+	err := GenerateFromFile("vppapi/testdata/input-read-json-error.json", opts)
 	Expect(err).Should(HaveOccurred())
-	Expect(err.Error()).To(ContainSubstring("invalid input file name"))
+	Expect(err.Error()).To(ContainSubstring("unsupported"))
 }
 
 func TestGenerateFromFileGeneratePackageError(t *testing.T) {
@@ -94,10 +91,25 @@ func TestGenerateFromFileGeneratePackageError(t *testing.T) {
 		os.RemoveAll(testOutputDir)
 	}()
 
-	err := GenerateFromFile("testdata/input-generate-error.json", testOutputDir, Options{})
+	opts := Options{OutputDir: testOutputDir}
+	err := GenerateFromFile("vppapi/testdata/input-generate-error.json", opts)
 	Expect(err).Should(HaveOccurred())
 }
 
+func TestAddress(t *testing.T) {
+	RegisterTestingT(t)
+
+	addr := ip_types.AddressUnionIP4(ip_types.IP4Address{10, 20, 0, 1})
+	t.Logf("addr: %v (%#v)", addr, addr)
+
+	ip4 := addr.GetIP4()
+	t.Logf("ip4: %v", ip4)
+	addr.SetIP4(ip_types.IP4Address{192, 168, 1, 1})
+	t.Logf("ip4: %v", addr.GetIP4())
+
+	Expect(addr.GetIP4()).To(Equal(ip_types.IP4Address{192, 168, 1, 1}))
+}
+
 /*func TestGetContext(t *testing.T) {
 	RegisterTestingT(t)
 	outDir := "test_output_directory"
@@ -147,7 +159,7 @@ func TestGetContextInterfaceJson(t *testing.T) {
 	// prepare writer
 	writer := bufio.NewWriter(outFile)
 	Expect(writer.Buffered()).To(BeZero())
-	err = generatePackage(testCtx, writer)
+	err = GenerateFileBinapi(testCtx, writer)
 	Expect(err).ShouldNot(HaveOccurred())
 }
 
@@ -173,7 +185,7 @@ func TestGenerateMessageType(t *testing.T) {
 	writer := bufio.NewWriter(outFile)
 
 	for _, msg := range testCtx.file.Messages {
-		generateMessage(testCtx, writer, &msg)
+		genMessage(testCtx, writer, &msg)
 		Expect(writer.Buffered()).ToNot(BeZero())
 	}
 }*/
@@ -202,7 +214,7 @@ func TestGenerateMessageType(t *testing.T) {
 	for i := 0; i < types.Len(); i++ {
 		typ := types.At(i)
 		Expect(writer.Buffered()).To(BeZero())
-		err := generateMessage(testCtx, writer, typ, false)
+		err := genMessage(testCtx, writer, typ, false)
 		Expect(err).ShouldNot(HaveOccurred())
 		Expect(writer.Buffered()).ToNot(BeZero())
 
@@ -313,7 +325,7 @@ func TestGeneratePackageHeader(t *testing.T) {
 	// prepare writer
 	writer := bufio.NewWriter(outFile)
 	Expect(writer.Buffered()).To(BeZero())
-	generateHeader(testCtx, writer, inFile)
+	genPackageComment(testCtx, writer, inFile)
 	Expect(writer.Buffered()).ToNot(BeZero())
 }