cm: use Component Model result<OK, Err> test names

bytecodealliance · Jan 14, 2024 · 6531d34 · 6531d34
1 parent 5c8ae86
commit 6531d34
Showing 1 changed file with 26 additions and 25 deletions.
diff --git a/cm/layout_test.go b/cm/layout_test.go
@@ -51,45 +51,46 @@ func TestResultLayout(t *testing.T) {
 	ptrSize := unsafe.Sizeof(uintptr(0))
 
 	tests := []struct {
+		name   string
 		r      ResultDebug
 		size   uintptr
 		offset uintptr
 	}{
-		{&UntypedResult{}, 1, 0},
+		{"result", &UntypedResult{}, 1, 0},
 
-		{&UnsizedResult[struct{}, struct{}]{}, 1, 0},
-		{&UnsizedResult[[0]byte, struct{}]{}, 1, 0},
+		{"result<_, _>", &UnsizedResult[struct{}, struct{}]{}, 1, 0},
+		{"result<[0]byte, _>", &UnsizedResult[[0]byte, struct{}]{}, 1, 0},
 
-		{&SizedResult[Shape[string], string, string]{}, sizePlusAlignOf[string](), ptrSize},
-		{&SizedResult[Shape[string], bool, string]{}, sizePlusAlignOf[string](), ptrSize},
-		{&SizedResult[Shape[string], string, struct{}]{}, sizePlusAlignOf[string](), ptrSize},
-		{&SizedResult[Shape[string], struct{}, string]{}, sizePlusAlignOf[string](), ptrSize},
-		{&SizedResult[Shape[uint64], uint64, uint64]{}, 16, alignOf[uint64]()},
-		{&SizedResult[Shape[uint64], uint32, uint64]{}, 16, alignOf[uint64]()},
-		{&SizedResult[Shape[uint64], uint64, uint32]{}, 16, alignOf[uint64]()},
-		{&SizedResult[Shape[uint64], uint8, uint64]{}, 16, alignOf[uint64]()},
-		{&SizedResult[Shape[uint64], uint64, uint8]{}, 16, alignOf[uint64]()},
-		{&SizedResult[Shape[uint32], uint8, uint32]{}, 8, alignOf[uint32]()},
-		{&SizedResult[Shape[uint32], uint32, uint8]{}, 8, alignOf[uint32]()},
-		{&SizedResult[Shape[[9]byte], [9]byte, uint64]{}, 24, alignOf[uint64]()},
+		{"result<string, string>", &SizedResult[Shape[string], string, string]{}, sizePlusAlignOf[string](), ptrSize},
+		{"result<bool, string>", &SizedResult[Shape[string], bool, string]{}, sizePlusAlignOf[string](), ptrSize},
+		{"result<string, _>", &SizedResult[Shape[string], string, struct{}]{}, sizePlusAlignOf[string](), ptrSize},
+		{"result<_, string>", &SizedResult[Shape[string], struct{}, string]{}, sizePlusAlignOf[string](), ptrSize},
+		{"result<u64, u64>", &SizedResult[Shape[uint64], uint64, uint64]{}, 16, alignOf[uint64]()},
+		{"result<u32, u64>", &SizedResult[Shape[uint64], uint32, uint64]{}, 16, alignOf[uint64]()},
+		{"result<u64, u32>", &SizedResult[Shape[uint64], uint64, uint32]{}, 16, alignOf[uint64]()},
+		{"result<u8, u64>", &SizedResult[Shape[uint64], uint8, uint64]{}, 16, alignOf[uint64]()},
+		{"result<u64, u8>", &SizedResult[Shape[uint64], uint64, uint8]{}, 16, alignOf[uint64]()},
+		{"result<u8, u32>", &SizedResult[Shape[uint32], uint8, uint32]{}, 8, alignOf[uint32]()},
+		{"result<u32, u8>", &SizedResult[Shape[uint32], uint32, uint8]{}, 8, alignOf[uint32]()},
+		{"result<[9]byte, u64>", &SizedResult[Shape[[9]byte], [9]byte, uint64]{}, 24, alignOf[uint64]()},
 
-		{&OKSizedResult[string, struct{}]{}, sizePlusAlignOf[string](), ptrSize},
-		{&OKSizedResult[string, bool]{}, sizePlusAlignOf[string](), ptrSize},
-		{&OKSizedResult[[9]byte, uint64]{}, sizePlusAlignOf[string](), alignOf[uint64]()},
+		{"result<string, _>", &OKSizedResult[string, struct{}]{}, sizePlusAlignOf[string](), ptrSize},
+		{"result<string, bool>", &OKSizedResult[string, bool]{}, sizePlusAlignOf[string](), ptrSize},
+		{"result<[9]byte, u64>", &OKSizedResult[[9]byte, uint64]{}, sizePlusAlignOf[string](), alignOf[uint64]()},
 
-		{&ErrSizedResult[struct{}, string]{}, sizePlusAlignOf[string](), ptrSize},
-		{&ErrSizedResult[bool, string]{}, sizePlusAlignOf[string](), ptrSize},
-		{&ErrSizedResult[uint64, [9]byte]{}, sizePlusAlignOf[string](), alignOf[uint64]()},
+		{"result<_, string>", &ErrSizedResult[struct{}, string]{}, sizePlusAlignOf[string](), ptrSize},
+		{"result<bool, string>", &ErrSizedResult[bool, string]{}, sizePlusAlignOf[string](), ptrSize},
+		{"result<u64, [9]byte>", &ErrSizedResult[uint64, [9]byte]{}, sizePlusAlignOf[string](), alignOf[uint64]()},
 	}
 
 	for _, tt := range tests {
-		name := typeName(tt.r)
-		t.Run(name, func(t *testing.T) {
+		typ := typeName(tt.r)
+		t.Run(tt.name, func(t *testing.T) {
 			if got, want := tt.r.Size(), tt.size; got != want {
-				t.Errorf("(%s).Size() == %v, expected %v", name, got, want)
+				t.Errorf("(%s).Size() == %v, expected %v", typ, got, want)
 			}
 			if got, want := tt.r.ValOffset(), tt.offset; got != want {
-				t.Errorf("(%s).ValOffset() == %v, expected %v", name, got, want)
+				t.Errorf("(%s).ValOffset() == %v, expected %v", typ, got, want)
 			}
 		})
 	}