Merge commit 'refs/changes/68/168/2' of git://egit.eclipse.org/egit

Conflicts:
	org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java

3 files changed, 60 insertions, 13 deletions

diff --git a/org.eclipse.egit.core.test/.gitignore b/org.eclipse.egit.core.test/.gitignore
index 5e56e040ec..c87594b161 100644
--- a/org.eclipse.egit.core.test/.gitignore
+++ b/org.eclipse.egit.core.test/.gitignore
@@ -1 +1,2 @@
 /bin
+target
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
new file mode 100644
index 0000000000..c86b70feae
--- /dev/null
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v1.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.egit</groupId>
+    <artifactId>egit-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.egit.core.test</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <name>Test Plug-in (Incubation)</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jgit</groupId>
+      <artifactId>org.eclipse.jgit</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <resolver>p2</resolver>
+          <pomDependencies>consider</pomDependencies>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.tycho</groupId>
+        <artifactId>maven-osgi-test-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <excludes>
+            <!-- test mojo matches TestProject be default and treats it as PojoTest -->
+            <exclude>**/Test*.class</exclude>
+          </excludes>
+          <useUIHarness>true</useUIHarness>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java
index 4ed4bdc324..f876085cc4 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java
@@ -10,14 +10,10 @@ package org.eclipse.egit.core.test;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collection;
 
 import junit.framework.TestCase;
 
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.egit.core.project.RepositoryFinder;
-import org.eclipse.egit.core.project.RepositoryMapping;
 import org.eclipse.jgit.junit.MockSystemReader;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.util.SystemReader;
@@ -35,7 +31,6 @@ public abstract class GitTestCase extends TestCase {
 						.getWorkspace().getRoot().getLocation().toFile()
 						.getAbsoluteFile().toString());
 		project = new TestProject(true);
-		checkNotNested();
 		gitDir = new File(project.getProject().getWorkspace().getRoot()
 				.getRawLocation().toFile(), ".git");
 		rmrf(gitDir);
@@ -65,12 +60,4 @@ public abstract class GitTestCase extends TestCase {
 		assert !d.exists();
 	}
 
-	protected void checkNotNested() throws CoreException {
-		final Collection<RepositoryMapping> parentRepositories = new RepositoryFinder(
-				project.getProject()).find(null);
-		final int numOfRepositories = parentRepositories.size();
-		assertTrue("parent repository found: " + parentRepositories.toString(),
-				numOfRepositories == 0);
-	}
-
 }