Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2009-12-01 19:01:13 +0000
committerIgor Fedorenko2009-12-19 21:24:08 +0000
commit10564f315f2e755302c24af4064281e2ed0f2711 (patch)
treeed92bf4cf30a70382bbe1a32b6f6f119854736af /org.eclipse.egit.core.test
parent9fd991fcc6c8cde8eda431cfd8a87fa7ff0637f6 (diff)
downloadegit-10564f315f2e755302c24af4064281e2ed0f2711.tar.gz
egit-10564f315f2e755302c24af4064281e2ed0f2711.tar.xz
egit-10564f315f2e755302c24af4064281e2ed0f2711.zip
Flipped EGit to manifest-first maven-3/tycho build
New org.sonatype.tycho groupId https://issues.sonatype.org/browse/TYCHO-312 Workaround for https://issues.sonatype.org/browse/TYCHO-168 Removed checkNotNested. Conventional maven project layout results in the following repository nesting parallelip-egit <= egit source tree root /.git /org.eclipse.egit.core.test /target /work /data <= test workspace /.git /.metadata /Project-1 Disable checkNotNested as a short term solution, but in the long term we need to reintroduce this check with mechanisms like Git's GIT_CEILING_DIRECTORIES to make sure it does not produce false positive during maven build. Change-Id: Idec24de111aa21a022654c443376e42ae6caa7cc Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/pom.xml43
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitTestCase.java13
2 files changed, 43 insertions, 13 deletions
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
new file mode 100644
index 000000000..6371a75ac
--- /dev/null
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -0,0 +1,43 @@
+<?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>
+
+ <build>
+ <plugins>
+ <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 81845f9c1..49b6e36ae 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,11 +10,6 @@ package org.eclipse.egit.core.test;
import java.io.File;
import java.io.IOException;
-import java.util.Collection;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.egit.core.project.RepositoryFinder;
-import org.eclipse.egit.core.project.RepositoryMapping;
import junit.framework.TestCase;
@@ -27,7 +22,6 @@ public abstract class GitTestCase extends TestCase {
protected void setUp() throws Exception {
super.setUp();
project = new TestProject(true);
- checkNotNested();
gitDir = new File(project.getProject().getWorkspace().getRoot()
.getRawLocation().toFile(), ".git");
rmrf(gitDir);
@@ -57,11 +51,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", numOfRepositories == 0);
- }
-
}

Back to the top