From c00c4900db84a4601265cf92d8cd108afb19cbe7 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 12 Aug 2015 21:16:40 -0700
Subject: [PATCH] junit/testng configuration ui: ensure correct document is
 updated (IDEA-143334)

---
 .../junit2/configuration/JUnitConfigurable.java       | 11 ++++++-----
 .../configuration/TestNGConfigurationEditor.java      | 11 +++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
index 5f5ff0527ebf..4512a7ce0851 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
@@ -398,27 +398,28 @@ public class JUnitConfigurable<T extends JUnitConfiguration> extends SettingsEdi
       final LabeledComponent testLocation = getTestLocation(i);
       final JComponent component = testLocation.getComponent();
       final ComponentWithBrowseButton field;
-      final Object document;
+      Object document;
       if (component instanceof TextFieldWithBrowseButton) {
         field = (TextFieldWithBrowseButton)component;
         document = new PlainDocument();
         ((TextFieldWithBrowseButton)field).getTextField().setDocument((Document)document);
-        myModel.setJUnitDocument(i, document);
       } else if (component instanceof EditorTextFieldWithBrowseButton) {
         field = (ComponentWithBrowseButton)component;
         document = ((EditorTextField)field.getChildComponent()).getDocument();
-        myModel.setJUnitDocument(i, document);
       }
       else {
         field = myPatternTextField;
         document = new PlainDocument();
         ((TextFieldWithBrowseButton)field).getTextField().setDocument((Document)document);
-        myModel.setJUnitDocument(i, document);
+        
       }
       myBrowsers[i].setField(field);
       if (myBrowsers[i] instanceof MethodBrowser) {
-        ((MethodBrowser)myBrowsers[i]).installCompletion((EditorTextField)field.getChildComponent());
+        final EditorTextField childComponent = (EditorTextField)field.getChildComponent();
+        ((MethodBrowser)myBrowsers[i]).installCompletion(childComponent);
+        document = childComponent.getDocument();
       }
+      myModel.setJUnitDocument(i, document);
     }
   }
 
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
index afaa0e8f6225..f8fe6a20d837 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
@@ -197,22 +197,21 @@ public class TestNGConfigurationEditor extends SettingsEditor<TestNGConfiguratio
         ((TextFieldWithBrowseButton)field).getTextField().setDocument((PlainDocument)document);
       }
       else if (field instanceof EditorTextFieldWithBrowseButton) {
-        final com.intellij.openapi.editor.Document componentDocument =
-          ((EditorTextFieldWithBrowseButton)field).getChildComponent().getDocument();
-        
-        model.setDocument(i, componentDocument);
+        document = ((EditorTextFieldWithBrowseButton)field).getChildComponent().getDocument();
       }
       else {
         field = myPatternTextField;
         document = new PlainDocument();
         ((TextFieldWithBrowseButton)field).getTextField().setDocument((Document)document);
-        model.setDocument(i, document);
       }
 
       browseListeners[i].setField((ComponentWithBrowseButton)field);
       if (browseListeners[i] instanceof MethodBrowser) {
-        ((MethodBrowser)browseListeners[i]).installCompletion((EditorTextField)((ComponentWithBrowseButton)field).getChildComponent());
+        final EditorTextField childComponent = (EditorTextField)((ComponentWithBrowseButton)field).getChildComponent();
+        ((MethodBrowser)browseListeners[i]).installCompletion(childComponent);
+        document = childComponent.getDocument();
       }
+      model.setDocument(i, document);
     }
     model.setType(TestType.CLASS);
     propertiesFile.getComponent().getTextField().setDocument(model.getPropertiesFileDocument());