Add unit tests

Author: tsuzu

go.mod

@@ -4,6 +4,7 @@ go 1.16
 
 require (
 	github.com/go-generalize/go2ts v1.0.5 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/k0kubun/pp v3.0.1+incompatible // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect

go.sum

@@ -3,6 +3,8 @@ github.com/go-generalize/go2ts v1.0.4/go.mod h1:075q+zcpc6IjwYy9WpJpY+M9ssbEA6uc
 github.com/go-generalize/go2ts v1.0.5 h1:AA0crVIsEmxmcPDorBXevOt8cEwVl3iLkCEaElb/Mmk=
 github.com/go-generalize/go2ts v1.0.5/go.mod h1:075q+zcpc6IjwYy9WpJpY+M9ssbEA6uccjzWwr59t3M=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/iancoleman/strcase v0.1.2/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40=
 github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg=

pkg/generator/generator.go

@@ -6,7 +6,6 @@ import (
 	_ "embed"
 	"fmt"
 	"sort"
-	"strings"
 	"text/template"
 
 	tstypes "github.com/go-generalize/go2ts/pkg/types"
@@ -51,7 +50,6 @@ type generatorParam struct {
 	Consts  []constant
 	Objects []object
 
-	FileName       string
 	UseTimePackage bool
 }
 
@@ -60,22 +58,19 @@ type metadata struct {
 	inlineIndex     int
 }
 
-func NewGenerator(types map[string]tstypes.Type, prereserved []string, fileName string) *Generator {
+func NewGenerator(types map[string]tstypes.Type, prereserved []string) *Generator {
 	prs := map[string]string{}
 	for _, p := range prereserved {
 		_, name := SplitPackegeStruct(p)
 		prs[name] = p
 	}
 
 	return &Generator{
-		types: types,
-		generatorParam: generatorParam{
-			FileName: strings.TrimSuffix(fileName, ".dart"),
-		},
-
-		converted:   map[string]string{},
-		reserved:    map[string]struct{}{},
-		prereserved: prs,
+		types:          types,
+		generatorParam: generatorParam{},
+		converted:      map[string]string{},
+		reserved:       map[string]struct{}{},
+		prereserved:    prs,
 	}
 }
 

pkg/generator/generator_test.go

@@ -1,29 +1,41 @@
 package generator
 
 import (
+	_ "embed"
+	"encoding/json"
+	"fmt"
 	"os"
+	"os/exec"
+	"path/filepath"
 	"testing"
 
 	"github.com/go-generalize/go2ts/pkg/parser"
+	"github.com/google/go-cmp/cmp"
 )
 
-func TestGenerate(t *testing.T) {
-	// filter := func(opt *parser.FilterOpt) bool {
-	// 	if opt.Dependency {
-	// 		return true
-	// 	}
-	// 	if !opt.BasePackage {
-	// 		return false
-	// 	}
-	// 	if !opt.Exported {
-	// 		return false
-	// 	}
+const runnerDart = `import 'dart:convert';
+import 'dart:io';
+import 'gen.dart';
 
-	// 	return strings.HasSuffix(opt.Name, "Request") || strings.HasSuffix(opt.Name, "Response")
-	// }
+void main(List<String> arguments) async {
+  final input = await stdin.transform(utf8.decoder).join('');
 
-	psr, err := parser.NewParser("./testdata/standard", parser.All)
+  print(jsonEncode(%s.fromJson(jsonDecode(input)).toJson()));
+}
+`
+
+func parseJson(t *testing.T, v string) map[string]interface{} {
+	t.Helper()
+	m := map[string]interface{}{}
+	if err := json.Unmarshal([]byte(v), &m); err != nil {
+		t.Fatal(err)
+	}
 
+	return m
+}
+
+func testWithDatasets(t *testing.T, dir, structName string) {
+	psr, err := parser.NewParser(dir, parser.All)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -33,14 +45,69 @@ func TestGenerate(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	gen := NewGenerator(res, []string{}, "a.dart")
+	gen := NewGenerator(res, []string{})
 	b, err := gen.Generate()
 
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if err := os.WriteFile("./testdata/standard/gen.dart", []byte(b), 0744); err != nil {
+	if err := os.WriteFile(filepath.Join(dir, "/gen.dart"), []byte(b), 0744); err != nil {
+		t.Fatal(err)
+	}
+
+	runnerDart := fmt.Sprintf(
+		runnerDart,
+		structName,
+	)
+
+	runnerDartPath := filepath.Join(dir, "/runner.dart")
+
+	if err := os.WriteFile(runnerDartPath, []byte(runnerDart), 0744); err != nil {
 		t.Fatal(err)
 	}
+
+	datasetsDir := filepath.Join(dir, "datasets")
+
+	des, err := os.ReadDir(datasetsDir)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, d := range des {
+		t.Run(d.Name(), func(t *testing.T) {
+			fp, err := os.Open(filepath.Join(datasetsDir, d.Name(), "input.json"))
+
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer fp.Close()
+
+			cmd := exec.Command("dart", "run", runnerDartPath)
+			cmd.Stdin = fp
+			output, err := cmd.CombinedOutput()
+			if err != nil {
+				t.Fatal(err, string(output))
+			}
+
+			expectedBytes, err := os.ReadFile(filepath.Join(datasetsDir, d.Name(), "output.json"))
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			t.Log("output", string(output))
+
+			expectedJson := parseJson(t, string(expectedBytes))
+			outputJson := parseJson(t, string(output))
+
+			if diff := cmp.Diff(expectedJson, outputJson); diff != "" {
+				t.Errorf("diff: %s", diff)
+			}
+		})
+	}
+}
+
+func TestGenerator_Generate(t *testing.T) {
+	testWithDatasets(t, "testdata/standard", "PostUserRequest")
 }

pkg/generator/testdata/.gitignore

@@ -0,0 +1 @@
+*.dart

pkg/generator/testdata/standard/.gitignore

@@ -0,0 +1,25 @@
+{
+    "Array": [
+      "OK",
+      "Failure"
+    ],
+    "B": {"a": false},
+    "Mode": 1,
+    "s": "sss",
+    "Status": {
+      "aaa": [
+        "OK",
+        "Failure"
+      ],
+      "bbb": null
+    },
+    "SinS": {
+      "A": true,
+      "B": "sss",
+      "C": [
+        "sss",
+        "sss"
+      ]
+    },
+    "T": "2006-04-13T14:12:53.424212Z"
+}

pkg/generator/testdata/standard/datasets/001/input.json

@@ -0,0 +1,26 @@
+{
+    "Array": [
+      "OK",
+      "Failure"
+    ],
+    "B": {"a": false},
+    "Mode": 1,
+    "s": "sss",
+    "Status": {
+      "aaa": [
+        "OK",
+        "Failure"
+      ],
+      "bbb": null
+    },
+    "SinS": {
+      "A": true,
+      "B": "sss",
+      "C": [
+        "sss",
+        "sss"
+      ]
+    },
+    "SinSs": null,
+    "T": "2006-04-13T14:12:53.424212Z"
+}

pkg/generator/testdata/standard/datasets/001/output.json

@@ -1,19 +1,26 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  json_annotation:
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
+  intl:
     dependency: "direct main"
     description:
-      name: json_annotation
+      name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
-  meta:
+    version: "0.17.0"
+  path:
     dependency: transitive
     description:
-      name: meta
+      name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
 sdks:
   dart: ">=2.12.1 <3.0.0"

pubspec.lock

@@ -5,4 +5,4 @@ environment:
   sdk: '>=2.12.1 <3.0.0'
 
 dependencies:
-  json_annotation: ^4.0.0
+  intl: ^0.17.0