fix #916 autofix CLI, add integration test for it (#917)

Author: WebFreak001

.gitattributes

@@ -1 +1 @@
-tests/it/source_autofix.d  text eol=lf
+tests/it/autofix_ide/source_autofix.d  text eol=lf

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);
 			}

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
 

tests/it/autofix_cli/.gitignore

@@ -0,0 +1 @@
+test.d

tests/it/autofix_cli/fixed.d

@@ -0,0 +1,3 @@
+void main()
+{
+}

tests/it/autofix_cli/source.d

@@ -0,0 +1,3 @@
+auto main()
+{
+}

tests/it/source_autofix.autofix.json …/autofix_ide/source_autofix.autofix.jsontests/it/source_autofix.autofix.json renamed to tests/it/autofix_ide/source_autofix.autofix.json tests/it/source_autofix.autofix.json renamed to tests/it/autofix_ide/source_autofix.autofix.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,