Tidy importstate/testdata

Author: bbasata

helper/resource/importstate/import_block_in_config_directory_test.go

@@ -16,7 +16,7 @@ import (
 	r "github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
-func TestImportBlock_InConfigDirectory_ConfigExactTrue(t *testing.T) {
+func TestImportBlock_InConfigDirectory(t *testing.T) {
 	t.Parallel()
 
 	r.UnitTest(t, r.TestCase{
@@ -39,13 +39,13 @@ func TestImportBlock_InConfigDirectory_ConfigExactTrue(t *testing.T) {
 				ImportState:     true,
 				ImportStateKind: r.ImportBlockWithID,
 				ConfigDirectory: config.StaticDirectory(`testdata/2`),
-				ConfigExact:     true,
+				ConfigExact:     false,
 			},
 		},
 	})
 }
 
-func TestImportBlock_InConfigDirectory(t *testing.T) {
+func TestImportBlock_InConfigDirectory_ConfigExactTrue(t *testing.T) {
 	t.Parallel()
 
 	r.UnitTest(t, r.TestCase{
@@ -67,8 +67,11 @@ func TestImportBlock_InConfigDirectory(t *testing.T) {
 				ResourceName:    "examplecloud_container.test",
 				ImportState:     true,
 				ImportStateKind: r.ImportBlockWithID,
-				ConfigDirectory: config.StaticDirectory(`testdata/writeable-config-directory`),
-				ConfigExact:     false,
+
+				// This content includes an import block with an ID so we will
+				// use the exact content
+				ConfigDirectory: config.StaticDirectory(`testdata/2_with_exact_import_config`),
+				ConfigExact:     true,
 			},
 		},
 	})

helper/resource/importstate/import_block_in_config_file_test.go

@@ -38,7 +38,7 @@ func TestImportBlock_InConfigFile(t *testing.T) {
 				ResourceName:    "examplecloud_container.test",
 				ImportState:     true,
 				ImportStateKind: r.ImportBlockWithID,
-				ConfigFile:      config.StaticFile(`testdata/writeable-config-file/examplecloud_container.tf`),
+				ConfigFile:      config.StaticFile(`testdata/2/examplecloud_container.tf`),
 			},
 		},
 	})
@@ -66,7 +66,7 @@ func TestImportBlock_WithResourceIdentity_InConfigFile(t *testing.T) {
 				ResourceName:    "examplecloud_container.test",
 				ImportState:     true,
 				ImportStateKind: r.ImportBlockWithResourceIdentity,
-				ConfigFile:      config.StaticFile(`testdata/writeable-config-file/examplecloud_container.tf`),
+				ConfigFile:      config.StaticFile(`testdata/2/examplecloud_container.tf`),
 			},
 		},
 	})