Improvements for binapi-generator and support VPP 19.04 in statsclient

[govpp.git] / cmd / binapi-generator / generate_test.go

diff --git a/cmd/binapi-generator/generate_test.go b/cmd/binapi-generator/generate_test.go
index 4b06733..e68b54a 100644 (file)
--- a/cmd/binapi-generator/generate_test.go
+++ b/cmd/binapi-generator/generate_test.go
@@ -16,7 +16,6 @@ package main
 
 import (
        "bufio"
-       "bytes"
        "os"
        "testing"
 
@@ -86,7 +85,7 @@ func TestGenerateFromFileGeneratePackageError(t *testing.T) {
 func TestGetContext(t *testing.T) {
        RegisterTestingT(t)
        outDir := "test_output_directory"
-       result, err := getContext("testdata/af_packet.api.json", outDir)
+       result, err := newContext("testdata/af_packet.api.json", outDir)
        Expect(err).ShouldNot(HaveOccurred())
        Expect(result).ToNot(BeNil())
        Expect(result.outputFile).To(BeEquivalentTo(outDir + "/af_packet/af_packet.ba.go"))
@@ -95,7 +94,7 @@ func TestGetContext(t *testing.T) {
 func TestGetContextNoJsonFile(t *testing.T) {
        RegisterTestingT(t)
        outDir := "test_output_directory"
-       result, err := getContext("testdata/input.txt", outDir)
+       result, err := newContext("testdata/input.txt", outDir)
        Expect(err).Should(HaveOccurred())
        Expect(err.Error()).To(ContainSubstring("invalid input file name"))
        Expect(result).To(BeNil())
@@ -104,7 +103,7 @@ func TestGetContextNoJsonFile(t *testing.T) {
 func TestGetContextInterfaceJson(t *testing.T) {
        RegisterTestingT(t)
        outDir := "test_output_directory"
-       result, err := getContext("testdata/ip.api.json", outDir)
+       result, err := newContext("testdata/ip.api.json", outDir)
        Expect(err).ShouldNot(HaveOccurred())
        Expect(result).ToNot(BeNil())
        Expect(result.outputFile)
@@ -139,7 +138,6 @@ func TestGeneratePackage(t *testing.T) {
        // prepare input/output output files
        inputData, err := readFile("testdata/ip.api.json")
        Expect(err).ShouldNot(HaveOccurred())
-       testCtx.inputBuff = bytes.NewBuffer(inputData)
        jsonRoot, err := parseJSON(inputData)
        Expect(err).ShouldNot(HaveOccurred())
        testCtx.packageData, err = parsePackage(testCtx, jsonRoot)
@@ -165,7 +163,6 @@ func TestGenerateMessageType(t *testing.T) {
        // prepare input/output output files
        inputData, err := readFile("testdata/ip.api.json")
        Expect(err).ShouldNot(HaveOccurred())
-       testCtx.inputBuff = bytes.NewBuffer(inputData)
        jsonRoot, err := parseJSON(inputData)
        Expect(err).ShouldNot(HaveOccurred())
        outDir := "test_output_directory"