Fix detekt

jetbrains-academy · Dec 13, 2023 · 294eb9e · 294eb9e
1 parent bae05ab
commit 294eb9e
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 52 deletions.
diff --git a/...ed/CompleteTheProject/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt b/...ed/CompleteTheProject/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun getGameRules(wordLength: Int, maxAttemptsCount: Int, secretExample: String) =
     "Welcome to the game! $newLineSymbol" +

diff --git a/...ed/CompleteTheProject/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt b/...ed/CompleteTheProject/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun safeReadLine() = readlnOrNull() ?: error("Your input is incorrect, sorry")
 

diff --git a/MastermindAdvanced/CompleteTheProject/test/Tests.kt b/MastermindAdvanced/CompleteTheProject/test/Tests.kt
@@ -1,4 +1,4 @@
-import jetbrains.kotlin.course.warmup.newLineSymbol
+import jetbrains.kotlin.course.mastermind.advanced.newLineSymbol
 import org.jetbrains.academy.test.system.core.invokeWithArgs
 import org.jetbrains.academy.test.system.core.models.classes.findClassSafe
 import org.junit.jupiter.api.Assertions

diff --git a/...dvanced/errorHandling/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt b/...dvanced/errorHandling/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun getGameRules(wordLength: Int, maxAttemptsCount: Int, secretExample: String) =
     "Welcome to the game! $newLineSymbol" +

diff --git a/...dvanced/errorHandling/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt b/...dvanced/errorHandling/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun safeReadLine() = readlnOrNull() ?: error("Your input is incorrect, sorry")
 

diff --git a/...enerateSecretFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt b/...enerateSecretFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun getGameRules(wordLength: Int, maxAttemptsCount: Int, secretExample: String) =
     "Welcome to the game! $newLineSymbol" +

diff --git a/...enerateSecretFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt b/...enerateSecretFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun safeReadLine() = readlnOrNull() ?: error("Your input is incorrect, sorry")
 

diff --git a/...Advanced/introduction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt b/...Advanced/introduction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun getGameRules(wordLength: Int, maxAttemptsCount: Int, secretExample: String) =
     "Welcome to the game! $newLineSymbol" +

diff --git a/...Advanced/introduction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt b/...Advanced/introduction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun safeReadLine() = readlnOrNull() ?: error("Your input is incorrect, sorry")
 

diff --git a/...sCorrectInputFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt b/...sCorrectInputFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun getGameRules(wordLength: Int, maxAttemptsCount: Int, secretExample: String) =
     "Welcome to the game! $newLineSymbol" +

diff --git a/...sCorrectInputFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt b/...sCorrectInputFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun safeReadLine() = readlnOrNull() ?: error("Your input is incorrect, sorry")
 

diff --git a/.../joinToStringFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt b/.../joinToStringFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun getGameRules(wordLength: Int, maxAttemptsCount: Int, secretExample: String) =
     "Welcome to the game! $newLineSymbol" +

diff --git a/.../joinToStringFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt b/.../joinToStringFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun safeReadLine() = readlnOrNull() ?: error("Your input is incorrect, sorry")
 

diff --git a/...vanced/randomFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt b/...vanced/randomFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun getGameRules(wordLength: Int, maxAttemptsCount: Int, secretExample: String) =
     "Welcome to the game! $newLineSymbol" +

diff --git a/...vanced/randomFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt b/...vanced/randomFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun safeReadLine() = readlnOrNull() ?: error("Your input is incorrect, sorry")
 

diff --git a/...safeUserInputFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt b/...safeUserInputFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Main.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun getGameRules(wordLength: Int, maxAttemptsCount: Int, secretExample: String) =
     "Welcome to the game! $newLineSymbol" +

diff --git a/...safeUserInputFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt b/...safeUserInputFunction/src/main/kotlin/jetbrains/kotlin/course/mastermind/advanced/Util.kt
@@ -1,4 +1,4 @@
-package jetbrains.kotlin.course.warmup
+package jetbrains.kotlin.course.mastermind.advanced
 
 fun safeReadLine() = readlnOrNull() ?: error("Your input is incorrect, sorry")
 

diff --git a/MastermindAdvanced/safeUserInputFunction/test/Tests.kt b/MastermindAdvanced/safeUserInputFunction/test/Tests.kt
@@ -1,6 +1,5 @@
-import jetbrains.kotlin.course.warmup.newLineSymbol
+import jetbrains.kotlin.course.mastermind.advanced.newLineSymbol
 import org.jetbrains.academy.test.system.core.invokeWithArgs
-import org.jetbrains.academy.test.system.core.invokeWithoutArgs
 import org.jetbrains.academy.test.system.core.models.classes.findClassSafe
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
@@ -79,9 +78,9 @@ class Test {
         @JvmStatic
         fun safeUserInputs() = listOf(
             // systemIn, output, isSystemInEmpty
-            Arguments.of("ABC${newLineSymbol}ABCCC${newLineSymbol}ABCI${newLineSymbol}ACI${newLineSymbol}ABCD${newLineSymbol}", "ABCD", true),
-            Arguments.of("ABCD${newLineSymbol}", "ABCD", true),
-            Arguments.of("ABCD${newLineSymbol}ABC${newLineSymbol}ABCCC${newLineSymbol}ABCI${newLineSymbol}ACI${newLineSymbol}", "ABCD", false),
+            Arguments.of("ABC${newLineSymbol}ABCCC${newLineSymbol}ABCI${newLineSymbol}ACI${newLineSymbol}ABCD$newLineSymbol", "ABCD", true),
+            Arguments.of("ABCD$newLineSymbol", "ABCD", true),
+            Arguments.of("ABCD${newLineSymbol}ABC${newLineSymbol}ABCCC${newLineSymbol}ABCI${newLineSymbol}ACI$newLineSymbol", "ABCD", false),
         )
     }
 

diff --git a/detekt.yml b/detekt.yml
@@ -15,33 +15,9 @@ style:
   MagicNumber:
     active: false
   UnusedPrivateMember:
-    active: true
-    excludes: [
-      "**/AlmostDone/StringFunctions/src/main/kotlin/jetbrains/kotlin/course/almost/done/Main.kt",
-      "**/AlmostDone/When/src/main/kotlin/jetbrains/kotlin/course/almost/done/Main.kt",
-      "**/TheFirstDateWithProgramming/ReadUserInput/src/main/kotlin/jetbrains/kotlin/course/first/date/Main.kt",
-      "**/TheFirstDateWithProgramming/Variables/src/main/kotlin/jetbrains/kotlin/course/first/date/Main.kt",
-      "**/TheFirstDateWithProgramming/comments/src/main/kotlin/jetbrains/kotlin/course/first/date/Main.kt",
-      "**/TheFirstDateWithProgramming/readUserInputTheory/src/main/kotlin/jetbrains/kotlin/course/first/date/Main.kt",
-      "**/Chat/askFirstQuestion/src/main/kotlin/jetbrains/kotlin/course/chat/Main.kt",
-      "**/Chat/askSecondQuestion/src/main/kotlin/jetbrains/kotlin/course/chat/Main.kt",
-      "**/WarmUp/Collections/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-      "**/WarmUp/CollectionsPartTwo/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-      "**/WarmUp/CustomFunctions/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-      "**/WarmUp/If/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-      "**/WarmUp/Loops/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-
-    ]
+    active: false
   FunctionOnlyReturningConstant:
-    active: true
-    excludes: [
-      "**/WarmUp/Collections/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-      "**/WarmUp/CollectionsPartTwo/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-      "**/WarmUp/CustomFunctions/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-      "**/WarmUp/FinishBaseGame/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-      "**/WarmUp/If/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-      "**/WarmUp/Loops/src/main/kotlin/jetbrains/kotlin/course/warmup/Main.kt",
-    ]
+    active: false
 
 complexity:
   TooManyFunctions:

diff --git a/gifs/src/main/kotlin/jetbrains/kotlin/course/gifs/warmup/runners/Game.kt b/gifs/src/main/kotlin/jetbrains/kotlin/course/gifs/warmup/runners/Game.kt
@@ -1,13 +1,13 @@
 package jetbrains.kotlin.course.gifs.warmup.runners
 
-import jetbrains.kotlin.course.warmup.getGameRules
-import jetbrains.kotlin.course.warmup.playGame
+import jetbrains.kotlin.course.mastermind.advanced.getGameRules
+import jetbrains.kotlin.course.mastermind.advanced.playGame
 
 fun main() {
     val wordLength = 4
     val maxAttemptsCount = 3
     val secretExample = "ACEB"
     val alphabet = "ABCDEFGH"
-    println(getGameRules(wordLength, maxAttemptsCount, secretExample, alphabet).replace(". ", ".\n"))
+    println(getGameRules(wordLength, maxAttemptsCount, secretExample).replace(". ", ".\n"))
     playGame("BBDH", wordLength, maxAttemptsCount, alphabet)
 }
diff --git a/gifs/src/main/kotlin/jetbrains/kotlin/course/gifs/warmup/runners/SafeUserInput.kt b/gifs/src/main/kotlin/jetbrains/kotlin/course/gifs/warmup/runners/SafeUserInput.kt
@@ -1,6 +1,6 @@
 package jetbrains.kotlin.course.gifs.warmup.runners
 
-import jetbrains.kotlin.course.warmup.safeUserInput
+import jetbrains.kotlin.course.mastermind.advanced.safeUserInput
 
 fun main() {
     safeUserInput(4, "ABCDEFGH")