Adapt generated test to make it (partly) work
!! Rename branched don't work at the moment :( The script generated by the ruby script ( https://github.com/git-tfs/git-tfs-test-builder ) do not contains enough data to fake all the tfs calls, so we have to adapt it... Perhaps we could post process the datas and enrich them to not be obliged to adapt it manualy but it's a bit ambitious for the moment....... ToDo: We must modify the `Read()` method to convert well the byte[] in string (I didn't find how!)
This commit is contained in:
Philippe Miossec
@@ -1,6 +1,7 @@
|
||||
// Generated by git-tfs-test-builder
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using Sep.Git.Tfs.Core.TfsInterop;
|
||||
using Sep.Git.Tfs.Test.Integration;
|
||||
|
||||
@@ -23,27 +24,27 @@ namespace Sep.Git.Tfs.Test.Fixtures
|
||||
r.Changeset(22512, "trunk2", DateTime.Parse("2013-05-24T22:59:05.403Z"))
|
||||
.Change(TfsChangeType.Edit, TfsItemType.File, "$/vtccds/trunk/file.txt", Read("70e6b3871859cf52ef78fba876bc37a4"), 390991)
|
||||
;
|
||||
r.Changeset(22513, "Creation branch $/vtccds/b1", DateTime.Parse("2013-05-24T23:01:06.747Z"))
|
||||
r.BranchChangeset(22513, "Creation branch $/vtccds/b1", DateTime.Parse("2013-05-24T23:01:06.747Z"), "$/vtccds/trunk", "$/vtccds/b1", 22511)
|
||||
.Change(TfsChangeType.Branch, TfsItemType.Folder, "$/vtccds/b1", Read(null), 391048)
|
||||
.Change(TfsChangeType.Branch, TfsItemType.File, "$/vtccds/b1/file.txt", Read("74687eb86f9a0c7a2ca65efbbae6a5ad"), 391049)
|
||||
;
|
||||
r.Changeset(22514, "b1.1", DateTime.Parse("2013-05-24T23:03:43.493Z"))
|
||||
.Change(TfsChangeType.Edit, TfsItemType.File, "$/vtccds/b1/file.txt", Read("96b58369f5bd2b081005ba208ac649b8"), 391049)
|
||||
;
|
||||
r.Changeset(22515, "Merge branch 'b1' in trunk\n\nb1.1\n\nCreation branch $/vtccds/b1", DateTime.Parse("2013-05-24T23:48:45.6Z"))
|
||||
r.MergeChangeset(22515, "Merge branch 'b1' in trunk\n\nb1.1\n\nCreation branch $/vtccds/b1", DateTime.Parse("2013-05-24T23:48:45.6Z"), "$/vtccds/b1", "$/vtccds/trunk", 22514)
|
||||
.Change(TfsChangeType.Edit | TfsChangeType.Merge, TfsItemType.File, "$/vtccds/trunk/file.txt", Read("4cd460612edcbab617997836871d7291"), 390991)
|
||||
;
|
||||
r.Changeset(25197, "trunk after merge", DateTime.Parse("2013-09-09T20:33:30.637Z"))
|
||||
.Change(TfsChangeType.Edit, TfsItemType.File, "$/vtccds/trunk/file.txt", Read("fba9507f41916830d82be84924dded7b"), 390991)
|
||||
;
|
||||
r.Changeset(25198, "create branch to test renaming branch in tfs", DateTime.Parse("2013-09-09T20:39:59.453Z"))
|
||||
r.BranchChangeset(25198, "create branch to test renaming branch in tfs", DateTime.Parse("2013-09-09T20:39:59.453Z"), "$/vtccds/trunk", "$/vtccds/testRename", 25197)
|
||||
.Change(TfsChangeType.Branch, TfsItemType.Folder, "$/vtccds/testRename", Read(null), 426363)
|
||||
.Change(TfsChangeType.Branch, TfsItemType.File, "$/vtccds/testRename/file.txt", Read("fba9507f41916830d82be84924dded7b"), 426364)
|
||||
;
|
||||
r.Changeset(25199, "rename branch1", DateTime.Parse("2013-09-09T20:45:50.05Z"))
|
||||
.Change(TfsChangeType.Edit, TfsItemType.File, "$/vtccds/testRename/file.txt", Read("2ea0b9d555f39b93aa67d834aec81dec"), 426364)
|
||||
;
|
||||
r.Changeset(25200, "testRename renamed in afterRename", DateTime.Parse("2013-09-09T22:13:05.513Z"))
|
||||
r.BranchChangeset(25200, "testRename renamed in afterRename", DateTime.Parse("2013-09-09T22:13:05.513Z"), "$/vtccds/testRename", "$/vtccds/afterRename", 25199)
|
||||
.Change(TfsChangeType.Rename, TfsItemType.Folder, "$/vtccds/afterRename", Read(null), 426365)
|
||||
.Change(TfsChangeType.Delete, TfsItemType.Folder, "$/vtccds/testRename", Read(null), 426363)
|
||||
.Change(TfsChangeType.Rename, TfsItemType.File, "$/vtccds/afterRename/file.txt", Read("2ea0b9d555f39b93aa67d834aec81dec"), 426366)
|
||||
@@ -52,7 +53,7 @@ namespace Sep.Git.Tfs.Test.Fixtures
|
||||
r.Changeset(25202, "1st commit after rename", DateTime.Parse("2013-09-10T12:19:16.28Z"))
|
||||
.Change(TfsChangeType.Edit, TfsItemType.File, "$/vtccds/afterRename/file.txt", Read("6553cc439299c73677e0c43dd0fd786e"), 426366)
|
||||
;
|
||||
r.Changeset(25957, "branch to test rename of a file", DateTime.Parse("2013-10-25T08:33:22.15Z"))
|
||||
r.BranchChangeset(25957, "branch to test rename of a file", DateTime.Parse("2013-10-25T08:33:22.15Z"), "$/vtccds/trunk", "$/vtccds/renameFile", 25197)
|
||||
.Change(TfsChangeType.Branch, TfsItemType.Folder, "$/vtccds/renameFile", Read(null), 439692)
|
||||
.Change(TfsChangeType.Branch, TfsItemType.File, "$/vtccds/renameFile/file.txt", Read("fba9507f41916830d82be84924dded7b"), 439693)
|
||||
;
|
||||
@@ -72,7 +73,7 @@ namespace Sep.Git.Tfs.Test.Fixtures
|
||||
r.Changeset(26497, "wi #1670", DateTime.Parse("2013-11-22T22:03:45.9Z"))
|
||||
.Change(TfsChangeType.Edit, TfsItemType.File, "$/vtccds/trunk/file.txt", Read("86882c0ae4717b4969d54f676c0261e3"), 390991)
|
||||
;
|
||||
r.Changeset(27503, "create a new branch from nowhere\n=> not a branch from another branch!!", DateTime.Parse("2014-01-05T16:08:07.48Z"))
|
||||
r.BranchChangeset(27503, "create a new branch from nowhere\n=> not a branch from another branch!!", DateTime.Parse("2014-01-05T16:08:07.48Z"), string.Empty, "$/vtccds/branch_from_nowhere", -1)
|
||||
.Change(TfsChangeType.Add | TfsChangeType.Encoding, TfsItemType.Folder, "$/vtccds/branch_from_nowhere", Read(null), 479197)
|
||||
;
|
||||
r.Changeset(27505, "first changeset from nowhere...", DateTime.Parse("2014-01-05T20:41:20.78Z"))
|
||||
@@ -81,11 +82,11 @@ namespace Sep.Git.Tfs.Test.Fixtures
|
||||
r.Changeset(27506, "2nd changeset from nowhere...", DateTime.Parse("2014-01-05T20:43:16.14Z"))
|
||||
.Change(TfsChangeType.Edit, TfsItemType.File, "$/vtccds/branch_from_nowhere/file_from_nowhere.txt", Read("5a18c163f1804fe83dfeae04f1d1d34e"), 479199)
|
||||
;
|
||||
r.Changeset(27507, "baseless merge from branch not branched \"branch_from_nowhere\"", DateTime.Parse("2014-01-05T21:02:33.82Z"))
|
||||
r.MergeChangeset(27507, "baseless merge from branch not branched \"branch_from_nowhere\"", DateTime.Parse("2014-01-05T21:02:33.82Z"), "$/vtccds/branch_from_nowhere", "$/vtccds/renameFile", 27506)
|
||||
.Change(TfsChangeType.Merge, TfsItemType.Folder, "$/vtccds/renameFile", Read(null), 439692)
|
||||
.Change(TfsChangeType.Encoding | TfsChangeType.Branch | TfsChangeType.Merge, TfsItemType.File, "$/vtccds/renameFile/file_from_nowhere.txt", Read("5a18c163f1804fe83dfeae04f1d1d34e"), 479200)
|
||||
;
|
||||
r.Changeset(27508, "rename the branch a second time...", DateTime.Parse("2014-01-05T23:08:43.21Z"))
|
||||
r.BranchChangeset(27508, "rename the branch a second time...", DateTime.Parse("2014-01-05T23:08:43.21Z"), "$/vtccds/afterRename", "$/vtccds/renamedTwice", 25202)
|
||||
.Change(TfsChangeType.Delete, TfsItemType.Folder, "$/vtccds/afterRename", Read(null), 426365)
|
||||
.Change(TfsChangeType.Rename, TfsItemType.Folder, "$/vtccds/renamedTwice", Read(null), 479201)
|
||||
.Change(TfsChangeType.Delete, TfsItemType.File, "$/vtccds/afterRename/file.txt", Read("6553cc439299c73677e0c43dd0fd786e"), 426366)
|
||||
@@ -94,7 +95,7 @@ namespace Sep.Git.Tfs.Test.Fixtures
|
||||
r.Changeset(27509, "first commit after 2nd branch renaming...", DateTime.Parse("2014-01-05T23:12:55.78Z"))
|
||||
.Change(TfsChangeType.Edit, TfsItemType.File, "$/vtccds/renamedTwice/file.txt", Read("d67034311a9ccd1a5a62cc0ecdaa1a6f"), 479202)
|
||||
;
|
||||
r.Changeset(30333, "Creation branch $/vtccds/b1.1", DateTime.Parse("2014-06-05T11:06:52.633Z"))
|
||||
r.BranchChangeset(30333, "Creation branch $/vtccds/b1.1", DateTime.Parse("2014-06-05T11:06:52.633Z"), "$/vtccds/trunk", "$/vtccds/b1.1", 26394)
|
||||
.Change(TfsChangeType.Branch, TfsItemType.Folder, "$/vtccds/b1.1", Read(null), 513921)
|
||||
.Change(TfsChangeType.Branch, TfsItemType.File, "$/vtccds/b1.1/file.txt", Read("4f4cd8afcb1708c003540aea8d64239d"), 513922)
|
||||
;
|
||||
@@ -107,7 +108,7 @@ namespace Sep.Git.Tfs.Test.Fixtures
|
||||
r.Changeset(31588, "test changeset after merge", DateTime.Parse("2014-07-13T19:23:16.753Z"))
|
||||
.Change(TfsChangeType.Edit, TfsItemType.File, "$/vtccds/b1/file.txt", Read("52c0fc9d4cfbf1ae07f36b8e711a5d6b"), 391049)
|
||||
;
|
||||
r.Changeset(33407, "Rename branch and other changes...\n\n-Modify file.txt\n-Add file2.txt", DateTime.Parse("2014-10-11T15:19:56.077Z"))
|
||||
r.BranchChangeset(33407, "Rename branch and other changes...\n\n-Modify file.txt\n-Add file2.txt", DateTime.Parse("2014-10-11T15:19:56.077Z"), "$/vtccds/renamedTwice", "$/vtccds/renamed3", 27509)
|
||||
.Change(TfsChangeType.Rename, TfsItemType.Folder, "$/vtccds/renamed3", Read(null), 587694)
|
||||
.Change(TfsChangeType.Delete, TfsItemType.Folder, "$/vtccds/renamedTwice", Read(null), 479201)
|
||||
.Change(TfsChangeType.Edit | TfsChangeType.Rename, TfsItemType.File, "$/vtccds/renamed3/file.txt", Read("fb5dcd187b5ab3729973b310f3c55596"), 587695)
|
||||
@@ -116,16 +117,20 @@ namespace Sep.Git.Tfs.Test.Fixtures
|
||||
;
|
||||
}
|
||||
|
||||
private static byte[] Read(string itemContentHash)
|
||||
private static string Read(string itemContentHash)
|
||||
{
|
||||
if (itemContentHash == null)
|
||||
return new byte[0];
|
||||
return string.Empty;
|
||||
|
||||
using (var stream = typeof(vtccds).Assembly.GetManifestResourceStream("Sep.Git.Tfs.Test.Fixtures.vtccds." + itemContentHash))
|
||||
{
|
||||
if (stream == null)
|
||||
throw new Exception("Fail: Can not find test file:" + itemContentHash);
|
||||
using (var reader = new BinaryReader(stream))
|
||||
{
|
||||
return reader.ReadBytes((int) stream.Length);
|
||||
//ToDo: How to convert bytes to the expected string!?!
|
||||
var content = reader.ReadBytes((int)stream.Length);
|
||||
return Encoding.UTF8.GetString(content);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,6 +111,7 @@
|
||||
<Compile Include="Core\TfsApiBridgeTest.cs" />
|
||||
<Compile Include="Core\StubbedCheckinEvaluationResult.cs" />
|
||||
<Compile Include="Core\TfsWorkspaceTests.cs" />
|
||||
<Compile Include="Fixtures\vtccds.cs" />
|
||||
<Compile Include="GitTfsRegexTests.cs" />
|
||||
<Compile Include="Integration\BootstrapTests.cs" />
|
||||
<Compile Include="Integration\CloneTests.cs" />
|
||||
@@ -165,6 +166,26 @@
|
||||
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Fixtures\vtccds\0445de4a590c27552a06ecda1b5ff2af" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\1b9bf73806f680f3f6a79ca80e635dcf" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\2ea0b9d555f39b93aa67d834aec81dec" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\36eae6b6a4717375a4ff16287744cd1d" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\4cd460612edcbab617997836871d7291" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\4f4cd8afcb1708c003540aea8d64239d" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\52c0fc9d4cfbf1ae07f36b8e711a5d6b" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\5a18c163f1804fe83dfeae04f1d1d34e" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\6553cc439299c73677e0c43dd0fd786e" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\6c6060d9696edc7000396cc499ab8277" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\70e6b3871859cf52ef78fba876bc37a4" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\74687eb86f9a0c7a2ca65efbbae6a5ad" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\86882c0ae4717b4969d54f676c0261e3" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\96b58369f5bd2b081005ba208ac649b8" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\9a975dd2be9a190424fc226a5a25d84f" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\c02331d395d07dc7efaaa295ac474971" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\d67034311a9ccd1a5a62cc0ecdaa1a6f" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\fb5dcd187b5ab3729973b310f3c55596" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\fba9507f41916830d82be84924dded7b" />
|
||||
<EmbeddedResource Include="Fixtures\vtccds\fd30d6210bb40fd2c9b689f0bf8b2833" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Sep.Git.Tfs.Core.TfsInterop;
|
||||
using Sep.Git.Tfs.Test.Fixtures;
|
||||
using Xunit;
|
||||
|
||||
namespace Sep.Git.Tfs.Test.Integration
|
||||
@@ -204,6 +205,22 @@ namespace Sep.Git.Tfs.Test.Integration
|
||||
tree: "c379179fee2ce45e44a5a2dd1d9bcf5ce8489608");
|
||||
}
|
||||
|
||||
[FactExceptOnUnix]
|
||||
public void WhenCloningVtccds()
|
||||
{
|
||||
h.SetupFake(r =>
|
||||
{
|
||||
r.SetRootBranch("$/vtccds/trunk");
|
||||
vtccds.Prepare(r);
|
||||
});
|
||||
|
||||
h.Run("clone", h.TfsUrl, "$/vtccds/trunk", "Vtccds", "--with-branches");
|
||||
|
||||
//AssertNewClone("MyProject", new[] { "refs/heads/renamed3" },
|
||||
// commit: "0df2815a74403cfe96ccb96e3f995970f55df2b4",
|
||||
// tree: "c379179fee2ce45e44a5a2dd1d9bcf5ce8489608");
|
||||
}
|
||||
|
||||
[FactExceptOnUnix]
|
||||
public void WhenCloningTrunkWithIgnoringBranches_ThenTheMergedBranchIsAutomaticallyInitialized()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user