Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg2009-12-30 15:44:01 +0000
committerRobin Rosenberg2009-12-30 15:44:01 +0000
commit3368871375619a4da06cafb2131b1d14996a8234 (patch)
tree7b001cd704be7e4a79652c0e9bf0f61e63709916 /org.eclipse.egit.core.test
parentd8b69fa7481c85682aa017b31656eacdf4573cfe (diff)
parentc14a017aff2bd4ff8ed9ded4daf6f72d542c756c (diff)
downloadegit-3368871375619a4da06cafb2131b1d14996a8234.tar.gz
egit-3368871375619a4da06cafb2131b1d14996a8234.tar.xz
egit-3368871375619a4da06cafb2131b1d14996a8234.zip
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
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/.gitignore1
-rw-r--r--org.eclipse.egit.core.test/pom.xml59
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java13
3 files changed, 60 insertions, 13 deletions
diff --git a/org.eclipse.egit.core.test/.gitignore b/org.eclipse.egit.core.test/.gitignore
index 5e56e040e..c87594b16 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 000000000..c86b70fea
--- /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 4ed4bdc32..f876085cc 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);
- }
-
}

Back to the top