diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..755ea90d Binary files /dev/null and b/.DS_Store differ diff --git a/core/.DS_Store b/core/.DS_Store new file mode 100644 index 00000000..9b8dc81f Binary files /dev/null and b/core/.DS_Store differ diff --git a/core/pkg/.DS_Store b/core/pkg/.DS_Store new file mode 100644 index 00000000..e88f67aa Binary files /dev/null and b/core/pkg/.DS_Store differ diff --git a/core/pkg/fixhandler/.DS_Store b/core/pkg/fixhandler/.DS_Store new file mode 100644 index 00000000..b62fad58 Binary files /dev/null and b/core/pkg/fixhandler/.DS_Store differ diff --git a/core/pkg/fixhandler/fixhandler_test.go b/core/pkg/fixhandler/fixhandler_test.go index cd0f6b0e..17f27039 100644 --- a/core/pkg/fixhandler/fixhandler_test.go +++ b/core/pkg/fixhandler/fixhandler_test.go @@ -28,9 +28,9 @@ func NewFixHandlerMock() (*FixHandler, error) { }, nil } -func fixCommandPath() string { - o, _ := os.Getwd() - return filepath.Join(filepath.Dir(o), "..", "..", "examples", "fix-command") +func getTestdataPath() string { + currentDir, _ := os.Getwd() + return filepath.Join(currentDir, "testdata") } func testDirectoryApplyFixHelper(t *testing.T, yamlExpressions *[][]string, directoryPath string) { @@ -98,7 +98,7 @@ func testDirectoryApplyFixHelper(t *testing.T, yamlExpressions *[][]string, dire } func testDirectoryApplyFix(t *testing.T, directory string) { - directoryPath := filepath.Join(fixCommandPath(), directory) + directoryPath := filepath.Join(getTestdataPath(), directory) var yamlExpressions [][]string switch directory { diff --git a/core/pkg/fixhandler/testdata/.DS_Store b/core/pkg/fixhandler/testdata/.DS_Store new file mode 100644 index 00000000..6254f6f0 Binary files /dev/null and b/core/pkg/fixhandler/testdata/.DS_Store differ diff --git a/examples/fix-command/hybrid_scenarios/fixed_yaml_scenario_1.yml b/core/pkg/fixhandler/testdata/hybrid_scenarios/fixed_yaml_scenario_1.yml similarity index 100% rename from examples/fix-command/hybrid_scenarios/fixed_yaml_scenario_1.yml rename to core/pkg/fixhandler/testdata/hybrid_scenarios/fixed_yaml_scenario_1.yml diff --git a/examples/fix-command/hybrid_scenarios/original_yaml_scenario_1.yml b/core/pkg/fixhandler/testdata/hybrid_scenarios/original_yaml_scenario_1.yml similarity index 100% rename from examples/fix-command/hybrid_scenarios/original_yaml_scenario_1.yml rename to core/pkg/fixhandler/testdata/hybrid_scenarios/original_yaml_scenario_1.yml diff --git a/examples/fix-command/insert_scenarios/fixed_yaml_scenario_1.yml b/core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_1.yml similarity index 100% rename from examples/fix-command/insert_scenarios/fixed_yaml_scenario_1.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_1.yml diff --git a/examples/fix-command/insert_scenarios/fixed_yaml_scenario_2.yml b/core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_2.yml similarity index 100% rename from examples/fix-command/insert_scenarios/fixed_yaml_scenario_2.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_2.yml diff --git a/examples/fix-command/insert_scenarios/fixed_yaml_scenario_3.yml b/core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_3.yml similarity index 100% rename from examples/fix-command/insert_scenarios/fixed_yaml_scenario_3.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_3.yml diff --git a/examples/fix-command/insert_scenarios/fixed_yaml_scenario_4.yml b/core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_4.yml similarity index 100% rename from examples/fix-command/insert_scenarios/fixed_yaml_scenario_4.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_4.yml diff --git a/examples/fix-command/insert_scenarios/fixed_yaml_scenario_5.yml b/core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_5.yml similarity index 100% rename from examples/fix-command/insert_scenarios/fixed_yaml_scenario_5.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_5.yml diff --git a/examples/fix-command/insert_scenarios/fixed_yaml_scenario_6.yml b/core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_6.yml similarity index 100% rename from examples/fix-command/insert_scenarios/fixed_yaml_scenario_6.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_6.yml diff --git a/examples/fix-command/insert_scenarios/fixed_yaml_scenario_7.yml b/core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_7.yml similarity index 100% rename from examples/fix-command/insert_scenarios/fixed_yaml_scenario_7.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/fixed_yaml_scenario_7.yml diff --git a/examples/fix-command/insert_scenarios/original_yaml_scenario_1.yml b/core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_1.yml similarity index 100% rename from examples/fix-command/insert_scenarios/original_yaml_scenario_1.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_1.yml diff --git a/examples/fix-command/insert_scenarios/original_yaml_scenario_2.yml b/core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_2.yml similarity index 100% rename from examples/fix-command/insert_scenarios/original_yaml_scenario_2.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_2.yml diff --git a/examples/fix-command/insert_scenarios/original_yaml_scenario_3.yml b/core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_3.yml similarity index 100% rename from examples/fix-command/insert_scenarios/original_yaml_scenario_3.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_3.yml diff --git a/examples/fix-command/insert_scenarios/original_yaml_scenario_4.yml b/core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_4.yml similarity index 100% rename from examples/fix-command/insert_scenarios/original_yaml_scenario_4.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_4.yml diff --git a/examples/fix-command/insert_scenarios/original_yaml_scenario_5.yml b/core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_5.yml similarity index 100% rename from examples/fix-command/insert_scenarios/original_yaml_scenario_5.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_5.yml diff --git a/examples/fix-command/insert_scenarios/original_yaml_scenario_6.yml b/core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_6.yml similarity index 100% rename from examples/fix-command/insert_scenarios/original_yaml_scenario_6.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_6.yml diff --git a/examples/fix-command/insert_scenarios/original_yaml_scenario_7.yml b/core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_7.yml similarity index 100% rename from examples/fix-command/insert_scenarios/original_yaml_scenario_7.yml rename to core/pkg/fixhandler/testdata/insert_scenarios/original_yaml_scenario_7.yml diff --git a/examples/fix-command/remove_scenarios/fixed_yaml_scenario_1.yml b/core/pkg/fixhandler/testdata/remove_scenarios/fixed_yaml_scenario_1.yml similarity index 100% rename from examples/fix-command/remove_scenarios/fixed_yaml_scenario_1.yml rename to core/pkg/fixhandler/testdata/remove_scenarios/fixed_yaml_scenario_1.yml diff --git a/examples/fix-command/remove_scenarios/fixed_yaml_scenario_2.yml b/core/pkg/fixhandler/testdata/remove_scenarios/fixed_yaml_scenario_2.yml similarity index 100% rename from examples/fix-command/remove_scenarios/fixed_yaml_scenario_2.yml rename to core/pkg/fixhandler/testdata/remove_scenarios/fixed_yaml_scenario_2.yml diff --git a/examples/fix-command/remove_scenarios/fixed_yaml_scenario_3.yml b/core/pkg/fixhandler/testdata/remove_scenarios/fixed_yaml_scenario_3.yml similarity index 100% rename from examples/fix-command/remove_scenarios/fixed_yaml_scenario_3.yml rename to core/pkg/fixhandler/testdata/remove_scenarios/fixed_yaml_scenario_3.yml diff --git a/examples/fix-command/remove_scenarios/fixed_yaml_scenario_4.yml b/core/pkg/fixhandler/testdata/remove_scenarios/fixed_yaml_scenario_4.yml similarity index 100% rename from examples/fix-command/remove_scenarios/fixed_yaml_scenario_4.yml rename to core/pkg/fixhandler/testdata/remove_scenarios/fixed_yaml_scenario_4.yml diff --git a/examples/fix-command/remove_scenarios/original_yaml_scenario_1.yml b/core/pkg/fixhandler/testdata/remove_scenarios/original_yaml_scenario_1.yml similarity index 100% rename from examples/fix-command/remove_scenarios/original_yaml_scenario_1.yml rename to core/pkg/fixhandler/testdata/remove_scenarios/original_yaml_scenario_1.yml diff --git a/examples/fix-command/remove_scenarios/original_yaml_scenario_2.yml b/core/pkg/fixhandler/testdata/remove_scenarios/original_yaml_scenario_2.yml similarity index 100% rename from examples/fix-command/remove_scenarios/original_yaml_scenario_2.yml rename to core/pkg/fixhandler/testdata/remove_scenarios/original_yaml_scenario_2.yml diff --git a/examples/fix-command/remove_scenarios/original_yaml_scenario_3.yml b/core/pkg/fixhandler/testdata/remove_scenarios/original_yaml_scenario_3.yml similarity index 100% rename from examples/fix-command/remove_scenarios/original_yaml_scenario_3.yml rename to core/pkg/fixhandler/testdata/remove_scenarios/original_yaml_scenario_3.yml diff --git a/examples/fix-command/remove_scenarios/original_yaml_scenario_4.yml b/core/pkg/fixhandler/testdata/remove_scenarios/original_yaml_scenario_4.yml similarity index 100% rename from examples/fix-command/remove_scenarios/original_yaml_scenario_4.yml rename to core/pkg/fixhandler/testdata/remove_scenarios/original_yaml_scenario_4.yml diff --git a/examples/fix-command/replace_scenarios/fixed_yaml_scenario_1.yml b/core/pkg/fixhandler/testdata/replace_scenarios/fixed_yaml_scenario_1.yml similarity index 100% rename from examples/fix-command/replace_scenarios/fixed_yaml_scenario_1.yml rename to core/pkg/fixhandler/testdata/replace_scenarios/fixed_yaml_scenario_1.yml diff --git a/examples/fix-command/replace_scenarios/fixed_yaml_scenario_2.yml b/core/pkg/fixhandler/testdata/replace_scenarios/fixed_yaml_scenario_2.yml similarity index 100% rename from examples/fix-command/replace_scenarios/fixed_yaml_scenario_2.yml rename to core/pkg/fixhandler/testdata/replace_scenarios/fixed_yaml_scenario_2.yml diff --git a/examples/fix-command/replace_scenarios/original_yaml_scenario_1.yml b/core/pkg/fixhandler/testdata/replace_scenarios/original_yaml_scenario_1.yml similarity index 100% rename from examples/fix-command/replace_scenarios/original_yaml_scenario_1.yml rename to core/pkg/fixhandler/testdata/replace_scenarios/original_yaml_scenario_1.yml diff --git a/examples/fix-command/replace_scenarios/original_yaml_scenario_2.yml b/core/pkg/fixhandler/testdata/replace_scenarios/original_yaml_scenario_2.yml similarity index 100% rename from examples/fix-command/replace_scenarios/original_yaml_scenario_2.yml rename to core/pkg/fixhandler/testdata/replace_scenarios/original_yaml_scenario_2.yml