From 5a0bb8fef59f91c1b2dc1be1a92201ab798ef38e Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Fri, 16 Jul 2010 13:16:42 +0400
Subject: [PATCH] test fixed

---
 .../FrameworkSupportNode.java                 |  2 +-
 .../FrameworkSupportProviderTestCase.java     | 36 ++++++++++++-------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportNode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportNode.java
index f66d36a9849c..351b992ec178 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportNode.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportNode.java
@@ -52,7 +52,7 @@ public class FrameworkSupportNode extends CheckedTreeNode {
   private final Computable<String> myBaseDirForLibrariesGetter;
   private LibraryCompositionOptionsPanel myLibraryCompositionOptionsPanel;
 
-  FrameworkSupportNode(final FrameworkSupportProvider provider, final FrameworkSupportNode parentNode, final FrameworkSupportModelImpl model,
+  public FrameworkSupportNode(final FrameworkSupportProvider provider, final FrameworkSupportNode parentNode, final FrameworkSupportModelImpl model,
                              Computable<String> baseDirForLibrariesGetter, Disposable parentDisposable) {
     super(provider);
     myBaseDirForLibrariesGetter = baseDirForLibrariesGetter;
diff --git a/java/java-tests/testSrc/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderTestCase.java b/java/java-tests/testSrc/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderTestCase.java
index c629c139c67d..eb63696cd21a 100644
--- a/java/java-tests/testSrc/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderTestCase.java
+++ b/java/java-tests/testSrc/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderTestCase.java
@@ -4,6 +4,7 @@ import com.intellij.facet.Facet;
 import com.intellij.facet.FacetManager;
 import com.intellij.facet.FacetTypeId;
 import com.intellij.facet.ui.FacetBasedFrameworkSupportProvider;
+import com.intellij.ide.util.newProjectWizard.FrameworkSupportNode;
 import com.intellij.ide.util.newProjectWizard.impl.FrameworkSupportCommunicator;
 import com.intellij.ide.util.newProjectWizard.impl.FrameworkSupportModelImpl;
 import com.intellij.openapi.roots.ModifiableRootModel;
@@ -21,32 +22,43 @@ import java.util.*;
  * @author nik
  */
 public abstract class FrameworkSupportProviderTestCase extends IdeaTestCase {
-  private FrameworkSupportModel myFrameworkSupportModel;
+  private FrameworkSupportModelImpl myFrameworkSupportModel;
   private Map<FrameworkSupportProvider, FrameworkSupportConfigurable> myConfigurables;
-  private Set<FrameworkSupportProvider> mySelected;
+  private Map<FrameworkSupportProvider, FrameworkSupportNode> myNodes;
 
   @Override
   protected void setUp() throws Exception {
     super.setUp();
     myFrameworkSupportModel = new FrameworkSupportModelImpl(getProject(), null);
+    myNodes = new HashMap<FrameworkSupportProvider, FrameworkSupportNode>();
+    for (FrameworkSupportProvider provider : FrameworkSupportProvider.EXTENSION_POINT.getExtensions()) {
+      final FrameworkSupportNode node = new FrameworkSupportNode(provider, null, myFrameworkSupportModel, null, getTestRootDisposable());
+      myNodes.put(provider, node);
+      myFrameworkSupportModel.registerComponent(provider, node);
+    }
     myConfigurables = new HashMap<FrameworkSupportProvider, FrameworkSupportConfigurable>();
-    mySelected = new HashSet<FrameworkSupportProvider>();
   }
 
   protected void addSupport() throws IOException {
     final VirtualFile root = getVirtualFile(createTempDir("contentRoot"));
     PsiTestUtil.addContentRoot(myModule, root);
     final ModifiableRootModel model = ModuleRootManager.getInstance(myModule).getModifiableModel();
-    List<FrameworkSupportConfigurable> selectedConfigurables = new ArrayList<FrameworkSupportConfigurable>();
-    for (FrameworkSupportProvider provider : mySelected) {
-      final FrameworkSupportConfigurable configurable = myConfigurables.get(provider);
-      configurable.addSupport(myModule, model, null);
-      selectedConfigurables.add(configurable);
+    try {
+      List<FrameworkSupportConfigurable> selectedConfigurables = new ArrayList<FrameworkSupportConfigurable>();
+      for (FrameworkSupportNode node : myNodes.values()) {
+        if (node.isChecked()) {
+          final FrameworkSupportConfigurable configurable = getOrCreateConfigurable(node.getProvider());
+          configurable.addSupport(myModule, model, null);
+          selectedConfigurables.add(configurable);
+        }
+      }
+      for (FrameworkSupportCommunicator communicator : FrameworkSupportCommunicator.EP_NAME.getExtensions()) {
+        communicator.onFrameworkSupportAdded(myModule, model, selectedConfigurables, myFrameworkSupportModel);
+      }
     }
-    for (FrameworkSupportCommunicator communicator : FrameworkSupportCommunicator.EP_NAME.getExtensions()) {
-      communicator.onFrameworkSupportAdded(myModule, model, selectedConfigurables, myFrameworkSupportModel);
+    finally {
+      model.commit();
     }
-    model.commit();
     for (FrameworkSupportConfigurable configurable : myConfigurables.values()) {
       Disposer.dispose(configurable);
     }
@@ -68,8 +80,8 @@ public abstract class FrameworkSupportProviderTestCase extends IdeaTestCase {
 
   protected FrameworkSupportConfigurable selectFramework(@NotNull FrameworkSupportProvider provider) {
     final FrameworkSupportConfigurable configurable = getOrCreateConfigurable(provider);
+    myNodes.get(provider).setChecked(true);
     configurable.onFrameworkSelectionChanged(true);
-    mySelected.add(provider);
     return configurable;
   }