Merge "Fixed several warnings around ConnectProviderOperation"

2 files changed, 11 insertions, 29 deletions

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 ac971b2733..a6ceca2a72 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
@@ -18,7 +18,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jgit.junit.MockSystemReader;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectWriter;
+import org.eclipse.jgit.lib.ObjectInserter;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.util.IO;
 import org.eclipse.jgit.util.SystemReader;
@@ -57,8 +57,15 @@ public abstract class GitTestCase {
 		FileWriter fileWriter = new FileWriter(file);
 		fileWriter.write(content);
 		fileWriter.close();
-		ObjectWriter objectWriter = new ObjectWriter(repository);
-		return objectWriter.writeBlob(file);
+		byte[] fileContents = IO.readFully(file);
+		ObjectInserter inserter = repository.newObjectInserter();
+		try {
+			ObjectId objectId = inserter.insert(Constants.OBJ_BLOB, fileContents);
+			inserter.flush();
+			return objectId;
+		} finally {
+			inserter.release();
+		}
 	}
 
 	protected ObjectId createFileCorruptShort(Repository repository, IProject actProject, String name, String content) throws IOException {
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/ConnectProviderOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/ConnectProviderOperationTest.java
index ecb2022b3a..42ec2e4032 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/ConnectProviderOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/ConnectProviderOperationTest.java
@@ -22,9 +22,6 @@ import java.util.TimeZone;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.egit.core.op.ConnectProviderOperation;
 import org.eclipse.egit.core.test.GitTestCase;
 import org.eclipse.jgit.lib.Commit;
@@ -56,8 +53,6 @@ public class ConnectProviderOperationTest extends GitTestCase {
 	@Test
 	public void testNewRepository() throws CoreException, IOException {
 
-		File gitDir = new File(project.getProject().getWorkspace().getRoot()
-				.getRawLocation().toFile(), Constants.DOT_GIT);
 		Repository repository = new FileRepository(gitDir);
 		repository.create();
 		repository.close();
@@ -71,16 +66,13 @@ public class ConnectProviderOperationTest extends GitTestCase {
 	}
 
 	@Test
-	public void testNewUnsharedFile() throws CoreException, IOException,
-			InterruptedException {
+	public void testNewUnsharedFile() throws CoreException, IOException {
 
 		project.createSourceFolder();
 		IFile fileA = project.getProject().getFolder("src").getFile("A.java");
 		String srcA = "class A {\n" + "}\n";
 		fileA.create(new ByteArrayInputStream(srcA.getBytes()), false, null);
 
-		File gitDir = new File(project.getProject().getWorkspace().getRoot()
-				.getRawLocation().toFile(), Constants.DOT_GIT);
 		Repository thisGit = new FileRepository(gitDir);
 		thisGit.create();
 		Tree rootTree = new Tree(thisGit);
@@ -108,23 +100,6 @@ public class ConnectProviderOperationTest extends GitTestCase {
 				project.getProject(), gitDir);
 		operation.execute(null);
 
-		final boolean f[] = new boolean[1];
-		new Job("wait") {
-			protected IStatus run(IProgressMonitor monitor) {
-
-				f[0] = true;
-				return null;
-			}
-
-			{
-				setRule(project.getProject());
-				schedule();
-			}
-		};
-		while (!f[0]) {
-			Thread.sleep(1000);
-		}
-
 		assertNotNull(RepositoryProvider.getProvider(project.getProject()));
 
 	}