Updated test framework version

CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/test/ReformatCodeBasedOnEditorConfigSettingsTest.kt → CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/test/ReformatCodeBasedOnEditorConfigSettingsTest.kt

@@ -1,5 +1,5 @@
 import org.jetbrains.academy.test.system.ij.formatting.checkIfFormattingRulesWereApplied
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 import java.io.File

CodeStyleAndFormatting/CodeSchemasAndEditorConfig/lesson-info.yaml

@@ -1,7 +1,7 @@
 type: framework
 custom_name: Code schemas and EditorConfig
 content:
-- Theory
-- ConfigureCodeStyleSettingsInIDE
-- ReformatTheCodeAccordingToStyleSettings
+  - Theory
+  - ConfigureCodeStyleSettingsInIDE
+  - ReformatTheCodeAccordingToStyleSettingsPractice
 is_template_based: false

CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/test/Tests.kt → CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/test/Tests.kt

@@ -1,5 +1,5 @@
 import org.jetbrains.academy.test.system.ij.formatting.checkIfFormattingRulesWereApplied
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 import java.io.File

CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/test/Tests.kt → CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/test/Tests.kt

@@ -1,6 +1,6 @@
 import org.jetbrains.academy.test.system.ij.formatting.checkIfFormattingRulesWereApplied
-import org.jetbrains.academy.test.system.ij.formatting.checkIfOptimizeImportsWereApplied
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.ij.formatting.checkIfOptimizeImportsWereApplied
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 import java.io.File

CodeStyleAndFormatting/WhatIsFormatting/lesson-info.yaml

@@ -1,6 +1,6 @@
 custom_name: What is formatting?
 content:
-- Theory
-- Quiz
-- ReformatTheCode
-- ReformatTheCodeUsingIDE
+  - Theory
+  - Quiz
+  - ReformatTheCodePractice
+  - ReformatTheCodeUsingIDEPractice

ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/test/Tests.kt → ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/test/Tests.kt

@@ -1,5 +1,5 @@
 import com.intellij.openapi.command.WriteCommandAction
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

ExtractingCode/WhatIsExtractMethodRefactoring/lesson-info.yaml

@@ -1,4 +1,4 @@
 custom_name: What is Extract Method refactoring?
 content:
-- Theory
-- ExtractDuplicatedCode
+  - Theory
+  - ExtractDuplicatedCodePractice

ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/test/Tests.kt → ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

ExtractingCode/WhatIsExtractVariableRefactoring/lesson-info.yaml

@@ -1,4 +1,4 @@
 custom_name: What is Extract Variable refactoring?
 content:
-- Theory
-- ExtractMagicConstants
+  - Theory
+  - ExtractMagicConstantsPractice

InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/test/Tests.kt → InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

InliningCode/InlineMethodRefactoring/lesson-info.yaml

@@ -1,4 +1,4 @@
 custom_name: What is Inline Method refactoring?
 content:
-- Theory
-- InlineMethodAndVariables
+  - Theory
+  - InlineMethodAndVariablesPractice

InliningCode/MiddleManCodeSmell/Practice/test/Tests.kt → InliningCode/MiddleManCodeSmell/PracticePractice/test/Tests.kt

@@ -1,7 +1,4 @@
-import com.intellij.openapi.application.ApplicationManager
-import org.jetbrains.academy.test.system.ij.analyzer.extractElementsOfTypes
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
-import org.jetbrains.kotlin.psi.KtClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
@@ -41,8 +38,4 @@ class MiddleManTest : BaseIjTestClass() {
             "Please, invoke \"dataProvider.fetchData()\" inside \"Client::processData\" method."
         }
     }
-
-    private fun hasClass(className: String) = ApplicationManager.getApplication().runReadAction<Boolean> {
-        myFixture.file.extractElementsOfTypes(KtClass::class.java).any { it.name == className }
-    }
 }

InliningCode/MiddleManCodeSmell/lesson-info.yaml

@@ -2,5 +2,5 @@ type: framework
 custom_name: Middle Man code smell
 content:
   - Theory
-  - Practice
+  - PracticePractice
 is_template_based: false

InliningCode/WhatIsInlineVariableRefactoring/InlineVariables/test/Tests.kt → InliningCode/WhatIsInlineVariableRefactoring/InlineVariablesPractice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll

InliningCode/WhatIsInlineVariableRefactoring/lesson-info.yaml

@@ -1,4 +1,4 @@
 custom_name: What is Inline Variable refactoring?
 content:
   - Theory
-  - InlineVariables
+  - InlineVariablesPractice

Introduction/GettingToKnowYou/GettingToKnowYou/task-info.yaml

@@ -1,5 +1,5 @@
 type: theory
-custom_name: GettingToKnowYou
+custom_name: Getting to know you
 files:
   - name: src/main/kotlin/jetbrains/refactoring/course/introduction/Main.kt
     visible: true

MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/test/Tests.kt → MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/test/Tests.kt → MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

MovingCode/WhatArePullUpAndPushDownRefactorings/lesson-info.yaml

@@ -1,7 +1,7 @@
 type: framework
 custom_name: What are Pull Up and Push Down refactorings?
 content:
-- WhatArePullUpAndPushDownRefactorings
-- ApplyPullUpRefactoring
-- ApplyPushDownRefactoring
+  - WhatArePullUpAndPushDownRefactorings
+  - ApplyPullUpRefactoringPractice
+  - ApplyPushDownRefactoringPractice
 is_template_based: false

MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/test/Tests.kt → MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/test/Tests.kt → MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 

MovingCode/WhatIsMoveMethodRefactoring/lesson-info.yaml

@@ -1,7 +1,7 @@
 type: framework
 custom_name: What is Move refactoring?
 content:
-- WhatIsMoveMethodRefactoring
-- FindMoreAppropriateFilesForClasses
-- FindMoreAppropriateClassesForMethods
+  - WhatIsMoveMethodRefactoring
+  - FindMoreAppropriateFilesForClassesPractice
+  - FindMoreAppropriateClassesForMethodsPractice
 is_template_based: false

RefactoringAndItsPurpose/Practice/RefactoringAndItsPurposePractice/test/IdentifyIssuesInCodeSnippetTest.kt

@@ -1,7 +1,4 @@
-import com.intellij.openapi.application.ApplicationManager
-import org.jetbrains.academy.test.system.ij.analyzer.extractElementsOfTypes
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
-import org.jetbrains.kotlin.psi.KtParameter
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
@@ -55,8 +52,4 @@ class IdentifyIssuesInCodeSnippetTest : BaseIjTestClass() {
             "Please, rename \"w\" parameter to \"width\""
         }
     }
-
-    private fun hasParameter(parameterName: String) = ApplicationManager.getApplication().runReadAction<Boolean> {
-        myFixture.file.extractElementsOfTypes(KtParameter::class.java).any { it.name == parameterName }
-    }
 }

RefactoringToDesignPatterns/FacadePatternPractice/Task/test/Tests.kt → RefactoringToDesignPatterns/FacadePatternPractice/Practice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

RefactoringToDesignPatterns/FacadePatternPractice/lesson-info.yaml

@@ -2,5 +2,5 @@ type: framework
 custom_name: Facade Pattern - Practice
 content:
   - FacadePattern
-  - Task
+  - Practice
 is_template_based: false

RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/test/Tests.kt → RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

RefactoringToDesignPatterns/FactoryMethodPatternPractice/lesson-info.yaml

@@ -2,5 +2,5 @@ type: framework
 custom_name: Factory Method Pattern - Practice
 content:
   - FactoryMethodPattern
-  - Task
+  - Practice
 is_template_based: false

RefactoringToDesignPatterns/StrategyPatternPractice/Task/test/Tests.kt → RefactoringToDesignPatterns/StrategyPatternPractice/Practice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

RefactoringToDesignPatterns/StrategyPatternPractice/lesson-info.yaml

@@ -2,5 +2,5 @@ type: framework
 custom_name: Strategy Pattern - Practice
 content:
   - StrategyPattern
-  - Task
+  - Practice
 is_template_based: false

RenamingCode/RenameRefactoringInIDE/FixTypos/test/Tests.kt → RenamingCode/RenameRefactoringInIDE/FixTyposPractice/test/Tests.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.academy.test.system.test.BaseIjTestClass
+import org.jetbrains.academy.test.system.kotlin.test.BaseIjTestClass
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test

RenamingCode/RenameRefactoringInIDE/lesson-info.yaml

@@ -1,5 +1,5 @@
 custom_name: Rename refactoring in IDE
 content:
-- RenameRefactoringInIDE
-- Quiz
-- FixTypos
+  - RenameRefactoringInIDE
+  - Quiz
+  - FixTyposPractice

build.gradle.kts

@@ -8,6 +8,12 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
 }
 
+intellij {
+    version.set("2022.1.1")
+    plugins.set(listOf("java", "Kotlin"))
+    type.set("IC")
+}
+
 buildscript {
     extra["kotlin_version"] = "1.8.20"
 
@@ -32,18 +38,11 @@ fun printOutput(output: Any): Task {
 
 allprojects {
     apply {
-        plugin("org.jetbrains.intellij")
         plugin("application")
         plugin("java")
         plugin("kotlin")
     }
 
-    intellij {
-        version.set("2022.1.1")
-        plugins.set(listOf("java", "Kotlin"))
-        type.set("IC")
-    }
-
     repositories {
         mavenCentral()
         mavenLocal()
@@ -56,10 +55,6 @@ allprojects {
         implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20")
         testImplementation("junit:junit:4.13.1")
 
-        val testSystemVersion = "2.1.0"
-        implementation("org.jetbrains.academy.test.system:core:$testSystemVersion")
-        implementation("org.jetbrains.academy.test.system:ij:$testSystemVersion")
-
         val junitJupiterVersion = "5.9.0"
         implementation("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion")
         runtimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion")
@@ -124,7 +119,24 @@ configure(subprojects.filter { it.name != "util" }) {
     }
 }
 
-configure(subprojects.filter { it.name == "CodeStyleAndFormatting-CodeSchemasAndEditorConfig-ReformatTheCodeAccordingToStyleSettings" }) {
+configure(subprojects.filter { it.name.endsWith("Practice") }) {
+    plugins.apply("org.jetbrains.intellij")
+
+    intellij {
+        version.set("2022.1.1")
+        plugins.set(listOf("java", "Kotlin"))
+        type.set("IC")
+    }
+
+    dependencies {
+        val testSystemVersion = "2.1.1"
+        testImplementation("org.jetbrains.academy.test.system:core:$testSystemVersion")
+        testImplementation("org.jetbrains.academy.test.system:kotlin-psi:$testSystemVersion")
+        testImplementation("org.jetbrains.academy.test.system:common:$testSystemVersion")
+    }
+}
+
+configure(subprojects.filter { it.name == "CodeStyleAndFormatting-CodeSchemasAndEditorConfig-ReformatTheCodeAccordingToStyleSettingsPractice" }) {
     apply {
         plugin("org.jlleitschuh.gradle.ktlint")
     }

settings.gradle.kts

@@ -3,7 +3,6 @@ pluginManagement {
         gradlePluginPortal()
         google()
         mavenCentral()
-        mavenLocal()
         maven(url = "https://packages.jetbrains.team/maven/p/kotlin-test-framework/kotlin-test-framework")
     }
 }