From 50894b37ff15e0744152438f67ba58970b46141f Mon Sep 17 00:00:00 2001 From: anchouls Date: Mon, 18 Dec 2023 16:47:36 +0100 Subject: [PATCH] Updated test framework version --- .../.editorconfig | 0 .../refactoring/course/formatting/Task.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../task.md | 0 ...rmatCodeBasedOnEditorConfigSettingsTest.kt | 2 +- .../lesson-info.yaml | 6 ++-- .../refactoring/course/formatting/Task.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../task.md | 0 .../test/Tests.kt | 2 +- .../refactoring/course/formatting/Task.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../task.md | 0 .../test/Tests.kt | 4 +-- .../WhatIsFormatting/lesson-info.yaml | 8 ++--- .../refactoring/course/extracting/Task.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../task.md | 0 .../test/Tests.kt | 2 +- .../lesson-info.yaml | 4 +-- .../refactoring/course/extracting/Task.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../task.md | 0 .../test/Tests.kt | 2 +- .../lesson-info.yaml | 4 +-- .../refactoring/course/inlining/Task.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../task.md | 0 .../test/Tests.kt | 2 +- .../InlineMethodRefactoring/lesson-info.yaml | 4 +-- .../refactoring/course/inlining/MiddleMan.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../{Practice => PracticePractice}/task.md | 0 .../test/Tests.kt | 9 +---- .../MiddleManCodeSmell/lesson-info.yaml | 2 +- .../refactoring/course/inlining/Task.kt | 0 .../task-info.yaml | 0 .../task.md | 0 .../test/Tests.kt | 2 +- .../lesson-info.yaml | 2 +- .../GettingToKnowYou/task-info.yaml | 2 +- .../refactoring/course/moving/Animal.kt | 0 .../refactoring/course/moving/Cat.kt | 0 .../refactoring/course/moving/Dog.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../task.md | 0 .../test/AnimalClass.kt | 0 .../test/Tests.kt | 2 +- .../refactoring/course/moving/Animal.kt | 0 .../refactoring/course/moving/Cat.kt | 0 .../refactoring/course/moving/Dog.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../task.md | 0 .../test/AnimalClass.kt | 0 .../test/Tests.kt | 2 +- .../lesson-info.yaml | 6 ++-- .../refactoring/course/moving/Main.kt | 0 .../refactoring/course/moving/car/Car.kt | 0 .../course/moving/driver/Driver.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../task.md | 0 .../test/DriverTestClass.kt | 0 .../test/Tests.kt | 2 +- .../refactoring/course/moving/Main.kt | 0 .../refactoring/course/moving/car/Car.kt | 0 .../course/moving/driver/Driver.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../task.md | 0 .../test/DriverTestClass.kt | 0 .../test/Tests.kt | 2 +- .../lesson-info.yaml | 6 ++-- .../test/IdentifyIssuesInCodeSnippetTest.kt | 9 +---- .../refactoring/course/patterns/Main.kt | 0 .../course/patterns/VideoConversionFacade.kt | 0 .../course/patterns/VideoEncoder.kt | 0 .../course/patterns/VideoLoader.kt | 0 .../course/patterns/VideoProcessor.kt | 0 .../refactoring/course/patterns/VideoSaver.kt | 0 .../course/patterns/video/EncodedVideo.kt | 0 .../course/patterns/video/ProcessedVideo.kt | 0 .../course/patterns/video/Video.kt | 0 .../{Task => Practice}/task-info.yaml | 0 .../{Task => Practice}/task-remote-info.yaml | 0 .../{Task => Practice}/task.md | 0 .../{Task => Practice}/test/Tests.kt | 2 +- .../test/VideoConversionFacadeClass.kt | 0 .../FacadePatternPractice/lesson-info.yaml | 2 +- .../refactoring/course/patterns/Bicycle.kt | 0 .../refactoring/course/patterns/Car.kt | 0 .../refactoring/course/patterns/Main.kt | 0 .../refactoring/course/patterns/Transport.kt | 0 .../patterns/TransportationServiceFactory.kt | 0 .../{Task => Practice}/task-info.yaml | 0 .../{Task => Practice}/task-remote-info.yaml | 0 .../{Task => Practice}/task.md | 0 .../{Task => Practice}/test/Tests.kt | 2 +- .../{Task => Practice}/test/TransportClass.kt | 0 .../lesson-info.yaml | 2 +- .../refactoring/course/patterns/Main.kt | 0 .../refactoring/course/patterns/Order.kt | 0 .../patterns/processor/PaymentProcessor.kt | 0 .../patterns/strategy/BitcoinPayment.kt | 0 .../patterns/strategy/CreditCardPayment.kt | 0 .../course/patterns/strategy/PayPalPayment.kt | 0 .../patterns/strategy/PaymentStrategy.kt | 0 .../{Task => Practice}/task-info.yaml | 0 .../{Task => Practice}/task-remote-info.yaml | 0 .../{Task => Practice}/task.md | 0 .../{Task => Practice}/test/OrderClass.kt | 0 .../test/PaymentProcessorClass.kt | 0 .../test/PaymentStrategyClass.kt | 0 .../{Task => Practice}/test/Tests.kt | 2 +- .../StrategyPatternPractice/lesson-info.yaml | 2 +- .../refactoring/course/renaming/Student.kt | 0 .../refactoring/course/renaming/University.kt | 0 .../task-info.yaml | 0 .../task-remote-info.yaml | 0 .../{FixTypos => FixTyposPractice}/task.md | 0 .../test/StudentTestClass.kt | 0 .../test/Tests.kt | 2 +- .../RenameRefactoringInIDE/lesson-info.yaml | 6 ++-- build.gradle.kts | 36 ++++++++++++------- settings.gradle.kts | 1 - 134 files changed, 70 insertions(+), 73 deletions(-) rename CodeStyleAndFormatting/CodeSchemasAndEditorConfig/{ReformatTheCodeAccordingToStyleSettings => ReformatTheCodeAccordingToStyleSettingsPractice}/.editorconfig (100%) rename CodeStyleAndFormatting/CodeSchemasAndEditorConfig/{ReformatTheCodeAccordingToStyleSettings => ReformatTheCodeAccordingToStyleSettingsPractice}/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt (100%) rename CodeStyleAndFormatting/CodeSchemasAndEditorConfig/{ReformatTheCodeAccordingToStyleSettings => ReformatTheCodeAccordingToStyleSettingsPractice}/task-info.yaml (100%) rename CodeStyleAndFormatting/CodeSchemasAndEditorConfig/{ReformatTheCodeAccordingToStyleSettings => ReformatTheCodeAccordingToStyleSettingsPractice}/task-remote-info.yaml (100%) rename CodeStyleAndFormatting/CodeSchemasAndEditorConfig/{ReformatTheCodeAccordingToStyleSettings => ReformatTheCodeAccordingToStyleSettingsPractice}/task.md (100%) rename CodeStyleAndFormatting/CodeSchemasAndEditorConfig/{ReformatTheCodeAccordingToStyleSettings => ReformatTheCodeAccordingToStyleSettingsPractice}/test/ReformatCodeBasedOnEditorConfigSettingsTest.kt (95%) rename CodeStyleAndFormatting/WhatIsFormatting/{ReformatTheCode => ReformatTheCodePractice}/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt (100%) rename CodeStyleAndFormatting/WhatIsFormatting/{ReformatTheCode => ReformatTheCodePractice}/task-info.yaml (100%) rename CodeStyleAndFormatting/WhatIsFormatting/{ReformatTheCode => ReformatTheCodePractice}/task-remote-info.yaml (100%) rename CodeStyleAndFormatting/WhatIsFormatting/{ReformatTheCode => ReformatTheCodePractice}/task.md (100%) rename CodeStyleAndFormatting/WhatIsFormatting/{ReformatTheCode => ReformatTheCodePractice}/test/Tests.kt (92%) rename CodeStyleAndFormatting/WhatIsFormatting/{ReformatTheCodeUsingIDE => ReformatTheCodeUsingIDEPractice}/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt (100%) rename CodeStyleAndFormatting/WhatIsFormatting/{ReformatTheCodeUsingIDE => ReformatTheCodeUsingIDEPractice}/task-info.yaml (100%) rename CodeStyleAndFormatting/WhatIsFormatting/{ReformatTheCodeUsingIDE => ReformatTheCodeUsingIDEPractice}/task-remote-info.yaml (100%) rename CodeStyleAndFormatting/WhatIsFormatting/{ReformatTheCodeUsingIDE => ReformatTheCodeUsingIDEPractice}/task.md (100%) rename CodeStyleAndFormatting/WhatIsFormatting/{ReformatTheCodeUsingIDE => ReformatTheCodeUsingIDEPractice}/test/Tests.kt (86%) rename ExtractingCode/WhatIsExtractMethodRefactoring/{ExtractDuplicatedCode => ExtractDuplicatedCodePractice}/src/main/kotlin/jetbrains/refactoring/course/extracting/Task.kt (100%) rename ExtractingCode/WhatIsExtractMethodRefactoring/{ExtractDuplicatedCode => ExtractDuplicatedCodePractice}/task-info.yaml (100%) rename ExtractingCode/WhatIsExtractMethodRefactoring/{ExtractDuplicatedCode => ExtractDuplicatedCodePractice}/task-remote-info.yaml (100%) rename ExtractingCode/WhatIsExtractMethodRefactoring/{ExtractDuplicatedCode => ExtractDuplicatedCodePractice}/task.md (100%) rename ExtractingCode/WhatIsExtractMethodRefactoring/{ExtractDuplicatedCode => ExtractDuplicatedCodePractice}/test/Tests.kt (96%) rename ExtractingCode/WhatIsExtractVariableRefactoring/{ExtractMagicConstants => ExtractMagicConstantsPractice}/src/main/kotlin/jetbrains/refactoring/course/extracting/Task.kt (100%) rename ExtractingCode/WhatIsExtractVariableRefactoring/{ExtractMagicConstants => ExtractMagicConstantsPractice}/task-info.yaml (100%) rename ExtractingCode/WhatIsExtractVariableRefactoring/{ExtractMagicConstants => ExtractMagicConstantsPractice}/task-remote-info.yaml (100%) rename ExtractingCode/WhatIsExtractVariableRefactoring/{ExtractMagicConstants => ExtractMagicConstantsPractice}/task.md (100%) rename ExtractingCode/WhatIsExtractVariableRefactoring/{ExtractMagicConstants => ExtractMagicConstantsPractice}/test/Tests.kt (94%) rename InliningCode/InlineMethodRefactoring/{InlineMethodAndVariables => InlineMethodAndVariablesPractice}/src/main/kotlin/jetbrains/refactoring/course/inlining/Task.kt (100%) rename InliningCode/InlineMethodRefactoring/{InlineMethodAndVariables => InlineMethodAndVariablesPractice}/task-info.yaml (100%) rename InliningCode/InlineMethodRefactoring/{InlineMethodAndVariables => InlineMethodAndVariablesPractice}/task-remote-info.yaml (100%) rename InliningCode/InlineMethodRefactoring/{InlineMethodAndVariables => InlineMethodAndVariablesPractice}/task.md (100%) rename InliningCode/InlineMethodRefactoring/{InlineMethodAndVariables => InlineMethodAndVariablesPractice}/test/Tests.kt (96%) rename InliningCode/MiddleManCodeSmell/{Practice => PracticePractice}/src/main/kotlin/jetbrains/refactoring/course/inlining/MiddleMan.kt (100%) rename InliningCode/MiddleManCodeSmell/{Practice => PracticePractice}/task-info.yaml (100%) rename InliningCode/MiddleManCodeSmell/{Practice => PracticePractice}/task-remote-info.yaml (100%) rename InliningCode/MiddleManCodeSmell/{Practice => PracticePractice}/task.md (100%) rename InliningCode/MiddleManCodeSmell/{Practice => PracticePractice}/test/Tests.kt (72%) rename InliningCode/WhatIsInlineVariableRefactoring/{InlineVariables => InlineVariablesPractice}/src/main/kotlin/jetbrains/refactoring/course/inlining/Task.kt (100%) rename InliningCode/WhatIsInlineVariableRefactoring/{InlineVariables => InlineVariablesPractice}/task-info.yaml (100%) rename InliningCode/WhatIsInlineVariableRefactoring/{InlineVariables => InlineVariablesPractice}/task.md (100%) rename InliningCode/WhatIsInlineVariableRefactoring/{InlineVariables => InlineVariablesPractice}/test/Tests.kt (93%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPullUpRefactoring => ApplyPullUpRefactoringPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/Animal.kt (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPullUpRefactoring => ApplyPullUpRefactoringPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/Cat.kt (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPullUpRefactoring => ApplyPullUpRefactoringPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/Dog.kt (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPullUpRefactoring => ApplyPullUpRefactoringPractice}/task-info.yaml (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPullUpRefactoring => ApplyPullUpRefactoringPractice}/task-remote-info.yaml (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPullUpRefactoring => ApplyPullUpRefactoringPractice}/task.md (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPullUpRefactoring => ApplyPullUpRefactoringPractice}/test/AnimalClass.kt (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPullUpRefactoring => ApplyPullUpRefactoringPractice}/test/Tests.kt (95%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPushDownRefactoring => ApplyPushDownRefactoringPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/Animal.kt (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPushDownRefactoring => ApplyPushDownRefactoringPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/Cat.kt (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPushDownRefactoring => ApplyPushDownRefactoringPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/Dog.kt (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPushDownRefactoring => ApplyPushDownRefactoringPractice}/task-info.yaml (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPushDownRefactoring => ApplyPushDownRefactoringPractice}/task-remote-info.yaml (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPushDownRefactoring => ApplyPushDownRefactoringPractice}/task.md (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPushDownRefactoring => ApplyPushDownRefactoringPractice}/test/AnimalClass.kt (100%) rename MovingCode/WhatArePullUpAndPushDownRefactorings/{ApplyPushDownRefactoring => ApplyPushDownRefactoringPractice}/test/Tests.kt (96%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateClassesForMethods => FindMoreAppropriateClassesForMethodsPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/Main.kt (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateClassesForMethods => FindMoreAppropriateClassesForMethodsPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/car/Car.kt (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateClassesForMethods => FindMoreAppropriateClassesForMethodsPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/driver/Driver.kt (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateClassesForMethods => FindMoreAppropriateClassesForMethodsPractice}/task-info.yaml (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateClassesForMethods => FindMoreAppropriateClassesForMethodsPractice}/task-remote-info.yaml (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateClassesForMethods => FindMoreAppropriateClassesForMethodsPractice}/task.md (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateClassesForMethods => FindMoreAppropriateClassesForMethodsPractice}/test/DriverTestClass.kt (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateClassesForMethods => FindMoreAppropriateClassesForMethodsPractice}/test/Tests.kt (95%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateFilesForClasses => FindMoreAppropriateFilesForClassesPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/Main.kt (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateFilesForClasses => FindMoreAppropriateFilesForClassesPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/car/Car.kt (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateFilesForClasses => FindMoreAppropriateFilesForClassesPractice}/src/main/kotlin/jetbrains/refactoring/course/moving/driver/Driver.kt (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateFilesForClasses => FindMoreAppropriateFilesForClassesPractice}/task-info.yaml (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateFilesForClasses => FindMoreAppropriateFilesForClassesPractice}/task-remote-info.yaml (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateFilesForClasses => FindMoreAppropriateFilesForClassesPractice}/task.md (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateFilesForClasses => FindMoreAppropriateFilesForClassesPractice}/test/DriverTestClass.kt (100%) rename MovingCode/WhatIsMoveMethodRefactoring/{FindMoreAppropriateFilesForClasses => FindMoreAppropriateFilesForClassesPractice}/test/Tests.kt (89%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoConversionFacade.kt (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoEncoder.kt (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoLoader.kt (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoProcessor.kt (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoSaver.kt (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/video/EncodedVideo.kt (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/video/ProcessedVideo.kt (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/video/Video.kt (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/task-info.yaml (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/task-remote-info.yaml (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/task.md (100%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/test/Tests.kt (96%) rename RefactoringToDesignPatterns/FacadePatternPractice/{Task => Practice}/test/VideoConversionFacadeClass.kt (100%) rename RefactoringToDesignPatterns/FactoryMethodPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/Bicycle.kt (100%) rename RefactoringToDesignPatterns/FactoryMethodPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/Car.kt (100%) rename RefactoringToDesignPatterns/FactoryMethodPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt (100%) rename RefactoringToDesignPatterns/FactoryMethodPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/Transport.kt (100%) rename RefactoringToDesignPatterns/FactoryMethodPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/TransportationServiceFactory.kt (100%) rename RefactoringToDesignPatterns/FactoryMethodPatternPractice/{Task => Practice}/task-info.yaml (100%) rename RefactoringToDesignPatterns/FactoryMethodPatternPractice/{Task => Practice}/task-remote-info.yaml (100%) rename RefactoringToDesignPatterns/FactoryMethodPatternPractice/{Task => Practice}/task.md (100%) rename RefactoringToDesignPatterns/FactoryMethodPatternPractice/{Task => Practice}/test/Tests.kt (95%) rename RefactoringToDesignPatterns/FactoryMethodPatternPractice/{Task => Practice}/test/TransportClass.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/Order.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/processor/PaymentProcessor.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/BitcoinPayment.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/CreditCardPayment.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/PayPalPayment.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/PaymentStrategy.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/task-info.yaml (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/task-remote-info.yaml (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/task.md (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/test/OrderClass.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/test/PaymentProcessorClass.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/test/PaymentStrategyClass.kt (100%) rename RefactoringToDesignPatterns/StrategyPatternPractice/{Task => Practice}/test/Tests.kt (98%) rename RenamingCode/RenameRefactoringInIDE/{FixTypos => FixTyposPractice}/src/main/kotlin/jetbrains/refactoring/course/renaming/Student.kt (100%) rename RenamingCode/RenameRefactoringInIDE/{FixTypos => FixTyposPractice}/src/main/kotlin/jetbrains/refactoring/course/renaming/University.kt (100%) rename RenamingCode/RenameRefactoringInIDE/{FixTypos => FixTyposPractice}/task-info.yaml (100%) rename RenamingCode/RenameRefactoringInIDE/{FixTypos => FixTyposPractice}/task-remote-info.yaml (100%) rename RenamingCode/RenameRefactoringInIDE/{FixTypos => FixTyposPractice}/task.md (100%) rename RenamingCode/RenameRefactoringInIDE/{FixTypos => FixTyposPractice}/test/StudentTestClass.kt (100%) rename RenamingCode/RenameRefactoringInIDE/{FixTypos => FixTyposPractice}/test/Tests.kt (97%) diff --git a/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/.editorconfig b/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/.editorconfig similarity index 100% rename from CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/.editorconfig rename to CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/.editorconfig diff --git a/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt b/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt similarity index 100% rename from CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt rename to CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt diff --git a/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/task-info.yaml b/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/task-info.yaml similarity index 100% rename from CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/task-info.yaml rename to CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/task-info.yaml diff --git a/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/task-remote-info.yaml b/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/task-remote-info.yaml similarity index 100% rename from CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/task-remote-info.yaml rename to CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/task-remote-info.yaml diff --git a/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/task.md b/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/task.md similarity index 100% rename from CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/task.md rename to CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/task.md diff --git a/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/test/ReformatCodeBasedOnEditorConfigSettingsTest.kt b/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/test/ReformatCodeBasedOnEditorConfigSettingsTest.kt similarity index 95% rename from CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/test/ReformatCodeBasedOnEditorConfigSettingsTest.kt rename to CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettingsPractice/test/ReformatCodeBasedOnEditorConfigSettingsTest.kt index faba502..10514c0 100644 --- a/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/ReformatTheCodeAccordingToStyleSettings/test/ReformatCodeBasedOnEditorConfigSettingsTest.kt +++ b/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 diff --git a/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/lesson-info.yaml b/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/lesson-info.yaml index 0e733a5..8a437ad 100644 --- a/CodeStyleAndFormatting/CodeSchemasAndEditorConfig/lesson-info.yaml +++ b/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 diff --git a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt b/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt similarity index 100% rename from CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt rename to CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt diff --git a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/task-info.yaml b/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/task-info.yaml similarity index 100% rename from CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/task-info.yaml rename to CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/task-info.yaml diff --git a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/task-remote-info.yaml b/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/task-remote-info.yaml similarity index 100% rename from CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/task-remote-info.yaml rename to CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/task-remote-info.yaml diff --git a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/task.md b/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/task.md similarity index 100% rename from CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/task.md rename to CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/task.md diff --git a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/test/Tests.kt b/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/test/Tests.kt similarity index 92% rename from CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/test/Tests.kt rename to CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodePractice/test/Tests.kt index 2b161e9..8079994 100644 --- a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCode/test/Tests.kt +++ b/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 diff --git a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt b/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt similarity index 100% rename from CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt rename to CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/src/main/kotlin/jetbrains/refactoring/course/formatting/Task.kt diff --git a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/task-info.yaml b/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/task-info.yaml similarity index 100% rename from CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/task-info.yaml rename to CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/task-info.yaml diff --git a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/task-remote-info.yaml b/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/task-remote-info.yaml similarity index 100% rename from CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/task-remote-info.yaml rename to CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/task-remote-info.yaml diff --git a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/task.md b/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/task.md similarity index 100% rename from CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/task.md rename to CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/task.md diff --git a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/test/Tests.kt b/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/test/Tests.kt similarity index 86% rename from CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/test/Tests.kt rename to CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDEPractice/test/Tests.kt index 3ee91b6..65ca4a0 100644 --- a/CodeStyleAndFormatting/WhatIsFormatting/ReformatTheCodeUsingIDE/test/Tests.kt +++ b/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 diff --git a/CodeStyleAndFormatting/WhatIsFormatting/lesson-info.yaml b/CodeStyleAndFormatting/WhatIsFormatting/lesson-info.yaml index c675620..f0e3e7f 100644 --- a/CodeStyleAndFormatting/WhatIsFormatting/lesson-info.yaml +++ b/CodeStyleAndFormatting/WhatIsFormatting/lesson-info.yaml @@ -1,6 +1,6 @@ custom_name: What is formatting? content: -- Theory -- Quiz -- ReformatTheCode -- ReformatTheCodeUsingIDE + - Theory + - Quiz + - ReformatTheCodePractice + - ReformatTheCodeUsingIDEPractice diff --git a/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/src/main/kotlin/jetbrains/refactoring/course/extracting/Task.kt b/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/src/main/kotlin/jetbrains/refactoring/course/extracting/Task.kt similarity index 100% rename from ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/src/main/kotlin/jetbrains/refactoring/course/extracting/Task.kt rename to ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/src/main/kotlin/jetbrains/refactoring/course/extracting/Task.kt diff --git a/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/task-info.yaml b/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/task-info.yaml similarity index 100% rename from ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/task-info.yaml rename to ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/task-info.yaml diff --git a/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/task-remote-info.yaml b/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/task-remote-info.yaml similarity index 100% rename from ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/task-remote-info.yaml rename to ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/task-remote-info.yaml diff --git a/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/task.md b/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/task.md similarity index 100% rename from ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/task.md rename to ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/task.md diff --git a/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/test/Tests.kt b/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/test/Tests.kt similarity index 96% rename from ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/test/Tests.kt rename to ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCodePractice/test/Tests.kt index 7abaf80..93e62c1 100644 --- a/ExtractingCode/WhatIsExtractMethodRefactoring/ExtractDuplicatedCode/test/Tests.kt +++ b/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 diff --git a/ExtractingCode/WhatIsExtractMethodRefactoring/lesson-info.yaml b/ExtractingCode/WhatIsExtractMethodRefactoring/lesson-info.yaml index cb4d0bd..8c0aa08 100644 --- a/ExtractingCode/WhatIsExtractMethodRefactoring/lesson-info.yaml +++ b/ExtractingCode/WhatIsExtractMethodRefactoring/lesson-info.yaml @@ -1,4 +1,4 @@ custom_name: What is Extract Method refactoring? content: -- Theory -- ExtractDuplicatedCode + - Theory + - ExtractDuplicatedCodePractice diff --git a/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/src/main/kotlin/jetbrains/refactoring/course/extracting/Task.kt b/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/src/main/kotlin/jetbrains/refactoring/course/extracting/Task.kt similarity index 100% rename from ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/src/main/kotlin/jetbrains/refactoring/course/extracting/Task.kt rename to ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/src/main/kotlin/jetbrains/refactoring/course/extracting/Task.kt diff --git a/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/task-info.yaml b/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/task-info.yaml similarity index 100% rename from ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/task-info.yaml rename to ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/task-info.yaml diff --git a/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/task-remote-info.yaml b/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/task-remote-info.yaml similarity index 100% rename from ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/task-remote-info.yaml rename to ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/task-remote-info.yaml diff --git a/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/task.md b/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/task.md similarity index 100% rename from ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/task.md rename to ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/task.md diff --git a/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/test/Tests.kt b/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/test/Tests.kt similarity index 94% rename from ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/test/Tests.kt rename to ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstantsPractice/test/Tests.kt index 95857b0..a1d2049 100644 --- a/ExtractingCode/WhatIsExtractVariableRefactoring/ExtractMagicConstants/test/Tests.kt +++ b/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 diff --git a/ExtractingCode/WhatIsExtractVariableRefactoring/lesson-info.yaml b/ExtractingCode/WhatIsExtractVariableRefactoring/lesson-info.yaml index 2a3ef25..7734801 100644 --- a/ExtractingCode/WhatIsExtractVariableRefactoring/lesson-info.yaml +++ b/ExtractingCode/WhatIsExtractVariableRefactoring/lesson-info.yaml @@ -1,4 +1,4 @@ custom_name: What is Extract Variable refactoring? content: -- Theory -- ExtractMagicConstants + - Theory + - ExtractMagicConstantsPractice diff --git a/InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/src/main/kotlin/jetbrains/refactoring/course/inlining/Task.kt b/InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/src/main/kotlin/jetbrains/refactoring/course/inlining/Task.kt similarity index 100% rename from InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/src/main/kotlin/jetbrains/refactoring/course/inlining/Task.kt rename to InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/src/main/kotlin/jetbrains/refactoring/course/inlining/Task.kt diff --git a/InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/task-info.yaml b/InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/task-info.yaml similarity index 100% rename from InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/task-info.yaml rename to InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/task-info.yaml diff --git a/InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/task-remote-info.yaml b/InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/task-remote-info.yaml similarity index 100% rename from InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/task-remote-info.yaml rename to InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/task-remote-info.yaml diff --git a/InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/task.md b/InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/task.md similarity index 100% rename from InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/task.md rename to InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/task.md diff --git a/InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/test/Tests.kt b/InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/test/Tests.kt similarity index 96% rename from InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/test/Tests.kt rename to InliningCode/InlineMethodRefactoring/InlineMethodAndVariablesPractice/test/Tests.kt index 9dcba57..4265a48 100644 --- a/InliningCode/InlineMethodRefactoring/InlineMethodAndVariables/test/Tests.kt +++ b/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 diff --git a/InliningCode/InlineMethodRefactoring/lesson-info.yaml b/InliningCode/InlineMethodRefactoring/lesson-info.yaml index f3f882f..11cb83f 100644 --- a/InliningCode/InlineMethodRefactoring/lesson-info.yaml +++ b/InliningCode/InlineMethodRefactoring/lesson-info.yaml @@ -1,4 +1,4 @@ custom_name: What is Inline Method refactoring? content: -- Theory -- InlineMethodAndVariables + - Theory + - InlineMethodAndVariablesPractice diff --git a/InliningCode/MiddleManCodeSmell/Practice/src/main/kotlin/jetbrains/refactoring/course/inlining/MiddleMan.kt b/InliningCode/MiddleManCodeSmell/PracticePractice/src/main/kotlin/jetbrains/refactoring/course/inlining/MiddleMan.kt similarity index 100% rename from InliningCode/MiddleManCodeSmell/Practice/src/main/kotlin/jetbrains/refactoring/course/inlining/MiddleMan.kt rename to InliningCode/MiddleManCodeSmell/PracticePractice/src/main/kotlin/jetbrains/refactoring/course/inlining/MiddleMan.kt diff --git a/InliningCode/MiddleManCodeSmell/Practice/task-info.yaml b/InliningCode/MiddleManCodeSmell/PracticePractice/task-info.yaml similarity index 100% rename from InliningCode/MiddleManCodeSmell/Practice/task-info.yaml rename to InliningCode/MiddleManCodeSmell/PracticePractice/task-info.yaml diff --git a/InliningCode/MiddleManCodeSmell/Practice/task-remote-info.yaml b/InliningCode/MiddleManCodeSmell/PracticePractice/task-remote-info.yaml similarity index 100% rename from InliningCode/MiddleManCodeSmell/Practice/task-remote-info.yaml rename to InliningCode/MiddleManCodeSmell/PracticePractice/task-remote-info.yaml diff --git a/InliningCode/MiddleManCodeSmell/Practice/task.md b/InliningCode/MiddleManCodeSmell/PracticePractice/task.md similarity index 100% rename from InliningCode/MiddleManCodeSmell/Practice/task.md rename to InliningCode/MiddleManCodeSmell/PracticePractice/task.md diff --git a/InliningCode/MiddleManCodeSmell/Practice/test/Tests.kt b/InliningCode/MiddleManCodeSmell/PracticePractice/test/Tests.kt similarity index 72% rename from InliningCode/MiddleManCodeSmell/Practice/test/Tests.kt rename to InliningCode/MiddleManCodeSmell/PracticePractice/test/Tests.kt index 6b9f0c9..14110b0 100644 --- a/InliningCode/MiddleManCodeSmell/Practice/test/Tests.kt +++ b/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 { - myFixture.file.extractElementsOfTypes(KtClass::class.java).any { it.name == className } - } } \ No newline at end of file diff --git a/InliningCode/MiddleManCodeSmell/lesson-info.yaml b/InliningCode/MiddleManCodeSmell/lesson-info.yaml index da97763..7cd0f3e 100644 --- a/InliningCode/MiddleManCodeSmell/lesson-info.yaml +++ b/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 diff --git a/InliningCode/WhatIsInlineVariableRefactoring/InlineVariables/src/main/kotlin/jetbrains/refactoring/course/inlining/Task.kt b/InliningCode/WhatIsInlineVariableRefactoring/InlineVariablesPractice/src/main/kotlin/jetbrains/refactoring/course/inlining/Task.kt similarity index 100% rename from InliningCode/WhatIsInlineVariableRefactoring/InlineVariables/src/main/kotlin/jetbrains/refactoring/course/inlining/Task.kt rename to InliningCode/WhatIsInlineVariableRefactoring/InlineVariablesPractice/src/main/kotlin/jetbrains/refactoring/course/inlining/Task.kt diff --git a/InliningCode/WhatIsInlineVariableRefactoring/InlineVariables/task-info.yaml b/InliningCode/WhatIsInlineVariableRefactoring/InlineVariablesPractice/task-info.yaml similarity index 100% rename from InliningCode/WhatIsInlineVariableRefactoring/InlineVariables/task-info.yaml rename to InliningCode/WhatIsInlineVariableRefactoring/InlineVariablesPractice/task-info.yaml diff --git a/InliningCode/WhatIsInlineVariableRefactoring/InlineVariables/task.md b/InliningCode/WhatIsInlineVariableRefactoring/InlineVariablesPractice/task.md similarity index 100% rename from InliningCode/WhatIsInlineVariableRefactoring/InlineVariables/task.md rename to InliningCode/WhatIsInlineVariableRefactoring/InlineVariablesPractice/task.md diff --git a/InliningCode/WhatIsInlineVariableRefactoring/InlineVariables/test/Tests.kt b/InliningCode/WhatIsInlineVariableRefactoring/InlineVariablesPractice/test/Tests.kt similarity index 93% rename from InliningCode/WhatIsInlineVariableRefactoring/InlineVariables/test/Tests.kt rename to InliningCode/WhatIsInlineVariableRefactoring/InlineVariablesPractice/test/Tests.kt index aac1af2..991c4c6 100644 --- a/InliningCode/WhatIsInlineVariableRefactoring/InlineVariables/test/Tests.kt +++ b/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 diff --git a/InliningCode/WhatIsInlineVariableRefactoring/lesson-info.yaml b/InliningCode/WhatIsInlineVariableRefactoring/lesson-info.yaml index 23ea64e..b616803 100644 --- a/InliningCode/WhatIsInlineVariableRefactoring/lesson-info.yaml +++ b/InliningCode/WhatIsInlineVariableRefactoring/lesson-info.yaml @@ -1,4 +1,4 @@ custom_name: What is Inline Variable refactoring? content: - Theory - - InlineVariables + - InlineVariablesPractice diff --git a/Introduction/GettingToKnowYou/GettingToKnowYou/task-info.yaml b/Introduction/GettingToKnowYou/GettingToKnowYou/task-info.yaml index 4a509c7..0bd13b4 100644 --- a/Introduction/GettingToKnowYou/GettingToKnowYou/task-info.yaml +++ b/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 diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Animal.kt b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Animal.kt similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Animal.kt rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Animal.kt diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Cat.kt b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Cat.kt similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Cat.kt rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Cat.kt diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Dog.kt b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Dog.kt similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Dog.kt rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Dog.kt diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/task-info.yaml b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/task-info.yaml similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/task-info.yaml rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/task-info.yaml diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/task-remote-info.yaml b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/task-remote-info.yaml similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/task-remote-info.yaml rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/task-remote-info.yaml diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/task.md b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/task.md similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/task.md rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/task.md diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/test/AnimalClass.kt b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/test/AnimalClass.kt similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/test/AnimalClass.kt rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/test/AnimalClass.kt diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/test/Tests.kt b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/test/Tests.kt similarity index 95% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/test/Tests.kt rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoringPractice/test/Tests.kt index fa58c21..8b9c04c 100644 --- a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPullUpRefactoring/test/Tests.kt +++ b/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 diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Animal.kt b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Animal.kt similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Animal.kt rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Animal.kt diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Cat.kt b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Cat.kt similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Cat.kt rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Cat.kt diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Dog.kt b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Dog.kt similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/src/main/kotlin/jetbrains/refactoring/course/moving/Dog.kt rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Dog.kt diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/task-info.yaml b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/task-info.yaml similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/task-info.yaml rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/task-info.yaml diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/task-remote-info.yaml b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/task-remote-info.yaml similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/task-remote-info.yaml rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/task-remote-info.yaml diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/task.md b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/task.md similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/task.md rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/task.md diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/test/AnimalClass.kt b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/test/AnimalClass.kt similarity index 100% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/test/AnimalClass.kt rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/test/AnimalClass.kt diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/test/Tests.kt b/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/test/Tests.kt similarity index 96% rename from MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/test/Tests.kt rename to MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoringPractice/test/Tests.kt index 266af07..1d46b53 100644 --- a/MovingCode/WhatArePullUpAndPushDownRefactorings/ApplyPushDownRefactoring/test/Tests.kt +++ b/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 diff --git a/MovingCode/WhatArePullUpAndPushDownRefactorings/lesson-info.yaml b/MovingCode/WhatArePullUpAndPushDownRefactorings/lesson-info.yaml index bb0b4aa..20d8853 100644 --- a/MovingCode/WhatArePullUpAndPushDownRefactorings/lesson-info.yaml +++ b/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 diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/src/main/kotlin/jetbrains/refactoring/course/moving/Main.kt b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Main.kt similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/src/main/kotlin/jetbrains/refactoring/course/moving/Main.kt rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Main.kt diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/src/main/kotlin/jetbrains/refactoring/course/moving/car/Car.kt b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/src/main/kotlin/jetbrains/refactoring/course/moving/car/Car.kt similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/src/main/kotlin/jetbrains/refactoring/course/moving/car/Car.kt rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/src/main/kotlin/jetbrains/refactoring/course/moving/car/Car.kt diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/src/main/kotlin/jetbrains/refactoring/course/moving/driver/Driver.kt b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/src/main/kotlin/jetbrains/refactoring/course/moving/driver/Driver.kt similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/src/main/kotlin/jetbrains/refactoring/course/moving/driver/Driver.kt rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/src/main/kotlin/jetbrains/refactoring/course/moving/driver/Driver.kt diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/task-info.yaml b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/task-info.yaml similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/task-info.yaml rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/task-info.yaml diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/task-remote-info.yaml b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/task-remote-info.yaml similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/task-remote-info.yaml rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/task-remote-info.yaml diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/task.md b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/task.md similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/task.md rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/task.md diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/test/DriverTestClass.kt b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/test/DriverTestClass.kt similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/test/DriverTestClass.kt rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/test/DriverTestClass.kt diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/test/Tests.kt b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/test/Tests.kt similarity index 95% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/test/Tests.kt rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethodsPractice/test/Tests.kt index 764820a..5bc4154 100644 --- a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateClassesForMethods/test/Tests.kt +++ b/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 diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/src/main/kotlin/jetbrains/refactoring/course/moving/Main.kt b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Main.kt similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/src/main/kotlin/jetbrains/refactoring/course/moving/Main.kt rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/src/main/kotlin/jetbrains/refactoring/course/moving/Main.kt diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/src/main/kotlin/jetbrains/refactoring/course/moving/car/Car.kt b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/src/main/kotlin/jetbrains/refactoring/course/moving/car/Car.kt similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/src/main/kotlin/jetbrains/refactoring/course/moving/car/Car.kt rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/src/main/kotlin/jetbrains/refactoring/course/moving/car/Car.kt diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/src/main/kotlin/jetbrains/refactoring/course/moving/driver/Driver.kt b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/src/main/kotlin/jetbrains/refactoring/course/moving/driver/Driver.kt similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/src/main/kotlin/jetbrains/refactoring/course/moving/driver/Driver.kt rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/src/main/kotlin/jetbrains/refactoring/course/moving/driver/Driver.kt diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/task-info.yaml b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/task-info.yaml similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/task-info.yaml rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/task-info.yaml diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/task-remote-info.yaml b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/task-remote-info.yaml similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/task-remote-info.yaml rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/task-remote-info.yaml diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/task.md b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/task.md similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/task.md rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/task.md diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/test/DriverTestClass.kt b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/test/DriverTestClass.kt similarity index 100% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/test/DriverTestClass.kt rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/test/DriverTestClass.kt diff --git a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/test/Tests.kt b/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/test/Tests.kt similarity index 89% rename from MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/test/Tests.kt rename to MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClassesPractice/test/Tests.kt index ed636ef..fb6e5a6 100644 --- a/MovingCode/WhatIsMoveMethodRefactoring/FindMoreAppropriateFilesForClasses/test/Tests.kt +++ b/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 diff --git a/MovingCode/WhatIsMoveMethodRefactoring/lesson-info.yaml b/MovingCode/WhatIsMoveMethodRefactoring/lesson-info.yaml index 9a0fd84..d0f0deb 100644 --- a/MovingCode/WhatIsMoveMethodRefactoring/lesson-info.yaml +++ b/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 diff --git a/RefactoringAndItsPurpose/Practice/RefactoringAndItsPurposePractice/test/IdentifyIssuesInCodeSnippetTest.kt b/RefactoringAndItsPurpose/Practice/RefactoringAndItsPurposePractice/test/IdentifyIssuesInCodeSnippetTest.kt index 5a78093..3b7b192 100644 --- a/RefactoringAndItsPurpose/Practice/RefactoringAndItsPurposePractice/test/IdentifyIssuesInCodeSnippetTest.kt +++ b/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 { - myFixture.file.extractElementsOfTypes(KtParameter::class.java).any { it.name == parameterName } - } } \ No newline at end of file diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoConversionFacade.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoConversionFacade.kt similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoConversionFacade.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoConversionFacade.kt diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoEncoder.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoEncoder.kt similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoEncoder.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoEncoder.kt diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoLoader.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoLoader.kt similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoLoader.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoLoader.kt diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoProcessor.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoProcessor.kt similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoProcessor.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoProcessor.kt diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoSaver.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoSaver.kt similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoSaver.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/VideoSaver.kt diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/video/EncodedVideo.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/video/EncodedVideo.kt similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/video/EncodedVideo.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/video/EncodedVideo.kt diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/video/ProcessedVideo.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/video/ProcessedVideo.kt similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/video/ProcessedVideo.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/video/ProcessedVideo.kt diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/video/Video.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/video/Video.kt similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/video/Video.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/video/Video.kt diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/task-info.yaml b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/task-info.yaml similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/task-info.yaml rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/task-info.yaml diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/task-remote-info.yaml b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/task-remote-info.yaml similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/task-remote-info.yaml rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/task-remote-info.yaml diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/task.md b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/task.md similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/task.md rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/task.md diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/test/Tests.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/test/Tests.kt similarity index 96% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/test/Tests.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/test/Tests.kt index 66628bf..b475ffc 100644 --- a/RefactoringToDesignPatterns/FacadePatternPractice/Task/test/Tests.kt +++ b/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 diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/Task/test/VideoConversionFacadeClass.kt b/RefactoringToDesignPatterns/FacadePatternPractice/Practice/test/VideoConversionFacadeClass.kt similarity index 100% rename from RefactoringToDesignPatterns/FacadePatternPractice/Task/test/VideoConversionFacadeClass.kt rename to RefactoringToDesignPatterns/FacadePatternPractice/Practice/test/VideoConversionFacadeClass.kt diff --git a/RefactoringToDesignPatterns/FacadePatternPractice/lesson-info.yaml b/RefactoringToDesignPatterns/FacadePatternPractice/lesson-info.yaml index 41b894d..d30fe50 100644 --- a/RefactoringToDesignPatterns/FacadePatternPractice/lesson-info.yaml +++ b/RefactoringToDesignPatterns/FacadePatternPractice/lesson-info.yaml @@ -2,5 +2,5 @@ type: framework custom_name: Facade Pattern - Practice content: - FacadePattern - - Task + - Practice is_template_based: false diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Bicycle.kt b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Bicycle.kt similarity index 100% rename from RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Bicycle.kt rename to RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Bicycle.kt diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Car.kt b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Car.kt similarity index 100% rename from RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Car.kt rename to RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Car.kt diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt similarity index 100% rename from RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt rename to RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Transport.kt b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Transport.kt similarity index 100% rename from RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Transport.kt rename to RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Transport.kt diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/TransportationServiceFactory.kt b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/TransportationServiceFactory.kt similarity index 100% rename from RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/TransportationServiceFactory.kt rename to RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/TransportationServiceFactory.kt diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/task-info.yaml b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/task-info.yaml similarity index 100% rename from RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/task-info.yaml rename to RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/task-info.yaml diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/task-remote-info.yaml b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/task-remote-info.yaml similarity index 100% rename from RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/task-remote-info.yaml rename to RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/task-remote-info.yaml diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/task.md b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/task.md similarity index 100% rename from RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/task.md rename to RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/task.md diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/test/Tests.kt b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/test/Tests.kt similarity index 95% rename from RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/test/Tests.kt rename to RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/test/Tests.kt index 9af402d..02d92ee 100644 --- a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/test/Tests.kt +++ b/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 diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/test/TransportClass.kt b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/test/TransportClass.kt similarity index 100% rename from RefactoringToDesignPatterns/FactoryMethodPatternPractice/Task/test/TransportClass.kt rename to RefactoringToDesignPatterns/FactoryMethodPatternPractice/Practice/test/TransportClass.kt diff --git a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/lesson-info.yaml b/RefactoringToDesignPatterns/FactoryMethodPatternPractice/lesson-info.yaml index fd0f305..5880598 100644 --- a/RefactoringToDesignPatterns/FactoryMethodPatternPractice/lesson-info.yaml +++ b/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 diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Main.kt diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Order.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Order.kt similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/Order.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/Order.kt diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/processor/PaymentProcessor.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/processor/PaymentProcessor.kt similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/processor/PaymentProcessor.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/processor/PaymentProcessor.kt diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/BitcoinPayment.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/BitcoinPayment.kt similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/BitcoinPayment.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/BitcoinPayment.kt diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/CreditCardPayment.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/CreditCardPayment.kt similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/CreditCardPayment.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/CreditCardPayment.kt diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/PayPalPayment.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/PayPalPayment.kt similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/PayPalPayment.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/PayPalPayment.kt diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/PaymentStrategy.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/PaymentStrategy.kt similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/PaymentStrategy.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/src/main/kotlin/jetbrains/refactoring/course/patterns/strategy/PaymentStrategy.kt diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/task-info.yaml b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/task-info.yaml similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/task-info.yaml rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/task-info.yaml diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/task-remote-info.yaml b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/task-remote-info.yaml similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/task-remote-info.yaml rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/task-remote-info.yaml diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/task.md b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/task.md similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/task.md rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/task.md diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/test/OrderClass.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/test/OrderClass.kt similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/test/OrderClass.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/test/OrderClass.kt diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/test/PaymentProcessorClass.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/test/PaymentProcessorClass.kt similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/test/PaymentProcessorClass.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/test/PaymentProcessorClass.kt diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/test/PaymentStrategyClass.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/test/PaymentStrategyClass.kt similarity index 100% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/test/PaymentStrategyClass.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/test/PaymentStrategyClass.kt diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/test/Tests.kt b/RefactoringToDesignPatterns/StrategyPatternPractice/Practice/test/Tests.kt similarity index 98% rename from RefactoringToDesignPatterns/StrategyPatternPractice/Task/test/Tests.kt rename to RefactoringToDesignPatterns/StrategyPatternPractice/Practice/test/Tests.kt index 6e552cd..c2bcce9 100644 --- a/RefactoringToDesignPatterns/StrategyPatternPractice/Task/test/Tests.kt +++ b/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 diff --git a/RefactoringToDesignPatterns/StrategyPatternPractice/lesson-info.yaml b/RefactoringToDesignPatterns/StrategyPatternPractice/lesson-info.yaml index 6c953c8..ce30921 100644 --- a/RefactoringToDesignPatterns/StrategyPatternPractice/lesson-info.yaml +++ b/RefactoringToDesignPatterns/StrategyPatternPractice/lesson-info.yaml @@ -2,5 +2,5 @@ type: framework custom_name: Strategy Pattern - Practice content: - StrategyPattern - - Task + - Practice is_template_based: false diff --git a/RenamingCode/RenameRefactoringInIDE/FixTypos/src/main/kotlin/jetbrains/refactoring/course/renaming/Student.kt b/RenamingCode/RenameRefactoringInIDE/FixTyposPractice/src/main/kotlin/jetbrains/refactoring/course/renaming/Student.kt similarity index 100% rename from RenamingCode/RenameRefactoringInIDE/FixTypos/src/main/kotlin/jetbrains/refactoring/course/renaming/Student.kt rename to RenamingCode/RenameRefactoringInIDE/FixTyposPractice/src/main/kotlin/jetbrains/refactoring/course/renaming/Student.kt diff --git a/RenamingCode/RenameRefactoringInIDE/FixTypos/src/main/kotlin/jetbrains/refactoring/course/renaming/University.kt b/RenamingCode/RenameRefactoringInIDE/FixTyposPractice/src/main/kotlin/jetbrains/refactoring/course/renaming/University.kt similarity index 100% rename from RenamingCode/RenameRefactoringInIDE/FixTypos/src/main/kotlin/jetbrains/refactoring/course/renaming/University.kt rename to RenamingCode/RenameRefactoringInIDE/FixTyposPractice/src/main/kotlin/jetbrains/refactoring/course/renaming/University.kt diff --git a/RenamingCode/RenameRefactoringInIDE/FixTypos/task-info.yaml b/RenamingCode/RenameRefactoringInIDE/FixTyposPractice/task-info.yaml similarity index 100% rename from RenamingCode/RenameRefactoringInIDE/FixTypos/task-info.yaml rename to RenamingCode/RenameRefactoringInIDE/FixTyposPractice/task-info.yaml diff --git a/RenamingCode/RenameRefactoringInIDE/FixTypos/task-remote-info.yaml b/RenamingCode/RenameRefactoringInIDE/FixTyposPractice/task-remote-info.yaml similarity index 100% rename from RenamingCode/RenameRefactoringInIDE/FixTypos/task-remote-info.yaml rename to RenamingCode/RenameRefactoringInIDE/FixTyposPractice/task-remote-info.yaml diff --git a/RenamingCode/RenameRefactoringInIDE/FixTypos/task.md b/RenamingCode/RenameRefactoringInIDE/FixTyposPractice/task.md similarity index 100% rename from RenamingCode/RenameRefactoringInIDE/FixTypos/task.md rename to RenamingCode/RenameRefactoringInIDE/FixTyposPractice/task.md diff --git a/RenamingCode/RenameRefactoringInIDE/FixTypos/test/StudentTestClass.kt b/RenamingCode/RenameRefactoringInIDE/FixTyposPractice/test/StudentTestClass.kt similarity index 100% rename from RenamingCode/RenameRefactoringInIDE/FixTypos/test/StudentTestClass.kt rename to RenamingCode/RenameRefactoringInIDE/FixTyposPractice/test/StudentTestClass.kt diff --git a/RenamingCode/RenameRefactoringInIDE/FixTypos/test/Tests.kt b/RenamingCode/RenameRefactoringInIDE/FixTyposPractice/test/Tests.kt similarity index 97% rename from RenamingCode/RenameRefactoringInIDE/FixTypos/test/Tests.kt rename to RenamingCode/RenameRefactoringInIDE/FixTyposPractice/test/Tests.kt index aee07ff..9263c4a 100644 --- a/RenamingCode/RenameRefactoringInIDE/FixTypos/test/Tests.kt +++ b/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 diff --git a/RenamingCode/RenameRefactoringInIDE/lesson-info.yaml b/RenamingCode/RenameRefactoringInIDE/lesson-info.yaml index 5cede4f..bd08431 100644 --- a/RenamingCode/RenameRefactoringInIDE/lesson-info.yaml +++ b/RenamingCode/RenameRefactoringInIDE/lesson-info.yaml @@ -1,5 +1,5 @@ custom_name: Rename refactoring in IDE content: -- RenameRefactoringInIDE -- Quiz -- FixTypos + - RenameRefactoringInIDE + - Quiz + - FixTyposPractice diff --git a/build.gradle.kts b/build.gradle.kts index f187a87..4f425a5 100644 --- a/build.gradle.kts +++ b/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") } diff --git a/settings.gradle.kts b/settings.gradle.kts index e973d60..68e267e 100644 --- a/settings.gradle.kts +++ b/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") } }