Removes redundant testing type

hashicorp · Aug 8, 2024 · 86b9e6d · 86b9e6d
1 parent fd39cae
commit 86b9e6d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/internal/framework/flex/auto_flatten_test.go b/internal/framework/flex/auto_flatten_test.go
@@ -130,14 +130,14 @@ func TestFlatten(t *testing.T) {
 					},
 				},
 			},
-			Target: &tfSingleStringField2{},
-			WantTarget: &tfSingleStringField2{
+			Target: &tfSingleStringField{},
+			WantTarget: &tfSingleStringField{
 				Field1: types.StringValue(`{"test":"a"}`),
 			},
 			expectedLogLines: []map[string]any{
-				infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfSingleStringField2]()),
-				infoConverting(reflect.TypeFor[awsJSONStringer](), reflect.TypeFor[*tfSingleStringField2]()),
-				traceMatchedFields("Field1", reflect.TypeFor[awsJSONStringer](), "Field1", reflect.TypeFor[*tfSingleStringField2]()),
+				infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()),
+				infoConverting(reflect.TypeFor[awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()),
+				traceMatchedFields("Field1", reflect.TypeFor[awsJSONStringer](), "Field1", reflect.TypeFor[*tfSingleStringField]()),
 				infoConvertingWithPath("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String]()),
 			},
 		},
@@ -166,14 +166,14 @@ func TestFlatten(t *testing.T) {
 			Source: &awsJSONStringer{
 				Field1: &testJSONDocumentError{},
 			},
-			Target: &tfSingleStringField2{},
+			Target: &tfSingleStringField{},
 			expectedDiags: diag.Diagnostics{
 				diagFlatteningMarshalSmithyDocument(reflect.TypeFor[*testJSONDocumentError](), errMarshallSmithyDocument),
 			},
 			expectedLogLines: []map[string]any{
-				infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfSingleStringField2]()),
-				infoConverting(reflect.TypeFor[awsJSONStringer](), reflect.TypeFor[*tfSingleStringField2]()),
-				traceMatchedFields("Field1", reflect.TypeFor[awsJSONStringer](), "Field1", reflect.TypeFor[*tfSingleStringField2]()),
+				infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()),
+				infoConverting(reflect.TypeFor[awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()),
+				traceMatchedFields("Field1", reflect.TypeFor[awsJSONStringer](), "Field1", reflect.TypeFor[*tfSingleStringField]()),
 				infoConvertingWithPath("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String]()),
 				errorMarshallingJSONDocument("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String](), errMarshallSmithyDocument),
 			},

diff --git a/internal/framework/flex/autoflex_test.go b/internal/framework/flex/autoflex_test.go
@@ -356,10 +356,6 @@ type awsJSONStringer struct {
 	Field1 smithyjson.JSONStringer `json:"field1"`
 }
 
-type tfSingleStringField2 struct {
-	Field1 types.String `tfsdk:"field1"`
-}
-
 type tfJSONStringer struct {
 	Field1 fwtypes.SmithyJSON[smithyjson.JSONStringer] `tfsdk:"field1"`
 }