Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2019-12-25 10:00:54 +0000
committerMichael Keppler2019-12-26 09:02:12 +0000
commit1a9e6382874e4807dd3882ff12c0f2eb0687509f (patch)
tree223c16ec9fecf73c29f8638b8015c670d8ac7ec6 /org.eclipse.egit.ui.test/src
parent9e7b9fcfb99591308054239d302d6ec6c4db8577 (diff)
downloadegit-1a9e6382874e4807dd3882ff12c0f2eb0687509f.tar.gz
egit-1a9e6382874e4807dd3882ff12c0f2eb0687509f.tar.xz
egit-1a9e6382874e4807dd3882ff12c0f2eb0687509f.zip
Fix typo in tests
Change-Id: I7c91f36a166b371e688c2c598393da87d3299f85 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Diffstat (limited to 'org.eclipse.egit.ui.test/src')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/JavaProjectTester.java6
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java22
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CreatePatchActionTest.java6
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java6
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewRemoteAwareChangeSetModelTest.java10
5 files changed, 25 insertions, 25 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/JavaProjectTester.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/JavaProjectTester.java
index 4013f75da3..635df07d8f 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/JavaProjectTester.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/JavaProjectTester.java
@@ -98,11 +98,11 @@ public class JavaProjectTester {
.getFolder(PACKAGE_NAME);
IFile file = folder.getFile(JAVA_FILE_NAME);
- IFile[] commitables = new IFile[] { file };
+ IFile[] committableFiles = new IFile[] { file };
ArrayList<IFile> untracked = new ArrayList<>();
- untracked.addAll(Arrays.asList(commitables));
+ untracked.addAll(Arrays.asList(committableFiles));
// commit to master
- CommitOperation op = new CommitOperation(commitables, untracked,
+ CommitOperation op = new CommitOperation(committableFiles, untracked,
TestUtil.TESTAUTHOR, TestUtil.TESTCOMMITTER, "Initial commit");
op.execute(null);
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java
index acdafde08c..e19f0b2c63 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java
@@ -379,21 +379,21 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase {
IFolder folder = firstProject.getFolder(FOLDER);
IFile textFile = folder.getFile(FILE1);
IFile textFile2 = folder.getFile(FILE2);
- IFile[] commitables = null;
+ IFile[] committableFiles = null;
if (secondProject != null) {
folder = secondProject.getFolder(FOLDER);
IFile secondtextFile = folder.getFile(FILE1);
IFile secondtextFile2 = folder.getFile(FILE2);
- commitables = new IFile[] { dotProject, textFile, textFile2,
+ committableFiles = new IFile[] { dotProject, textFile, textFile2,
secondtextFile, secondtextFile2 };
} else {
- commitables = new IFile[] { dotProject, textFile, textFile2 };
+ committableFiles = new IFile[] { dotProject, textFile, textFile2 };
}
ArrayList<IFile> untracked = new ArrayList<>();
- untracked.addAll(Arrays.asList(commitables));
+ untracked.addAll(Arrays.asList(committableFiles));
// commit to stable
- CommitOperation op = new CommitOperation(commitables,
+ CommitOperation op = new CommitOperation(committableFiles,
untracked, TestUtil.TESTAUTHOR, TestUtil.TESTCOMMITTER,
"Initial commit");
op.execute(null);
@@ -688,13 +688,13 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase {
throws Exception {
IFile file = touch(newContent);
- IFile[] commitables = new IFile[] { file };
+ IFile[] committableFiles = new IFile[] { file };
ArrayList<IFile> untracked = new ArrayList<>();
- untracked.addAll(Arrays.asList(commitables));
+ untracked.addAll(Arrays.asList(committableFiles));
String message = commitMessage;
if (message == null)
message = newContent;
- CommitOperation op = new CommitOperation(commitables,
+ CommitOperation op = new CommitOperation(committableFiles,
untracked, TestUtil.TESTAUTHOR, TestUtil.TESTCOMMITTER,
message);
op.execute(null);
@@ -754,10 +754,10 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase {
IProject prj = file.getProject();
if (!prj.isAccessible())
throw new IllegalStateException("No project to touch");
- IFile[] commitables = new IFile[] { file };
+ IFile[] committableFiles = new IFile[] { file };
ArrayList<IFile> untracked = new ArrayList<>();
- untracked.addAll(Arrays.asList(commitables));
- CommitOperation op = new CommitOperation(commitables,
+ untracked.addAll(Arrays.asList(committableFiles));
+ CommitOperation op = new CommitOperation(committableFiles,
untracked, TestUtil.TESTAUTHOR, TestUtil.TESTCOMMITTER,
commitMessage);
op.execute(null);
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CreatePatchActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CreatePatchActionTest.java
index d395a9c4ce..1f86893b91 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CreatePatchActionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CreatePatchActionTest.java
@@ -91,9 +91,9 @@ public class CreatePatchActionTest extends LocalRepositoryTestCase {
public void setup() throws Exception {
createProjectAndCommitToRepository();
- IFile[] commitables = getAllFiles();
- CommitOperation cop = new CommitOperation(commitables,
- Arrays.asList(commitables), TestUtil.TESTAUTHOR,
+ IFile[] committableFiles = getAllFiles();
+ CommitOperation cop = new CommitOperation(committableFiles,
+ Arrays.asList(committableFiles), TestUtil.TESTAUTHOR,
TestUtil.TESTCOMMITTER, "Initial commit");
cop.setAmending(true);
cop.execute(null);
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java
index 7d94dbd0da..468a9956a4 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java
@@ -258,11 +258,11 @@ public abstract class AbstractSynchronizeViewTest extends
new ByteArrayInputStream("/.project\n".getBytes(secondPoject
.getDefaultCharset())), false, null);
- IFile[] commitables = new IFile[] { gitignore };
+ IFile[] committableFiles = new IFile[] { gitignore };
ArrayList<IFile> untracked = new ArrayList<IFile>();
- untracked.addAll(Arrays.asList(commitables));
+ untracked.addAll(Arrays.asList(committableFiles));
- CommitOperation op = new CommitOperation(commitables,
+ CommitOperation op = new CommitOperation(committableFiles,
untracked, TestUtil.TESTAUTHOR, TestUtil.TESTCOMMITTER,
"Add .gitignore file");
op.execute(null);
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewRemoteAwareChangeSetModelTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewRemoteAwareChangeSetModelTest.java
index 8b0c80a574..a01a26c2da 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewRemoteAwareChangeSetModelTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewRemoteAwareChangeSetModelTest.java
@@ -177,10 +177,10 @@ public class SynchronizeViewRemoteAwareChangeSetModelTest
"Content 2".getBytes(project.getDefaultCharset())),
false, null);
- IFile[] commitables = new IFile[] { mockLogicalFile, file1, file2 };
+ IFile[] committableFiles = new IFile[] { mockLogicalFile, file1, file2 };
List<IFile> untracked = new ArrayList<>();
- untracked.addAll(Arrays.asList(commitables));
- CommitOperation op = new CommitOperation(commitables, untracked,
+ untracked.addAll(Arrays.asList(committableFiles));
+ CommitOperation op = new CommitOperation(committableFiles, untracked,
TestUtil.TESTAUTHOR, TestUtil.TESTCOMMITTER, "Initial commit");
op.execute(null);
RevCommit firstCommit = op.getCommit();
@@ -199,10 +199,10 @@ public class SynchronizeViewRemoteAwareChangeSetModelTest
new ByteArrayInputStream(
"Content 3".getBytes(project.getDefaultCharset())),
false, null);
- commitables = new IFile[] { mockLogicalFile, file1, file2, file3 };
+ committableFiles = new IFile[] { mockLogicalFile, file1, file2, file3 };
untracked = new ArrayList<>();
untracked.add(file3);
- op = new CommitOperation(commitables, untracked, TestUtil.TESTAUTHOR,
+ op = new CommitOperation(committableFiles, untracked, TestUtil.TESTAUTHOR,
TestUtil.TESTCOMMITTER, "Second commit");
op.execute(null);
}

Back to the top