← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to external/ngit/NGit.Test/NGit.Api/StashCreateCommandTest.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
external/ngit/NGit.Test/NGit.Api/StashCreateCommandTest.cs
290
290
                        NUnit.Framework.Assert.IsNotNull(stashed);
291
291
                        NUnit.Framework.Assert.AreEqual("content", Read(committedFile));
292
292
                        ValidateStashedCommit(stashed);
293
 
                        NUnit.Framework.Assert.IsTrue(stashed.Tree.Equals(stashed.GetParent(1).Tree));
 
293
                        NUnit.Framework.Assert.AreEqual(stashed.GetParent(1).Tree, stashed.Tree);
294
294
                        IList<DiffEntry> workingDiffs = DiffWorkingAgainstHead(stashed);
295
295
                        NUnit.Framework.Assert.AreEqual(1, workingDiffs.Count);
296
296
                        NUnit.Framework.Assert.AreEqual(DiffEntry.ChangeType.MODIFY, workingDiffs[0].GetChangeType
321
321
                        NUnit.Framework.Assert.IsNotNull(stashed);
322
322
                        NUnit.Framework.Assert.IsFalse(added.Exists());
323
323
                        ValidateStashedCommit(stashed);
324
 
                        NUnit.Framework.Assert.IsTrue(stashed.Tree.Equals(stashed.GetParent(1).Tree));
 
324
                        NUnit.Framework.Assert.AreEqual(stashed.GetParent(1).Tree, stashed.Tree);
325
325
                        IList<DiffEntry> workingDiffs = DiffWorkingAgainstHead(stashed);
326
326
                        NUnit.Framework.Assert.AreEqual(1, workingDiffs.Count);
327
327
                        NUnit.Framework.Assert.AreEqual(DiffEntry.ChangeType.ADD, workingDiffs[0].GetChangeType
407
407
                        NUnit.Framework.Assert.AreEqual(who, entry.GetWho());
408
408
                        NUnit.Framework.Assert.AreEqual(stashed.GetFullMessage(), entry.GetComment());
409
409
                }
 
410
 
 
411
                /// <exception cref="System.Exception"></exception>
 
412
                public virtual void UnmergedPathsShouldCauseException()
 
413
                {
 
414
                        CommitFile("file.txt", "master", "base");
 
415
                        RevCommit side = CommitFile("file.txt", "side", "side");
 
416
                        CommitFile("file.txt", "master", "master");
 
417
                        git.Merge().Include(side).Call();
 
418
                        git.StashCreate().Call();
 
419
                }
410
420
        }
411
421
}