Allow filtering non-graphicHEADmaster

1 files changed, 129 insertions, 37 deletions

diff --git a/generator_test.go b/generator_test.go
index afbee71..6ac4423 100644
--- a/generator_test.go
+++ b/generator_test.go
@@ -2,59 +2,151 @@ package bechars
 
 import (
 	"testing"
+
+	"github.com/google/go-cmp/cmp"
 )
 
 func TestGenerator(t *testing.T) {
 	tests := []struct {
 		in       string
 		expected string
+		options  []Option
 	}{
-		{"[abc]", "abc"},
+		{
+			in:       "[abc]",
+			expected: "abc",
+		},
 		// First characters
-		{"[]", ""},
-		{"[-]", "-"},
-		{"[]abc]", "]abc"},
+		{in: "[]", expected: ""},
+		{in: "[-]", expected: "-"},
+		{in: "[]abc]", expected: "]abc"},
 		// Character
-		{"[\u0e010-2]", "ก012"},
+		{in: "[\u0e010-2]",
+			expected: "ก012",
+		},
+		// Unicode
+		{in: "[ก0-2]",
+			expected: "ก012",
+		},
 		// Not
-		{"[^:cntrl::punct:]", " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"},
-		{"[^-:cntrl::digit:]", " !\"#$%&'()*+,./:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"},
-		{"[^]:cntrl::digit:]", " !\"#$%&'()*+,-./:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`abcdefghijklmnopqrstuvwxyz{|}~"},
+		{
+			in:       "[^:cntrl::punct:]",
+			expected: " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
+		},
+		{
+			in:       "[^-:cntrl::digit:]",
+			expected: " !\"#$%&'()*+,./:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
+		},
+		{
+			in:       "[^]:cntrl::digit:]",
+			expected: " !\"#$%&'()*+,-./:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`abcdefghijklmnopqrstuvwxyz{|}~",
+		},
 		// Classes
-		{"[:alnum:]", "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"},
-		{"[:alpha:]", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"},
-		{"[:digit:]", "0123456789"},
-		{"[:space:]", " \t\n\r\f\v"},
-		{"[:blank:]", " \t"},
-		{"[:word:]", "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_"},
-		{"[:cntrl:]", "\x00\x01\x02\x03\x04\x05\x06\a\b\t\n\v\f\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\u007f"},
-		{"[:lower:]", "abcdefghijklmnopqrstuvwxyz"},
-		{"[:upper:]", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"},
-		{"[:digit::upper:]", "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"},
-		{"[:print:]", " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"},
-		{"[:graph:]", " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"},
-		{"[:punct:]", "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~]"},
-		{"[:xdigit:]", "abcdefABCDEF0123456789"},
-		{"[:digit::punct::upper:]", "0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~]ABCDEFGHIJKLMNOPQRSTUVWXYZ"},
+		{
+			in:       "[:alnum:]",
+			expected: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
+		},
+		{
+			in:       "[:alpha:]",
+			expected: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
+		},
+		{
+			in:       "[:digit:]",
+			expected: "0123456789",
+		},
+		{
+			in:       "[:space:]",
+			expected: " \t\n\r\f\v",
+		},
+		{
+			in:       "[:blank:]",
+			expected: " \t",
+		},
+		{
+			in:       "[:word:]",
+			expected: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_",
+		},
+		{
+			in:       "[:cntrl:]",
+			expected: "\x00\x01\x02\x03\x04\x05\x06\a\b\t\n\v\f\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\u007f",
+		},
+		{
+			in:       "[:lower:]",
+			expected: "abcdefghijklmnopqrstuvwxyz",
+		},
+		{
+			in:       "[:upper:]",
+			expected: "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+		},
+		{
+			in:       "[:digit::upper:]",
+			expected: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+		},
+		{
+			in:       "[:print:]",
+			expected: " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
+		},
+		{
+			in:       "[:graph:]",
+			expected: " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
+		},
+		{
+			in:       "[:punct:]",
+			expected: "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~]",
+		},
+		{
+			in:       "[:xdigit:]",
+			expected: "abcdefABCDEF0123456789",
+		},
+		{
+			in:       "[:digit::punct::upper:]",
+			expected: "0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~]ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+		},
 		// Ranges
-		{"[a-d]", "abcd"},
-		{"[\x20-\x7E]", " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"},
+		{
+			in:       "[a-d]",
+			expected: "abcd",
+		},
+		{
+			in:       "[\x20-\x7E]",
+			expected: " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
+		},
 		// Swapped
-		{"[\x7E-\x20]", " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"},
+		{
+			in:       "[\x7E-\x20]",
+			expected: " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
+		},
+		// MaxRune
+		{
+			in:       "[ก-ฎ]",
+			expected: "กขฃคฅฆงจฉชซฌญฎ",
+			options:  []Option{MaxRune('\uffff')},
+		},
+		// // Exclude graphic
+		// {
+		// 	in:       "[฿-ๆ็่้๊๋์]",
+		// 	expected: "฿เแโใไๅๆ็่้๊๋์",
+		// 	options:  []Option{MaxRune('\uffff'), OnlyGraphic(true)},
+		// },
 	}
 
 	for _, tt := range tests {
-		p, err := New()
-		if err != nil {
-			t.Fatalf("New failed with %q", err)
-		}
-		actual, err := p.Generate(tt.in)
-		if err != nil {
-			t.Errorf("%s => failed with %q", tt.in, err)
-		}
-		if actual != tt.expected {
-			t.Errorf("%s => expected %q, got %q", tt.in, tt.expected, actual)
-		}
+		t.Run(tt.in, func(t *testing.T) {
+			p, err := New(tt.options...)
+			if err != nil {
+				t.Fatal(err)
+			}
+			actual, err := p.Generate(tt.in)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if diff := cmp.Diff(actual, tt.expected); diff != "" {
+				t.Error(diff)
+			}
+			if actual != tt.expected {
+				t.Errorf("got %v, want %v", actual, tt.expected)
+			}
+		})
 	}
 }