From d1f24d37bd447b64e402298bb8eb2479681facf9 Mon Sep 17 00:00:00 2001
From: Ondrej Fabry <ofabry@cisco.com>
Date: Fri, 17 Jul 2020 10:36:28 +0200
Subject: Improve binapi generator

- simplified Size/Marshal/Unmarshal methods
- replace struc in unions with custom marshal/unmarshal
- fix imports in generated files
- fix mock adapter
- generate rpc service using low-level stream API (dumps generate control ping or stream msg..)
- move examples/binapi to binapi and generate all API for latest release
- add binapigen.Plugin for developing custom generator plugins
- optionally generate HTTP handlers (REST API) for RPC services
- add govpp program for browsing VPP API

Change-Id: I092e9ed2b0c17972b3476463c3d4b14dd76ed42b
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
---
 binapigen/generator_test.go | 76 +++------------------------------------------
 1 file changed, 4 insertions(+), 72 deletions(-)

(limited to 'binapigen/generator_test.go')

diff --git a/binapigen/generator_test.go b/binapigen/generator_test.go
index 9e5b342..aa4ee04 100644
--- a/binapigen/generator_test.go
+++ b/binapigen/generator_test.go
@@ -18,10 +18,10 @@ import (
 	"testing"
 )
 
-func TestModule(t *testing.T) {
-	const expected = "git.fd.io/govpp.git/examples/binapi"
+func TestGoModule(t *testing.T) {
+	const expected = "git.fd.io/govpp.git/binapi"
 
-	impPath := resolveImportPath("../examples/binapi")
+	impPath := resolveImportPath("../binapi")
 	if impPath != expected {
 		t.Fatalf("expected: %q, got: %q", expected, impPath)
 	}
@@ -42,78 +42,10 @@ func TestBinapiTypeSizes(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			size := getBinapiTypeSize(test.input)
+			size := getSizeOfBinapiTypeLength(test.input, 1)
 			if size != test.expsize {
 				t.Errorf("expected %d, got %d", test.expsize, size)
 			}
 		})
 	}
 }
-
-/*func TestSizeOfType(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   StructType
-		expsize int
-	}{
-		{
-			name: "basic1",
-			input: StructType{
-				Fields: []Field{
-					{Type: "u8"},
-				},
-			},
-			expsize: 1,
-		},
-		{
-			name: "basic2",
-			input: Type{
-				Fields: []Field{
-					{Type: "u8", Length: 4},
-				},
-			},
-			expsize: 4,
-		},
-		{
-			name: "basic3",
-			input: Type{
-				Fields: []Field{
-					{Type: "u8", Length: 16},
-				},
-			},
-			expsize: 16,
-		},
-		{
-			name: "withEnum",
-			input: Type{
-				Fields: []Field{
-					{Type: "u16"},
-					{Type: "vl_api_myenum_t"},
-				},
-			},
-			expsize: 6,
-		},
-		{
-			name: "invalid1",
-			input: Type{
-				Fields: []Field{
-					{Type: "x", Length: 16},
-				},
-			},
-			expsize: 0,
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			module := &File{
-				Enums: []Enum{
-					{Name: "myenum", Type: "u32"},
-				},
-			}
-			size := getSizeOfType(module, &test.input)
-			if size != test.expsize {
-				t.Errorf("expected %d, got %d", test.expsize, size)
-			}
-		})
-	}
-}*/
-- 
cgit 1.2.3-korg