From 54d452e7aac32ac8162b9eb5022b9850b155d436 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Fri, 4 Jan 2013 00:20:53 +0400
Subject: [PATCH] Fix maven test

---
 ...est.java => MavenJGitBuildNumberTest.java} | 55 +++++++++++--------
 1 file changed, 32 insertions(+), 23 deletions(-)
 rename plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/jgitBuildnumber/{JGitBuildNumberTest.java => MavenJGitBuildNumberTest.java} (67%)

diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/jgitBuildnumber/JGitBuildNumberTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/jgitBuildnumber/MavenJGitBuildNumberTest.java
similarity index 67%
rename from plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/jgitBuildnumber/JGitBuildNumberTest.java
rename to plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/jgitBuildnumber/MavenJGitBuildNumberTest.java
index 8ed34f3de824..837f0c5527b6 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/jgitBuildnumber/JGitBuildNumberTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/jgitBuildnumber/MavenJGitBuildNumberTest.java
@@ -1,5 +1,6 @@
 package org.jetbrains.idea.maven.plugins.jgitBuildnumber;
 
+import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.idea.maven.dom.MavenDomTestCase;
 
 import java.io.IOException;
@@ -8,7 +9,7 @@ import java.util.List;
 /**
  * @author Sergey Evdokimov
  */
-public class JGitBuildNumberTest extends MavenDomTestCase {
+public class MavenJGitBuildNumberTest extends MavenDomTestCase {
 
   public void testCompletion() throws Exception {
     importProject("<groupId>test</groupId>\n" +
@@ -49,13 +50,26 @@ public class JGitBuildNumberTest extends MavenDomTestCase {
   }
 
   public void testHighlighting() throws Exception {
+    createModulePom("m", "<artifactId>m</artifactId>\n" +
+                         "<version>1</version>\n" +
+                         "<parent>\n" +
+                         "  <groupId>test</groupId>\n" +
+                         "  <artifactId>project</artifactId>\n" +
+                         "  <version>1</version>\n" +
+                         "</parent>\n" +
+                         "<properties>\n" +
+                         "  <aaa>${git.commitsCount}</aaa>\n" +
+                         "  <bbb>${git.commitsCount__}</bbb>\n" +
+                         "</properties>\n");
+
     importProject("<groupId>test</groupId>\n" +
                   "<artifactId>project</artifactId>\n" +
                   "<version>1</version>\n" +
-                  "<properties>\n" +
-                  "  <aaa>${git.commitsCount}</aaa>" +
-                  "  <bbb>${git.commitsCount__}</bbb>" +
-                  "</properties>\n" +
+                  "<packaging>pom</packaging>\n" +
+                  "<modules>\n" +
+                  "  <module>m</module>\n" +
+                  "</modules>\n" +
+
                   "    <build>\n" +
                   "        <plugins>\n" +
                   "            <plugin>\n" +
@@ -64,26 +78,21 @@ public class JGitBuildNumberTest extends MavenDomTestCase {
                   "            </plugin>\n" +
                   "        </plugins>\n" +
                   "    </build>\n"
-       );
-
-    createProjectPom("<groupId>test</groupId>\n" +
-                     "<artifactId>project</artifactId>\n" +
-                     "<version>1</version>\n" +
-                     "<properties>\n" +
-                     "  <aaa>${git.commitsCount}</aaa>" +
-                     "  <bbb>${<error>git.commitsCount__</error>}</bbb>" +
-                     "</properties>\n" +
-                     "    <build>\n" +
-                     "        <plugins>\n" +
-                     "            <plugin>\n" +
-                     "                <groupId>ru.concerteza.buildnumber</groupId>\n" +
-                     "                <artifactId>maven-jgit-buildnumber-plugin</artifactId>\n" +
-                     "            </plugin>\n" +
-                     "        </plugins>\n" +
-                     "    </build>\n"
     );
 
-    checkHighlighting(myProjectPom);
+    VirtualFile pom = createModulePom("m", "<artifactId>m</artifactId>\n" +
+                         "<version>1</version>\n" +
+                         "<parent>\n" +
+                         "  <groupId>test</groupId>\n" +
+                         "  <artifactId>project</artifactId>\n" +
+                         "  <version>1</version>\n" +
+                         "</parent>\n" +
+                         "<properties>\n" +
+                         "  <aaa>${git.commitsCount}</aaa>\n" +
+                         "  <bbb>${<error>git.commitsCount__</error>}</bbb>\n" +
+                         "</properties>\n");
+
+    checkHighlighting(pom, true, false, true);
   }
 
   public void testNoPluginHighlighting() throws Exception {