Change generated binary to 1.18 (#91)

* Update to support go 1.18 stuff

* add new tests

* change release to use 1.18

* fix older versions

* drop support of 1.13

* up the code coverage

.github/workflows/build_and_test.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         go:
           # Drop support of go 1.12
-          - "1.13"
+          # Drop support of go 1.13
           - "1.14"
           - "1.15"
           - "1.16"

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
 
       - name: Cache Go modules
         uses: actions/cache@v1

Makefile

@@ -48,7 +48,7 @@ build: deps
 	$(GO) build -v -o bin/go-enum -ldflags='-X "main.version=example" -X "main.commit=example" -X "main.date=example" -X "main.builtBy=example"'  .
 
 fmt:
-	gofmt -l -w -s $$(find . -type f -name '*.go' -not -path "./vendor/*")
+	-$(GO) fmt ./...
 
 test: gen-test generate
 	$(GO) test -v -race -coverprofile=coverage.out ./...
@@ -104,3 +104,14 @@ bin/go-bindata: go.sum
 
 generate1_15: generator/assets/assets.go generator/enum.tmpl
 	docker run -i -t -w /app -v $(shell pwd):/app --entrypoint /bin/sh golang:1.15 -c 'make clean $(GOBINDATA) && $(GO) generate ./generator && make clean'
+
+.PHONY: ci
+ci: docker_1.14
+ci: docker_1.15
+ci: docker_1.16
+ci: docker_1.17
+ci: docker_1.18
+
+docker_%:
+	echo "##### testing golang $* #####"
+	docker run -i -t -w /app -v $(shell pwd):/app --entrypoint /bin/sh golang:$* -c 'make clean && make'

example/enum_32_bit.go

@@ -1,4 +1,4 @@
-//go:generate ../bin/go-enum -f=$GOFILE --ptr --marshal
+//go:generate ../bin/go-enum -f=$GOFILE --names
 
 package example
 

example/enum_32_bit_test.go

@@ -0,0 +1,45 @@
+package example
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEnum32Bit(t *testing.T) {
+
+	tests := map[string]struct {
+		input  string
+		output Enum32bit
+	}{
+		"E2P15": {
+			input:  `E2P15`,
+			output: Enum32bitE2P15,
+		},
+		"E2P30": {
+			input:  `E2P30`,
+			output: Enum32bitE2P30,
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			output, err := ParseEnum32bit(tc.input)
+			assert.NoError(t, err)
+			assert.Equal(t, tc.output, output)
+
+			assert.Equal(t, tc.input, output.String())
+		})
+	}
+
+	t.Run("basics", func(t *testing.T) {
+		assert.Equal(t, "E2P23", Enum32bitE2P23.String())
+		assert.Equal(t, "Enum32bit(99)", Enum32bit(99).String())
+		_, err := ParseEnum32bit("-1")
+		assert.Error(t, err)
+
+		names := Enum32bitNames()
+		assert.Len(t, names, 12)
+	})
+
+}

example/enum_64_bit.go

@@ -1,4 +1,4 @@
-//go:generate ../bin/go-enum -f=$GOFILE --ptr --marshal
+//go:generate ../bin/go-enum -f=$GOFILE --names
 
 package example
 

example/enum_64_bit_test.go

@@ -0,0 +1,45 @@
+package example
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEnum64Bit(t *testing.T) {
+
+	tests := map[string]struct {
+		input  string
+		output Enum64bit
+	}{
+		"E2P15": {
+			input:  `E2P15`,
+			output: Enum64bitE2P15,
+		},
+		"E2P63": {
+			input:  `E2P63`,
+			output: Enum64bitE2P63,
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			output, err := ParseEnum64bit(tc.input)
+			assert.NoError(t, err)
+			assert.Equal(t, tc.output, output)
+
+			assert.Equal(t, tc.input, output.String())
+		})
+	}
+
+	t.Run("basics", func(t *testing.T) {
+		assert.Equal(t, "E2P23", Enum64bitE2P23.String())
+		assert.Equal(t, "Enum64bit(99)", Enum64bit(99).String())
+		_, err := ParseEnum64bit("-1")
+		assert.Error(t, err)
+
+		names := Enum64bitNames()
+		assert.Len(t, names, 16)
+	})
+
+}

example/force_lower_test.go

@@ -31,4 +31,11 @@ func TestForceLowerString(t *testing.T) {
 			assert.Equal(t, tc.input, output.String())
 		})
 	}
+
+	t.Run("failures", func(t *testing.T) {
+		assert.Equal(t, "ForceLowerType(99)", ForceLowerType(99).String())
+		_, err := ParseForceLowerType("-1")
+		assert.Error(t, err)
+
+	})
 }

example/user_template_test.go

@@ -11,4 +11,12 @@ func TestUserTemplateColor(t *testing.T) {
 	assert.Equal(t, true, ParseOceanColorExample())
 	assert.Equal(t, true, ParseOceanColorGlobbedExample())
 	assert.Equal(t, true, ParseOceanColorGlobbedExample2())
+
+	val, err := ParseOceanColor("Cerulean")
+	assert.NoError(t, err)
+	assert.Equal(t, "Cerulean", val.String())
+
+	assert.Equal(t, "OceanColor(99)", OceanColor(99).String())
+	_, err = ParseOceanColor("-1")
+	assert.Error(t, err)
 }