From eb5cf8ebffa6a363aca2a205d3d304aab9b336a2 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Tue, 31 Jan 2012 18:07:54 +0400 Subject: [PATCH] IDEA-76142: Gradle support - cannot update IDEA projects once one of build.gradle files changes 1. Explicit method call syntax is applied (server compilation fails otherwise); 2. Comments are added; --- .../sync/GradleProjectStructureChangesModelTest.groovy | 5 +++++ .../plugins/gradle/testutil/ProjectStructureChecker.groovy | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy index b806804cff60..efb25809b82f 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy @@ -55,6 +55,7 @@ public class GradleProjectStructureChangesModelTest { @Test public void mergeGradleLocalToIntellij() { + // Configure initial projects state. init( gradle { module { @@ -70,6 +71,7 @@ public class GradleProjectStructureChangesModelTest { } } } ) + // Check that the initial projects state is correctly parsed. checkChanges { presence { lib(gradle: gradle.modules.dependencies.flatten().findAll { it.name == "lib2" }) @@ -82,11 +84,14 @@ public class GradleProjectStructureChangesModelTest { lib2('gradle') } } } } + // Define changed project state. gradle { module { dependencies { lib(name: "lib1") } } } + + // Apply the changed project state and check if it's correctly parsed. changesModel.update(gradle.project) assertEquals([].toSet(), changesModel.changes) checkTree { diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ProjectStructureChecker.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ProjectStructureChecker.groovy index efecadcf7563..88decefa8a00 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ProjectStructureChecker.groovy +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ProjectStructureChecker.groovy @@ -38,7 +38,7 @@ class ProjectStructureChecker { check it as Node, actual.getChildAt(childIndex++) as DefaultMutableTreeNode } if (childIndex < actual.childCount) { - fail("Unexpected nodes detected: ${(childIndex..