Merge branch 'master' into fixes/project-window-interface-icon-overlay

shana · web-flow · commit 59a26534586a · 2018-04-18T17:00:21.000+02:00
diff --git a/src/tests/UnitTests/IO/StatusOutputProcessorTests.cs b/src/tests/UnitTests/IO/StatusOutputProcessorTests.cs
@@ -6,7 +6,7 @@
 namespace UnitTests
 {
     [TestFixture]
-    class StatusOutputProcessorTests : BaseOutputProcessorTests
+    class GitStatusOutputProcessorTests : BaseOutputProcessorTests
     {
 
         [Test]
@@ -28,9 +28,9 @@ public void ShouldParseDirtyWorkingTreeUntracked()
                 LocalBranch = "master",
                 Entries = new List<GitStatusEntry>
                 {
+                    new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
                     new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),
                     new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),
-                    new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
                     new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),
                     new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),
                 }
@@ -59,9 +59,9 @@ public void ShouldParseDirtyWorkingTreeTrackedAhead1Behind1()
                 Behind = 1,
                 Entries = new List<GitStatusEntry>
                 {
+                    new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
                     new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),
                     new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),
-                    new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
                     new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),
                     new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),
                 }
@@ -89,9 +89,9 @@ public void ShouldParseDirtyWorkingTreeTrackedAhead1()
                 Ahead = 1,
                 Entries = new List<GitStatusEntry>
                 {
+                    new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
                     new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),
                     new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),
-                    new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
                     new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),
                     new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),
                 }
@@ -119,9 +119,9 @@ public void ShouldParseDirtyWorkingTreeTrackedBehind1()
                 Behind = 1,
                 Entries = new List<GitStatusEntry>
                 {
+                    new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
                     new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),
                     new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),
-                    new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
                     new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),
                     new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),
                 }
@@ -148,9 +148,9 @@ public void ShouldParseDirtyWorkingTreeTracked()
                 RemoteBranch = "origin/master",
                 Entries = new List<GitStatusEntry>
                 {
+                    new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
                     new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),
                     new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),
-                    new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),
                     new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),
                     new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),
                 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace UnitTests`
`7`	`7`	`{`
`8`	`8`	`[TestFixture]`
`9`		`- class StatusOutputProcessorTests : BaseOutputProcessorTests`
	`9`	`+ class GitStatusOutputProcessorTests : BaseOutputProcessorTests`
`10`	`10`	`{`
`11`	`11`
`12`	`12`	`[Test]`
`@@ -28,9 +28,9 @@ public void ShouldParseDirtyWorkingTreeUntracked()`
`28`	`28`	`LocalBranch = "master",`
`29`	`29`	`Entries = new List<GitStatusEntry>`
`30`	`30`	`{`
	`31`	`+ new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),`
`31`	`32`	`new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),`
`32`	`33`	`new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),`
`33`		`- new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),`
`34`	`34`	`new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),`
`35`	`35`	`new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),`
`36`	`36`	`}`
`@@ -59,9 +59,9 @@ public void ShouldParseDirtyWorkingTreeTrackedAhead1Behind1()`
`59`	`59`	`Behind = 1,`
`60`	`60`	`Entries = new List<GitStatusEntry>`
`61`	`61`	`{`
	`62`	`+ new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),`
`62`	`63`	`new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),`
`63`	`64`	`new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),`
`64`		`- new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),`
`65`	`65`	`new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),`
`66`	`66`	`new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),`
`67`	`67`	`}`
`@@ -89,9 +89,9 @@ public void ShouldParseDirtyWorkingTreeTrackedAhead1()`
`89`	`89`	`Ahead = 1,`
`90`	`90`	`Entries = new List<GitStatusEntry>`
`91`	`91`	`{`
	`92`	`+ new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),`
`92`	`93`	`new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),`
`93`	`94`	`new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),`
`94`		`- new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),`
`95`	`95`	`new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),`
`96`	`96`	`new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),`
`97`	`97`	`}`
`@@ -119,9 +119,9 @@ public void ShouldParseDirtyWorkingTreeTrackedBehind1()`
`119`	`119`	`Behind = 1,`
`120`	`120`	`Entries = new List<GitStatusEntry>`
`121`	`121`	`{`
	`122`	`+ new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),`
`122`	`123`	`new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),`
`123`	`124`	`new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),`
`124`		`- new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),`
`125`	`125`	`new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),`
`126`	`126`	`new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),`
`127`	`127`	`}`
`@@ -148,9 +148,9 @@ public void ShouldParseDirtyWorkingTreeTracked()`
`148`	`148`	`RemoteBranch = "origin/master",`
`149`	`149`	`Entries = new List<GitStatusEntry>`
`150`	`150`	`{`
	`151`	`+ new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),`
`151`	`152`	`new GitStatusEntry("GitHubVS.sln", TestRootPath + @"\GitHubVS.sln", null, GitFileStatus.Modified),`
`152`	`153`	`new GitStatusEntry("README2.md", TestRootPath + @"\README2.md", null, GitFileStatus.Renamed, "README.md", true),`
`153`		`- new GitStatusEntry("deploy.cmd", TestRootPath + @"\deploy.cmd", null, GitFileStatus.Deleted),`
`154`	`154`	`new GitStatusEntry("something added.txt", TestRootPath + @"\something added.txt", null, GitFileStatus.Added, staged: true),`
`155`	`155`	`new GitStatusEntry("something.txt", TestRootPath + @"\something.txt", null, GitFileStatus.Untracked),`
`156`	`156`	`}`