From 7cc8b407226943fb5b169b3bb201633cfaaf2bb3 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 28 Dec 2017 18:03:04 +0100
Subject: [PATCH] =?UTF-8?q?RemoteConfiguration=20=E2=80=94=20move=20defaul?=
 =?UTF-8?q?t=20state=20to=20class=20from=20RunManager=20component?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../execution/remote/RemoteConfiguration.java |  8 ++++----
 .../configuration/TestNGConfiguration.java    |  4 ++--
 .../testng/model/TestData.java                | 19 ++-----------------
 resources/src/idea/RunManager.xml             | 15 ---------------
 4 files changed, 8 insertions(+), 38 deletions(-)

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 8a3ecca2679a..937c860e8ad0 100644
--- a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
@@ -43,11 +43,11 @@ public class RemoteConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
     DefaultJDOMExternalizer.readExternal(this, element);
   }
 
-  public boolean USE_SOCKET_TRANSPORT;
+  public boolean USE_SOCKET_TRANSPORT = true;
   public boolean SERVER_MODE;
-  public String SHMEM_ADDRESS;
-  public String HOST;
-  public String PORT;
+  public String SHMEM_ADDRESS = "javadebug";
+  public String HOST = "localhost";
+  public String PORT = "5005";
 
   public RemoteConfiguration(final Project project, ConfigurationFactory configurationFactory) {
     super(new JavaRunConfigurationModule(project, true), configurationFactory);
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
index 5d4fec3a4cbd..e5a86665b86b 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
@@ -44,7 +44,7 @@ public class TestNGConfiguration extends JavaTestConfigurationBase {
   @NonNls private static final String PATTERNS_EL_NAME = "patterns";
   @NonNls private static final String PATTERN_EL_NAME = "pattern";
   @NonNls private static final String TEST_CLASS_ATT_NAME = "testClass";
-  
+
   //private TestNGResultsContainer resultsContainer;
   protected TestData data;
   protected transient Project project;
@@ -155,7 +155,7 @@ public class TestNGConfiguration extends JavaTestConfigurationBase {
   }
 
   public String getWorkingDirectory() {
-    return data.getWorkingDirectory(project);
+    return data.getWorkingDirectory();
   }
 
   public void setEnvs(@NotNull Map<String, String> envs) {
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
index 69c385e0d6f8..fec5c3d91181 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
@@ -1,17 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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;
 
@@ -22,7 +10,6 @@ import com.intellij.execution.junit.JUnitUtil;
 import com.intellij.execution.junit2.info.MethodLocation;
 import com.intellij.execution.testframework.TestSearchScope;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMethod;
@@ -45,9 +32,7 @@ public class TestData implements Cloneable
   public String PARAMETERS;
   public String WORKING_DIRECTORY;
   public String OUTPUT_DIRECTORY;
-  public String ANNOTATION_TYPE;
 
-  public String ENV_VARIABLES;
   private Map<String, String> ENVS = new LinkedHashMap<>();
   public boolean PASS_PARENT_ENVS = true;
 
@@ -116,7 +101,7 @@ public class TestData implements Cloneable
     WORKING_DIRECTORY = ExternalizablePath.urlValue(value);
   }
 
-  public String getWorkingDirectory(Project project) {
+  public String getWorkingDirectory() {
     return ExternalizablePath.localPathValue(WORKING_DIRECTORY);
   }
 
diff --git a/resources/src/idea/RunManager.xml b/resources/src/idea/RunManager.xml
index 0b9a357c3e7d..51a4ca67cf1c 100644
--- a/resources/src/idea/RunManager.xml
+++ b/resources/src/idea/RunManager.xml
@@ -1,33 +1,18 @@
 <component>
   <option name="SHOW_SETTINGS_BEFORE_RUNNING" value="true" />
   <option name="COMPILE_BEFORE_RUNNING" value="true" />
-  <activeType name="Application" />
 
   <configuration name="&lt;template&gt;" type="Application" default="true" selected="false">
-    <option name="MAIN_CLASS_NAME" />
-    <option name="VM_PARAMETERS" />
-    <option name="PROGRAM_PARAMETERS" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
   </configuration>
 
   <configuration name="&lt;template&gt;" type="JUnit" default="true" selected="false">
-    <option name="MAIN_CLASS_NAME" />
     <option name="VM_PARAMETERS" value="-ea"/>
-    <option name="PARAMETERS" />
     <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
   </configuration>
 
   <configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
-    <option name="MAIN_CLASS_NAME"/>
     <option name="VM_PARAMETERS" value="-ea"/>
-    <option name="PARAMETERS"/>
     <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%"/>
   </configuration>
-
-  <configuration name="&lt;template&gt;" type="Remote" default="true" selected="false">
-    <option name="USE_SOCKET_TRANSPORT" value="true" />
-    <option name="SHMEM_ADDRESS" value="javadebug" />
-    <option name="HOST" value="localhost" />
-    <option name="PORT" value="5005" />
-  </configuration>
 </component>