diff --git a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj index 56ff4979d2..390476a38f 100644 --- a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj +++ b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo.Docs.Admin.Application.Tests.csproj @@ -11,7 +11,6 @@ - diff --git a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsApplicationTestBase.cs b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsAdminApplicationTestBase.cs similarity index 57% rename from modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsApplicationTestBase.cs rename to modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsAdminApplicationTestBase.cs index 9f2dfa06b8..c11233849a 100644 --- a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsApplicationTestBase.cs +++ b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsAdminApplicationTestBase.cs @@ -4,9 +4,4 @@ { } - - public class DocsApplicationTestBase : DocsTestBase - { - - } } diff --git a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsApplicationTestModule.cs b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsAdminApplicationTestModule.cs similarity index 60% rename from modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsApplicationTestModule.cs rename to modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsAdminApplicationTestModule.cs index 32c49787b3..e85bac8ce3 100644 --- a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsApplicationTestModule.cs +++ b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocsAdminApplicationTestModule.cs @@ -3,15 +3,6 @@ using Volo.Docs.Admin; namespace Volo.Docs { - [DependsOn( - typeof(DocsApplicationModule), - typeof(DocsDomainTestModule) - )] - public class DocsApplicationTestModule : AbpModule - { - - } - [DependsOn( typeof(DocsAdminApplicationModule), typeof(DocsDomainTestModule) diff --git a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/ApplicationService_Tests.cs b/modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/ApplicationService_Tests.cs similarity index 81% rename from modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/ApplicationService_Tests.cs rename to modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/ApplicationService_Tests.cs index 02bcc4e0db..bff7f09e1f 100644 --- a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/ApplicationService_Tests.cs +++ b/modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/ApplicationService_Tests.cs @@ -36,7 +36,10 @@ namespace Volo.Docs [Fact] public async Task GetVersionsAsync() { - // TODO: Need to mock WebClient and Octokit components + var versions = await _projectAppService.GetVersionsAsync("ABP"); + versions.ShouldNotBeNull(); + versions.Items.Count.ShouldBe(1); + versions.Items.ShouldContain(x => x.Name == "0.15.0" && x.DisplayName == "0.15.0"); } } } diff --git a/modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/DocsApplicationTestBase.cs b/modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/DocsApplicationTestBase.cs new file mode 100644 index 0000000000..f0fb94d40b --- /dev/null +++ b/modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/DocsApplicationTestBase.cs @@ -0,0 +1,7 @@ +namespace Volo.Docs +{ + public class DocsApplicationTestBase : DocsTestBase + { + + } +} diff --git a/modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/DocsDomainTestBase.cs b/modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/DocsDomainTestBase.cs index 7de6bb3182..b46e054370 100644 --- a/modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/DocsDomainTestBase.cs +++ b/modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/DocsDomainTestBase.cs @@ -1,43 +1,7 @@ -using System; -using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection; -using NSubstitute; -using Octokit; -using Volo.Docs.GitHub.Documents; - -namespace Volo.Docs +namespace Volo.Docs { public abstract class DocsDomainTestBase : DocsTestBase { - protected override void AfterAddApplication(IServiceCollection services) - { - var repositoryManager = Substitute.For(); - repositoryManager.GetFileRawStringContentAsync(Arg.Any(), Arg.Any(), Arg.Any()) - .Returns("stringContent"); - repositoryManager.GetFileRawByteArrayContentAsync(Arg.Any(), Arg.Any(), Arg.Any()) - .Returns(new byte[] { 0x01, 0x02, 0x03 }); - repositoryManager.GetReleasesAsync(Arg.Any(), Arg.Any(), Arg.Any()) - .Returns(new List - { - new Release("https://api.github.com/repos/abpframework/abp/releases/16293679", - "https://github.com/abpframework/abp/releases/tag/0.15.0", - "https://api.github.com/repos/abpframework/abp/releases/16293679/assets", - "https://uploads.github.com/repos/abpframework/abp/releases/16293679/assets{?name,label}", - 16293679, - "0.15.0", - "master", - "0.15.0", - "0.15.0 already release", - false, - false, - DateTimeOffset.Parse("2019-03-22T18:43:58Z"), - DateTimeOffset.Parse("2019-03-22T19:44:25Z"), - null, - "https://api.github.com/repos/abpframework/abp/tarball/0.15.0", - "https://api.github.com/repos/abpframework/abp/zipball/0.15.0", - null) - }); - services.AddSingleton(repositoryManager); - } + } } diff --git a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestBase.cs b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestBase.cs index 2ceb4b8f95..e8b7fa0126 100644 --- a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestBase.cs +++ b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestBase.cs @@ -1,5 +1,11 @@ -using Volo.Abp; +using System; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; +using NSubstitute; +using Octokit; +using Volo.Abp; using Volo.Abp.Modularity; +using Volo.Docs.GitHub.Documents; namespace Volo.Docs { @@ -10,5 +16,36 @@ namespace Volo.Docs { options.UseAutofac(); } + + protected override void AfterAddApplication(IServiceCollection services) + { + var repositoryManager = Substitute.For(); + repositoryManager.GetFileRawStringContentAsync(Arg.Any(), Arg.Any(), Arg.Any()) + .Returns("stringContent"); + repositoryManager.GetFileRawByteArrayContentAsync(Arg.Any(), Arg.Any(), Arg.Any()) + .Returns(new byte[] { 0x01, 0x02, 0x03 }); + repositoryManager.GetReleasesAsync(Arg.Any(), Arg.Any(), Arg.Any()) + .Returns(new List + { + new Release("https://api.github.com/repos/abpframework/abp/releases/16293679", + "https://github.com/abpframework/abp/releases/tag/0.15.0", + "https://api.github.com/repos/abpframework/abp/releases/16293679/assets", + "https://uploads.github.com/repos/abpframework/abp/releases/16293679/assets{?name,label}", + 16293679, + "0.15.0", + "master", + "0.15.0", + "0.15.0 already release", + false, + false, + DateTimeOffset.Parse("2019-03-22T18:43:58Z"), + DateTimeOffset.Parse("2019-03-22T19:44:25Z"), + null, + "https://api.github.com/repos/abpframework/abp/tarball/0.15.0", + "https://api.github.com/repos/abpframework/abp/zipball/0.15.0", + null) + }); + services.AddSingleton(repositoryManager); + } } }