Improve binapi generator

[govpp.git] / binapigen / generator_test.go

diff --git a/binapigen/generator_test.go b/binapigen/generator_test.go
index 9e5b342..aa4ee04 100644 (file)
--- 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)
-                       }
-               })
-       }
-}*/