From ce9461d7b7cedb2b663a0ee214a50fef4776849d Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 13 Dec 2017 14:13:00 +0100
Subject: [PATCH] do not call readModule explicitly

---
 .../application/ApplicationConfiguration.java         |  1 -
 .../execution/remote/RemoteConfiguration.java         |  1 -
 .../configurations/ModuleBasedConfiguration.java      |  2 +-
 .../plugins/groovy/mvc/MvcRunConfiguration.java       |  1 -
 .../groovy/runner/GroovyScriptRunConfiguration.java   |  1 -
 .../intellij/execution/junit/JUnitConfiguration.java  |  1 -
 .../testng/configuration/TestNGConfiguration.java     |  5 +----
 .../testng/model/TestNGTestObject.java                | 11 +++++++----
 python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java |  8 +++++---
 9 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index 7b5d3506feee..399477b67a78 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -242,7 +242,6 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     super.readExternal(element);
     JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
     DefaultJDOMExternalizer.readExternal(this, element);
-    readModule(element);
     EnvironmentVariablesComponent.readExternal(element, getEnvs());
     setShortenCommandLine(ShortenCommandLine.readShortenClasspathMethod(element));
   }
diff --git a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
index 4c28fad2ce8c..bb204e0eb895 100644
--- a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
@@ -45,7 +45,6 @@ public class RemoteConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
   @Override
   public void readExternal(@NotNull final Element element) throws InvalidDataException {
     super.readExternal(element);
-    readModule(element);
     DefaultJDOMExternalizer.readExternal(this, element);
   }
 
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
index a70eebe16efb..b830d5bffc40 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
@@ -72,7 +72,7 @@ public abstract class ModuleBasedConfiguration<ConfigurationModule extends RunCo
     getConfigurationModule().setModuleName(moduleName);
   }
 
-  protected void readModule(final Element element) {
+  protected void readModule(@NotNull Element element) {
     getConfigurationModule().readExternal(element);
   }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java
index 6a776729d878..0810818e3521 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java
@@ -152,7 +152,6 @@ public abstract class MvcRunConfiguration extends ModuleBasedConfiguration<RunCo
   @Override
   public void readExternal(@NotNull Element element) throws InvalidDataException {
     super.readExternal(element);
-    readModule(element);
     vmParams = JDOMExternalizer.readString(element, "vmparams");
     cmdLine = JDOMExternalizer.readString(element, "cmdLine");
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
index 55337888a944..513e485db71a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
@@ -125,7 +125,6 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
   @Override
   public void readExternal(@NotNull Element element) {
     super.readExternal(element);
-    readModule(element);
     scriptPath = ExternalizablePath.localPathValue(JDOMExternalizer.readString(element, "path"));
     vmParams = JDOMExternalizer.readString(element, "vmparams");
     scriptParams = JDOMExternalizer.readString(element, "params");
diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
index 5484859f26aa..9de8d5437b44 100644
--- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
@@ -361,7 +361,6 @@ public class JUnitConfiguration extends JavaTestConfigurationBase {
   public void readExternal(@NotNull final Element element) throws InvalidDataException {
     super.readExternal(element);
     JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
-    readModule(element);
     DefaultJDOMExternalizer.readExternal(this, element);
     DefaultJDOMExternalizer.readExternal(getPersistentData(), element);
     EnvironmentVariablesComponent.readExternal(element, getPersistentData().getEnvs());
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
index e3900923cb53..a54ddb24dbb9 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
@@ -285,9 +285,7 @@ public class TestNGConfiguration extends JavaTestConfigurationBase {
   @Override
   public void checkConfiguration() throws RuntimeConfigurationException {
     final TestNGTestObject testObject = TestNGTestObject.fromConfig(this);
-    if (testObject != null) {
-      testObject.checkConfiguration();
-    }
+    testObject.checkConfiguration();
     JavaRunConfigurationExtensionManager.checkConfigurationIsValid(this);
     ProgramParametersUtil.checkWorkingDirectoryExist(this, getProject(), getConfigurationModule().getModule());
     JavaParametersUtil.checkAlternativeJRE(this);
@@ -298,7 +296,6 @@ public class TestNGConfiguration extends JavaTestConfigurationBase {
   public void readExternal(@NotNull Element element) {
     super.readExternal(element);
     JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
-    readModule(element);
     DefaultJDOMExternalizer.readExternal(this, element);
     DefaultJDOMExternalizer.readExternal(getPersistantData(), element);
     EnvironmentVariablesComponent.readExternal(element, getPersistantData().getEnvs());
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestObject.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestObject.java
index e259daf3e081..1b55c6928671 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestObject.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestObject.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package com.theoryinpractice.testng.model;
 
 import com.intellij.codeInsight.AnnotationUtil;
@@ -36,7 +38,8 @@ public abstract class TestNGTestObject {
     myConfig = config;
   }
 
-  public static TestNGTestObject fromConfig(TestNGConfiguration config) {
+  @NotNull
+  public static TestNGTestObject fromConfig(@NotNull TestNGConfiguration config) {
     final String testObject = config.getPersistantData().TEST_OBJECT;
     if (testObject.equals(TestType.PACKAGE.getType())) {
       return new TestNGTestPackage(config);
@@ -283,7 +286,7 @@ public abstract class TestNGTestObject {
     }
 
     @Override
-    public void fillTestObjects(Map<PsiClass, Map<PsiMethod, List<String>>> classes) throws CantRunException {}
+    public void fillTestObjects(Map<PsiClass, Map<PsiMethod, List<String>>> classes) {}
 
     @Override
     public String getGeneratedName() {
@@ -296,6 +299,6 @@ public abstract class TestNGTestObject {
     }
 
     @Override
-    public void checkConfiguration() throws RuntimeConfigurationException {}
+    public void checkConfiguration() {}
   }
 }
diff --git a/python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java b/python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java
index 883e09f271c2..bbd6756e3ad0 100644
--- a/python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java
+++ b/python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java
@@ -1,8 +1,10 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package com.jetbrains.env;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.intellij.openapi.application.TransactionGuard;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.vfs.VfsUtil;
@@ -77,8 +79,8 @@ public class PyEnvTaskRunner {
         }
         final Sdk sdk = createSdkByExecutable(executable);
 
-        /**
-         * Skipping test if {@link PyTestTask} reports it does not support this language level
+        /*
+          Skipping test if {@link PyTestTask} reports it does not support this language level
          */
         final LanguageLevel languageLevel = PythonSdkType.getLanguageLevelForSdk(sdk);
         if (testTask.isLanguageLevelSupported(languageLevel)) {