diff --git a/build.gradle b/build.gradle index 6d9be869..03de26d8 100644 --- a/build.gradle +++ b/build.gradle @@ -6,14 +6,16 @@ plugins { editorconfig { excludes = [ - '**/generated', - '**/xtext-gen', - '**/bin', + '**/*.out', + '**/*.vsix', '**/.*', - 'gradlew*', - '**/out', + '**/bin', + '**/generated', '**/node_modules', - '**/*.vsix' + '**/out', + '**/output-*', + '**/xtext-gen', + 'gradlew*' ] } diff --git a/metafix/build.gradle b/metafix/build.gradle index f1a17214..46bf184a 100644 --- a/metafix/build.gradle +++ b/metafix/build.gradle @@ -63,7 +63,9 @@ test { task integrationTest(type: Exec, group: 'Verification') { executable './integrationTest.sh' - if (project.hasProperty("args")) args project.getProperty("args").split() + + if (project.hasProperty('args')) args project.getProperty('args').split() + environment.METAFIX_DISABLE_TO_DO = System.getProperty('org.metafacture.metafix.disableToDo') } task install(dependsOn: publishToMavenLocal, group: 'Publishing', diff --git a/metafix/integrationTest.sh b/metafix/integrationTest.sh index a8cbcb3e..51bfe996 100755 --- a/metafix/integrationTest.sh +++ b/metafix/integrationTest.sh @@ -8,7 +8,7 @@ metafix_file=test.flux catmandu_file=test.cmd fix_file=test.fix -disabled_file=disabled.txt +todo_file=todo.txt input_glob=input.* expected_glob=expected.* @@ -20,6 +20,12 @@ root_directory="$PWD" data_directory="$root_directory/src/test/resources/org/metafacture/metafix/integration" gradle_command="$root_directory/../gradlew" +function parse_boolean() { + [ "${1,,}" == true ] +} + +parse_boolean "$METAFIX_DISABLE_TO_DO" && disable_todo=1 || disable_todo= + [ -t 1 -a -x /usr/bin/colordiff ] && colordiff=colordiff || colordiff=cat function _tput() { @@ -112,13 +118,30 @@ function command_info() { [ -s "$3" ] && log " ${color_info}${1^} command output$color_reset: $3" || rm -f "$3" [ -s "$4" ] && log " ${color_info}${1^} command error$color_reset: $4" || rm -f "$4" + + log +} + +function skip_test() { + if [ -r "$2" ]; then + local message="$color_test$1$color_reset: ${color_skipped}SKIPPED$color_reset" reason=$(head -1 "$2") + + [ -n "$reason" ] && message+=" ($reason)" + log "$message" + + ((skipped++)) || true + + return 0; + else + return 1; + fi } function run_tests() { local test matched=1\ - test_input test_expected test_disabled\ - metafix_command_output metafix_command_error\ - metafix_exit_status metafix_output metafix_diff + test_directory test_fix test_input test_expected test_todo\ + metafix_command_output metafix_command_error metafix_start_time\ + metafix_exit_status metafix_output metafix_diff metafix_elapsed_time cd "$data_directory" @@ -138,13 +161,9 @@ function run_tests() { get_file "$test" expected "$test_directory"/$expected_glob || { log; continue; } test_expected=$current_file - test_disabled="$test_directory/$disabled_file" + test_todo="$test_directory/$todo_file" - if [ -r "$test_disabled" ]; then - log "$color_test$test$color_reset: ${color_skipped}SKIPPED$color_reset ($(<"$test_disabled"))" - - ((skipped++)) || true - else + if [ -z "$disable_todo" ] || ! skip_test "$test" "$test_todo"; then metafix_command_output="$test_directory/metafix.out" metafix_command_error="$test_directory/metafix.err" @@ -162,14 +181,18 @@ function run_tests() { metafix_elapsed_time=$(elapsed_time "$metafix_start_time") if diff -u "$test_expected" "$metafix_output" >"$metafix_diff"; then - #log "$color_test$test$color_reset: ${color_passed}PASSED$color_reset$metafix_elapsed_time" + if [ -r "$test_todo" ]; then + log "$color_test$test$color_reset: ${color_failed}FAILED$color_reset (Marked as \"to do\", but passed.)" - rm -f "$metafix_diff" "$metafix_command_output" "$metafix_command_error" + ((failed++)) || true + else + #log "$color_test$test$color_reset: ${color_passed}PASSED$color_reset$metafix_elapsed_time" - ((passed++)) || true + ((passed++)) || true + fi - #log - else + rm -f "$metafix_diff" "$metafix_command_output" "$metafix_command_error" + elif ! skip_test "$test" "$test_todo"; then log "$color_test$test$color_reset: ${color_failed}FAILED$color_reset$metafix_elapsed_time" log " Fix: $test_fix" @@ -183,15 +206,11 @@ function run_tests() { command_info metafix "$metafix_exit_status" "$metafix_command_output" "$metafix_command_error" ((failed++)) || true - - log fi else command_info metafix "$metafix_exit_status" "$metafix_command_output" "$metafix_command_error" - - log fi - else + elif ! skip_test "$test" "$test_todo"; then metafix_exit_status=$? log "$color_test$test$color_reset: ${color_error}ERROR$color_reset" @@ -199,8 +218,6 @@ function run_tests() { command_info metafix "$metafix_exit_status" "$metafix_command_output" "$metafix_command_error" ((failed++)) || true - - log fi fi done diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithVariableAndAppend/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithVariableAndAppend/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithVariableAndAppend/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithVariableAndAppend/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupSimpleWithInternalMapWithoutMatch/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupSimpleWithInternalMapWithoutMatch/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupSimpleWithInternalMapWithoutMatch/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupSimpleWithInternalMapWithoutMatch/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/appendArrayOfObjectsWithFirstArrayWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/appendArrayOfObjectsWithFirstArrayWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/appendArrayOfObjectsWithFirstArrayWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/appendArrayOfObjectsWithFirstArrayWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/appendArrayOfObjectsWithLastArrayWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/appendArrayOfObjectsWithLastArrayWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/appendArrayOfObjectsWithLastArrayWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/appendArrayOfObjectsWithLastArrayWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/flatten/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/flatten/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/flatten/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/flatten/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/prependArrayOfObjectsWithFirstArrayWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/prependArrayOfObjectsWithFirstArrayWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/prependArrayOfObjectsWithFirstArrayWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/prependArrayOfObjectsWithFirstArrayWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/prependArrayOfObjectsWithLastArrayWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/prependArrayOfObjectsWithLastArrayWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/prependArrayOfObjectsWithLastArrayWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/prependArrayOfObjectsWithLastArrayWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseSubfieldInArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseSubfieldInArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseSubfieldInArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseSubfieldInArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseValuesInArrayOfStrings/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseValuesInArrayOfStrings/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseValuesInArrayOfStrings/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseValuesInArrayOfStrings/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sort_fieldInArrayOfObjectsWithAsterisk/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sort_fieldInArrayOfObjectsWithAsterisk/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sort_fieldInArrayOfObjectsWithAsterisk/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sort_fieldInArrayOfObjectsWithAsterisk/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/split_fieldSubfieldInArrayOfObjectsWithAsterisk/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/split_fieldSubfieldInArrayOfObjectsWithAsterisk/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/split_fieldSubfieldInArrayOfObjectsWithAsterisk/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/split_fieldSubfieldInArrayOfObjectsWithAsterisk/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sumSubfieldInArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sumSubfieldInArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sumSubfieldInArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sumSubfieldInArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldAppendAndCreateArray/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldAppendAndCreateArray/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldAppendAndCreateArray/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldAppendAndCreateArray/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldAsteriskIntoArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldAsteriskIntoArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldAsteriskIntoArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldAsteriskIntoArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldPrependAndCreateArray/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldPrependAndCreateArray/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldPrependAndCreateArray/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldPrependAndCreateArray/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldSimpleDestructive/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldSimpleDestructive/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldSimpleDestructive/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldSimpleDestructive/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldSimpleSubsubfield/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldSimpleSubsubfield/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldSimpleSubsubfield/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/add_fieldSimpleSubsubfield/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAppendAndCreateArray/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAppendAndCreateArray/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAppendAndCreateArray/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAppendAndCreateArray/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAppendObjectToArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAppendObjectToArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAppendObjectToArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAppendObjectToArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAsRepeatedObjectAndThenArrayOfStringsIntoTheArrayOfObjectsWithLastWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAsRepeatedObjectAndThenArrayOfStringsIntoTheArrayOfObjectsWithLastWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAsRepeatedObjectAndThenArrayOfStringsIntoTheArrayOfObjectsWithLastWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAsRepeatedObjectAndThenArrayOfStringsIntoTheArrayOfObjectsWithLastWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsIntoArrayOfObjectsWithAsteriskWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsIntoArrayOfObjectsWithAsteriskWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsIntoArrayOfObjectsWithAsteriskWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsIntoArrayOfObjectsWithAsteriskWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAsteriskIntoArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAsteriskIntoArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAsteriskIntoArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldAsteriskIntoArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldFromArrayOfStringsInArrayOfObjectsWithAsterisk/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldFromArrayOfStringsInArrayOfObjectsWithAsterisk/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldFromArrayOfStringsInArrayOfObjectsWithAsterisk/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldFromArrayOfStringsInArrayOfObjectsWithAsterisk/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldFromSubfieldInArrayOfObjectsInArrayOfObjectsWithAsterisk/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldFromSubfieldInArrayOfObjectsInArrayOfObjectsWithAsterisk/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldFromSubfieldInArrayOfObjectsInArrayOfObjectsWithAsterisk/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldFromSubfieldInArrayOfObjectsInArrayOfObjectsWithAsterisk/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldObjectFromArrayOfObjectsWithFirstWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldObjectFromArrayOfObjectsWithFirstWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldObjectFromArrayOfObjectsWithFirstWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldObjectFromArrayOfObjectsWithFirstWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldObjectFromArrayOfObjectsWithLastWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldObjectFromArrayOfObjectsWithLastWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldObjectFromArrayOfObjectsWithLastWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldObjectFromArrayOfObjectsWithLastWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldPrependAndCreateArray/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldPrependAndCreateArray/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldPrependAndCreateArray/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldPrependAndCreateArray/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldPrependObjectToArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldPrependObjectToArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldPrependObjectToArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldPrependObjectToArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldSimpleDestructive/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldSimpleDestructive/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldSimpleDestructive/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldSimpleDestructive/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldValuesOfArrayOfStringsIntoArray/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldValuesOfArrayOfStringsIntoArray/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldValuesOfArrayOfStringsIntoArray/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldValuesOfArrayOfStringsIntoArray/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInMultipleArraysOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInMultipleArraysOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfNestedFields/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfNestedFields/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfNestedFields/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfNestedFields/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAppendAndCreateArray/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAppendAndCreateArray/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAppendAndCreateArray/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAppendAndCreateArray/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAppendObjectToArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAppendObjectToArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAppendObjectToArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAppendObjectToArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldArrayOfStringsWithinArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldArrayOfStringsWithinArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldArrayOfStringsWithinArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldArrayOfStringsWithinArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAsteriskIntoArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAsteriskIntoArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAsteriskIntoArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldAsteriskIntoArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldIntoOwnSubfield/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldIntoOwnSubfield/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldIntoOwnSubfield/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldIntoOwnSubfield/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldPrependAndCreateArray/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldPrependAndCreateArray/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldPrependAndCreateArray/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldPrependAndCreateArray/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldPrependObjectToArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldPrependObjectToArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldPrependObjectToArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldPrependObjectToArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleDestructive/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleDestructive/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleDestructive/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleDestructive/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithAsteriskPathWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithAsteriskPathWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithAsteriskPathWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithAsteriskPathWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithLeadingQuestionmarkPathWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithLeadingQuestionmarkPathWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithLeadingQuestionmarkPathWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithLeadingQuestionmarkPathWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithTrailingAsteriskPathWildcard/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithTrailingAsteriskPathWildcard/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithTrailingAsteriskPathWildcard/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithTrailingAsteriskPathWildcard/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInArrayOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInArrayOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInMultipleArraysOfObjects/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInMultipleArraysOfObjects/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfNestedFields/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfNestedFields/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfNestedFields/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfNestedFields/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/retainCertainSubfields/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/retainCertainSubfields/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/retainCertainSubfields/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/retainCertainSubfields/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayIntoArray/disabled.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayIntoArray/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayIntoArray/disabled.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayIntoArray/todo.txt