Browse Source

renamed some files and added new unit tests

pull/5418/head
İsmail ÇAĞDAŞ 6 years ago
parent
commit
67f4c124cd
  1. 13
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfo.cs
  2. 17
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfoEqualityComparer.cs
  3. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepository.cs
  4. 9
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepositoryHelper.cs
  5. 0
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectBuildConfigReader.cs
  6. 9
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IGitRepositoryHelper.cs
  7. 22
      framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/GitRepositoryBuildStatus_Tests.cs
  8. 52
      framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/GitRepository_Tests.cs

13
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfo.cs

@ -19,17 +19,4 @@ namespace Volo.Abp.Cli.Build
Dependencies = new List<DotNetProjectInfo>();
}
}
public class DotNetProjectInfoEqualityComparer : EqualityComparer<DotNetProjectInfo>
{
public override bool Equals(DotNetProjectInfo x, DotNetProjectInfo y)
{
return (x == null && y == null) || (x != null && y != null && x.CsProjPath == y.CsProjPath);
}
public override int GetHashCode(DotNetProjectInfo obj)
{
return obj == null ? 0 : obj.CsProjPath.GetHashCode();
}
}
}

17
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DotNetProjectInfoEqualityComparer.cs

@ -0,0 +1,17 @@
using System.Collections.Generic;
namespace Volo.Abp.Cli.Build
{
public class DotNetProjectInfoEqualityComparer : EqualityComparer<DotNetProjectInfo>
{
public override bool Equals(DotNetProjectInfo x, DotNetProjectInfo y)
{
return (x == null && y == null) || (x != null && y != null && x.CsProjPath == y.CsProjPath);
}
public override int GetHashCode(DotNetProjectInfo obj)
{
return obj == null ? 0 : obj.CsProjPath.GetHashCode();
}
}
}

4
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepository.cs

@ -36,7 +36,7 @@ namespace Volo.Abp.Cli.Build
IgnoredDirectories = new List<string>();
}
public string GetUniqueName(string uniqueName)
public string GetUniqueName(string prefix)
{
var name = Name + "_" + BranchName;
foreach (var dependingRepository in DependingRepositories)
@ -44,7 +44,7 @@ namespace Volo.Abp.Cli.Build
AddToUniqueName(dependingRepository, name);
}
return (uniqueName.IsNullOrEmpty() ? "" : uniqueName + "_") + name.ToMd5();
return (prefix.IsNullOrEmpty() ? "" : prefix + "_") + name.ToMd5();
}
private void AddToUniqueName(GitRepository gitRepository, string name)

9
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepositoryExtensions.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/GitRepositoryHelper.cs

@ -21,11 +21,4 @@ namespace Volo.Abp.Cli.Build
}
}
}
public interface IGitRepositoryHelper
{
string GetLastCommitId(GitRepository repository);
string GetFriendlyName(GitRepository repository);
}
}
}

0
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IBuildArgsReader.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IDotNetProjectBuildConfigReader.cs

9
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/IGitRepositoryHelper.cs

@ -0,0 +1,9 @@
namespace Volo.Abp.Cli.Build
{
public interface IGitRepositoryHelper
{
string GetLastCommitId(GitRepository repository);
string GetFriendlyName(GitRepository repository);
}
}

22
framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/GitRepositoryBuildStatus_Tests.cs

@ -177,5 +177,27 @@ namespace Volo.Abp.Cli.Build
existingBuildStatus.CommitId.ShouldBe("21");
}
[Fact]
public void GetChild_Test()
{
var existingBuildStatus = new GitRepositoryBuildStatus("repo-1", "dev")
{
DependingRepositories = new List<GitRepositoryBuildStatus>()
{
new GitRepositoryBuildStatus("repo-2", "dev")
{
DependingRepositories = new List<GitRepositoryBuildStatus>()
{
new GitRepositoryBuildStatus("repo-3", "dev")
}
},
new GitRepositoryBuildStatus("repo-4", "dev")
}
};
existingBuildStatus.GetChild("repo-3").RepositoryName.ShouldBe("repo-3");
existingBuildStatus.GetChild("repo-4").RepositoryName.ShouldBe("repo-4");
}
}
}

52
framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/Build/GitRepository_Tests.cs

@ -0,0 +1,52 @@
using System.Collections.Generic;
using Shouldly;
using Xunit;
namespace Volo.Abp.Cli.Build
{
public class GitRepository_Tests : AbpCliTestBase
{
[Fact]
public void GetUniqueName_Test()
{
var gitRepository = new GitRepository("repo-1", "dev", "")
{
DependingRepositories = new List<GitRepository>
{
new GitRepository("repo-2", "dev", ""),
new GitRepository("repo-3", "dev", "")
{
DependingRepositories = new List<GitRepository>()
{
new GitRepository("repo-4", "dev", "")
}
}
}
};
gitRepository.GetUniqueName("").ShouldBe("B25C935F97D7B3375530A96B392B7644");
gitRepository.GetUniqueName("production").ShouldBe("production_B25C935F97D7B3375530A96B392B7644");
}
[Fact]
public void FindRepositoryOf_Test()
{
var gitRepository = new GitRepository("repo-1", "dev", "/repo-1/dev/")
{
DependingRepositories = new List<GitRepository>
{
new GitRepository("repo-2", "dev", "/repo-2/dev/"),
new GitRepository("repo-3", "dev", "/repo-3/dev/")
{
DependingRepositories = new List<GitRepository>()
{
new GitRepository("repo-4", "dev", "/repo-4/dev/")
}
}
}
};
gitRepository.FindRepositoryOf("/repo-4/dev/A.csproj").ShouldBe("repo-4");
}
}
}
Loading…
Cancel
Save