Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce2010-02-11 23:57:21 +0000
committerMatthias Sohn2010-02-14 02:57:10 +0000
commit058456865a75ff36d85d63105650d3897ee21105 (patch)
treef2ae32126b33536d083dbf70532e7cea5cd153bd /org.eclipse.egit.core.test
parentf701560d6f08edbf55a3afad2765400ecf1753ba (diff)
downloadegit-058456865a75ff36d85d63105650d3897ee21105.tar.gz
egit-058456865a75ff36d85d63105650d3897ee21105.tar.xz
egit-058456865a75ff36d85d63105650d3897ee21105.zip
Fix build and test failures
- Correcting versions. [ms: - Correcting wrong version for org.eclipse.core.filesystem to [1.1,2.0) - "Require-Bundle:" needs to use "bundle-version:" to specify version. - Manifest refered to JUnit 4 but test execution specified JUnit 3. - Fix tests which have been broken by the change 667f571b "Fix enabling team operations on project import." - Split packages between org.eclipse.egit.core and org.eclipse.egit.core.test caused ClassNotFoundException in test execution hence moving test packages. ] Change-Id: Ic76335ecb34daa76431b3d7daae566d97a7413f0 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/META-INF/MANIFEST.MF12
-rw-r--r--org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch2
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/T0003_AdaptableFileTreeIteratorTest.java (renamed from org.eclipse.egit.core.test/src/org/eclipse/egit/core/T0003_AdaptableFileTreeIteratorTest.java)8
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/internal/mapping/T0002_history.java (renamed from org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/mapping/T0002_history.java)4
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/T0001_ConnectProviderOperationTest.java (renamed from org.eclipse.egit.core.test/src/org/eclipse/egit/core/op/T0001_ConnectProviderOperationTest.java)6
5 files changed, 16 insertions, 16 deletions
diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
index 2eb331188..196c2b104 100644
--- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@ Bundle-Vendor: Eclipse.org
Bundle-SymbolicName: org.eclipse.egit.core.test
Bundle-Version: 0.6.0.qualifier
Bundle-Activator: org.eclipse.egit.core.test.Activator
-Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)",
- org.eclipse.core.filesystem;version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;version="[3.4.0,4.0.0)",
- org.eclipse.team.core;version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;version="[3.4.0,4.0.0)",
- org.eclipse.jdt.launching;version="[3.4.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.team.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Import-Package: junit.framework;version="[4.3.1,5.0.0)",
org.eclipse.egit.core;version="[0.6.0,0.7.0)",
diff --git a/org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch b/org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch
index 061874a29..82bcb3c18 100644
--- a/org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch
+++ b/org.eclipse.egit.core.test/org.eclipse.egit.core--All-Tests.launch
@@ -26,7 +26,7 @@
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.egit.core.test"/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.egit.core.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/T0003_AdaptableFileTreeIteratorTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/T0003_AdaptableFileTreeIteratorTest.java
index 9a52f330d..f401b6d96 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/T0003_AdaptableFileTreeIteratorTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/T0003_AdaptableFileTreeIteratorTest.java
@@ -6,7 +6,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.egit.core;
+package org.eclipse.egit.core.test;
import java.io.File;
import java.io.FileWriter;
@@ -16,10 +16,10 @@ import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.egit.core.AdaptableFileTreeIterator;
+import org.eclipse.egit.core.ContainerTreeIterator;
import org.eclipse.egit.core.op.ConnectProviderOperation;
import org.eclipse.egit.core.project.RepositoryMapping;
-import org.eclipse.egit.core.test.GitTestCase;
-import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.WorkingTreeIterator;
@@ -46,7 +46,7 @@ public class T0003_AdaptableFileTreeIteratorTest extends GitTestCase {
fileWriter.close();
final ConnectProviderOperation operation = new ConnectProviderOperation(
- project.getProject(), new File("..", Constants.DOT_GIT));
+ project.getProject(), gitDir);
operation.run(null);
}
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/mapping/T0002_history.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/internal/mapping/T0002_history.java
index e3855bd52..2c748ab25 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/mapping/T0002_history.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/internal/mapping/T0002_history.java
@@ -7,7 +7,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.egit.core.internal.mapping;
+package org.eclipse.egit.core.test.internal.mapping;
import java.io.File;
import java.io.FileWriter;
@@ -102,7 +102,7 @@ public class T0002_history extends GitTestCase {
assertEquals(RefUpdate.Result.NEW, lck.forceUpdate());
ConnectProviderOperation operation = new ConnectProviderOperation(
- project.getProject(), new File("..", Constants.DOT_GIT));
+ project.getProject(), gitDir);
operation.run(null);
}
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/op/T0001_ConnectProviderOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/T0001_ConnectProviderOperationTest.java
index 045c46626..593a5246e 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/op/T0001_ConnectProviderOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/T0001_ConnectProviderOperationTest.java
@@ -7,7 +7,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.egit.core.op;
+package org.eclipse.egit.core.test.op;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -53,7 +53,7 @@ public class T0001_ConnectProviderOperationTest extends GitTestCase {
repository.create();
repository.close();
ConnectProviderOperation operation = new ConnectProviderOperation(
- project.getProject(), new File("..", Constants.DOT_GIT));
+ project.getProject(), gitDir);
operation.run(null);
assertTrue(RepositoryProvider.isShared(project.getProject()));
@@ -95,7 +95,7 @@ public class T0001_ConnectProviderOperationTest extends GitTestCase {
assertEquals(RefUpdate.Result.NEW, lck.forceUpdate());
ConnectProviderOperation operation = new ConnectProviderOperation(
- project.getProject(), new File("..", Constants.DOT_GIT));
+ project.getProject(), gitDir);
operation.run(null);
final boolean f[] = new boolean[1];

Back to the top