From fed654441f7c4ce75522b2bf9a8f9f6998009461 Mon Sep 17 00:00:00 2001 From: Jan Jurzitza Date: Sun, 9 Jul 2023 13:09:21 +0200 Subject: [PATCH] fix #916 autofix CLI, add integration test for it (#917) --- .gitattributes | 2 +- src/dscanner/analysis/run.d | 6 ++-- tests/it.sh | 31 +++++++++++++++++-- tests/it/autofix_cli/.gitignore | 1 + tests/it/autofix_cli/fixed.d | 3 ++ tests/it/autofix_cli/source.d | 3 ++ .../source_autofix.autofix.json | 0 tests/it/{ => autofix_ide}/source_autofix.d | 0 .../source_autofix.report.json | 4 +-- 9 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 tests/it/autofix_cli/.gitignore create mode 100644 tests/it/autofix_cli/fixed.d create mode 100644 tests/it/autofix_cli/source.d rename tests/it/{ => autofix_ide}/source_autofix.autofix.json (100%) rename tests/it/{ => autofix_ide}/source_autofix.d (100%) rename tests/it/{ => autofix_ide}/source_autofix.report.json (94%) diff --git a/.gitattributes b/.gitattributes index 9f9c8f2..47f0d4a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -tests/it/source_autofix.d text eol=lf \ No newline at end of file +tests/it/autofix_ide/source_autofix.d text eol=lf \ No newline at end of file diff --git a/src/dscanner/analysis/run.d b/src/dscanner/analysis/run.d index 04c025a..7d40d51 100644 --- a/src/dscanner/analysis/run.d +++ b/src/dscanner/analysis/run.d @@ -611,12 +611,12 @@ private struct UserSelect if (special.shorthands.canFind(input)) return special.id; - int item = input.to!int; - if (item < 0 || item > regularItems.length) + int item = input.to!int - 1; + if (item < 0 || item >= regularItems.length) throw new Exception("Selected option number out of range."); return item; } - catch (ConvException e) + catch (Exception e) { writeln("Invalid selection, try again. ", e.message); } diff --git a/tests/it.sh b/tests/it.sh index b216772..6271e69 100755 --- a/tests/it.sh +++ b/tests/it.sh @@ -13,7 +13,34 @@ cd "$DSCANNER_DIR/tests" # IDE APIs # -------- # checking that reporting format stays consistent or only gets extended -diff <(../bin/dscanner --report it/source_autofix.d | jq -S .) <(jq -S . it/source_autofix.report.json) -diff <(../bin/dscanner --resolveMessage b16 it/source_autofix.d | jq -S .) <(jq -S . it/source_autofix.autofix.json) +diff <(../bin/dscanner --report it/autofix_ide/source_autofix.d | jq -S .) <(jq -S . it/autofix_ide/source_autofix.report.json) +diff <(../bin/dscanner --resolveMessage b16 it/autofix_ide/source_autofix.d | jq -S .) <(jq -S . it/autofix_ide/source_autofix.autofix.json) +# CLI tests +# --------- +# check that `dscanner fix` works as expected +echo '1. test no changes if EOFing' +cp -v it/autofix_cli/source.d it/autofix_cli/test.d +printf "" | ../bin/dscanner fix it/autofix_cli/test.d +diff it/autofix_cli/test.d it/autofix_cli/source.d +echo '2. test no changes for simple enter pressing' +cp -v it/autofix_cli/source.d it/autofix_cli/test.d +printf "\n" | ../bin/dscanner fix it/autofix_cli/test.d +diff it/autofix_cli/test.d it/autofix_cli/source.d +echo '2.1. test no changes entering 0' +cp -v it/autofix_cli/source.d it/autofix_cli/test.d +printf "0\n" | ../bin/dscanner fix it/autofix_cli/test.d +diff it/autofix_cli/test.d it/autofix_cli/source.d +echo '3. test change applies automatically with --applySingle' +cp -v it/autofix_cli/source.d it/autofix_cli/test.d +../bin/dscanner fix --applySingle it/autofix_cli/test.d | grep -F 'Writing changes to it/autofix_cli/test.d' +diff it/autofix_cli/test.d it/autofix_cli/fixed.d +echo '4. test change apply when entering "1"' +cp -v it/autofix_cli/source.d it/autofix_cli/test.d +printf "1\n" | ../bin/dscanner fix it/autofix_cli/test.d | grep -F 'Writing changes to it/autofix_cli/test.d' +diff it/autofix_cli/test.d it/autofix_cli/fixed.d +echo '5. test invalid selection reasks what to apply' +cp -v it/autofix_cli/source.d it/autofix_cli/test.d +printf "2\n-1\n1000\na\n1\n" | ../bin/dscanner fix it/autofix_cli/test.d | grep -F 'Writing changes to it/autofix_cli/test.d' +diff it/autofix_cli/test.d it/autofix_cli/fixed.d diff --git a/tests/it/autofix_cli/.gitignore b/tests/it/autofix_cli/.gitignore new file mode 100644 index 0000000..a3042e8 --- /dev/null +++ b/tests/it/autofix_cli/.gitignore @@ -0,0 +1 @@ +test.d diff --git a/tests/it/autofix_cli/fixed.d b/tests/it/autofix_cli/fixed.d new file mode 100644 index 0000000..9198103 --- /dev/null +++ b/tests/it/autofix_cli/fixed.d @@ -0,0 +1,3 @@ +void main() +{ +} diff --git a/tests/it/autofix_cli/source.d b/tests/it/autofix_cli/source.d new file mode 100644 index 0000000..f91886f --- /dev/null +++ b/tests/it/autofix_cli/source.d @@ -0,0 +1,3 @@ +auto main() +{ +} diff --git a/tests/it/source_autofix.autofix.json b/tests/it/autofix_ide/source_autofix.autofix.json similarity index 100% rename from tests/it/source_autofix.autofix.json rename to tests/it/autofix_ide/source_autofix.autofix.json diff --git a/tests/it/source_autofix.d b/tests/it/autofix_ide/source_autofix.d similarity index 100% rename from tests/it/source_autofix.d rename to tests/it/autofix_ide/source_autofix.d diff --git a/tests/it/source_autofix.report.json b/tests/it/autofix_ide/source_autofix.report.json similarity index 94% rename from tests/it/source_autofix.report.json rename to tests/it/autofix_ide/source_autofix.report.json index f1ff0b9..909fa23 100644 --- a/tests/it/source_autofix.report.json +++ b/tests/it/autofix_ide/source_autofix.report.json @@ -8,7 +8,7 @@ "endColumn": 12, "endIndex": 22, "endLine": 3, - "fileName": "it\/source_autofix.d", + "fileName": "it/autofix_ide/source_autofix.d", "index": 16, "key": "dscanner.confusing.function_attributes", "line": 3, @@ -78,7 +78,7 @@ "endColumn": 10, "endIndex": 71, "endLine": 8, - "fileName": "it/source_autofix.d", + "fileName": "it/autofix_ide/source_autofix.d", "index": 64, "key": "dscanner.suspicious.static_if_else", "line": 8,