Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.hyperskill.academy.cpp.checker

import com.intellij.execution.configurations.ConfigurationFactory
import com.intellij.openapi.project.Project
import com.jetbrains.cidr.execution.testing.tcatch.CidrCatchTestRunConfigurationType
import org.hyperskill.academy.cpp.CppCatchCourseBuilder
import org.hyperskill.academy.cpp.CppConfigurator
import org.hyperskill.academy.cpp.CppProjectSettings
Expand All @@ -20,7 +19,7 @@ class CppCatchConfigurator : CppConfigurator() {
override fun getEduTaskChecker(task: EduTask, project: Project): TaskChecker<EduTask> =
object : CppEduTaskChecker(task, envChecker, project) {
override fun getFactory(): ConfigurationFactory =
CidrCatchTestRunConfigurationType.getInstance().getFactory()
getTestConfigurationFactory(CATCH_TEST_CONFIGURATION_TYPE_ID)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.hyperskill.academy.cpp.checker

import com.intellij.execution.configurations.ConfigurationFactory
import com.intellij.openapi.project.Project
import com.jetbrains.cidr.execution.testing.google.CidrGoogleTestRunConfigurationType
import org.hyperskill.academy.cpp.CppConfigurator
import org.hyperskill.academy.cpp.CppGTestCourseBuilder
import org.hyperskill.academy.cpp.CppProjectSettings
Expand All @@ -20,7 +19,7 @@ class CppGTestConfigurator : CppConfigurator() {
override fun getEduTaskChecker(task: EduTask, project: Project): TaskChecker<EduTask> =
object : CppEduTaskChecker(task, envChecker, project) {
override fun getFactory(): ConfigurationFactory =
CidrGoogleTestRunConfigurationType.getInstance().getFactory()
getTestConfigurationFactory(GOOGLE_TEST_CONFIGURATION_TYPE_ID)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.hyperskill.academy.cpp.checker

import com.intellij.execution.configurations.ConfigurationFactory
import com.intellij.openapi.project.Project
import com.jetbrains.cidr.execution.testing.tcatch.CidrCatchTestRunConfigurationType
import org.hyperskill.academy.cpp.CppCatchCourseBuilder
import org.hyperskill.academy.cpp.CppConfigurator
import org.hyperskill.academy.cpp.CppProjectSettings
Expand All @@ -20,7 +19,7 @@ class CppCatchConfigurator : CppConfigurator() {
override fun getEduTaskChecker(task: EduTask, project: Project): TaskChecker<EduTask> =
object : CppEduTaskChecker(task, envChecker, project) {
override fun getFactory(): ConfigurationFactory =
CidrCatchTestRunConfigurationType.getInstance().getFactory()
getTestConfigurationFactory(CATCH_TEST_CONFIGURATION_TYPE_ID)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.hyperskill.academy.cpp.checker

import com.intellij.execution.configurations.ConfigurationFactory
import com.intellij.openapi.project.Project
import com.jetbrains.cidr.execution.testing.google.CidrGoogleTestRunConfigurationType
import org.hyperskill.academy.cpp.CppConfigurator
import org.hyperskill.academy.cpp.CppGTestCourseBuilder
import org.hyperskill.academy.cpp.CppProjectSettings
Expand All @@ -20,7 +19,7 @@ class CppGTestConfigurator : CppConfigurator() {
override fun getEduTaskChecker(task: EduTask, project: Project): TaskChecker<EduTask> =
object : CppEduTaskChecker(task, envChecker, project) {
override fun getFactory(): ConfigurationFactory =
CidrGoogleTestRunConfigurationType.getInstance().getFactory()
getTestConfigurationFactory(GOOGLE_TEST_CONFIGURATION_TYPE_ID)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package org.hyperskill.academy.cpp.checker

import com.intellij.execution.configurations.ConfigurationFactory
import com.intellij.execution.configurations.ConfigurationTypeUtil

internal const val GOOGLE_TEST_CONFIGURATION_TYPE_ID = "CMakeGoogleTestRunConfigurationType"
internal const val CATCH_TEST_CONFIGURATION_TYPE_ID = "CMakeCatchTestRunConfigurationType"

internal fun getTestConfigurationFactory(configurationTypeId: String): ConfigurationFactory =
ConfigurationTypeUtil.findConfigurationType(configurationTypeId)
?.configurationFactories
?.singleOrNull()
?: error("Cannot find a single run configuration factory for '$configurationTypeId'")
Loading