Skip to content

Commit 56943da

Browse files
committed
Tied v1.x with Extensibility v0.1.x
1 parent 1f9b447 commit 56943da

File tree

9 files changed

+520
-520
lines changed

9 files changed

+520
-520
lines changed

UnitTests/GitExtensions.GerritPlugin.Tests/GitExtensions.GerritPlugin.Tests.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<IsPackable>false</IsPackable>
4+
</PropertyGroup>
25
<ItemGroup>
6+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
37
<PackageReference Include="NUnit" Version="3.13.2" />
8+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
9+
<PackageReference Include="coverlet.collector" Version="3.1.1">
10+
<PrivateAssets>all</PrivateAssets>
11+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12+
</PackageReference>
413
</ItemGroup>
514

615
<ItemGroup>

UnitTests/GitExtensions.GerritPlugin.Tests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 2 deletions
This file was deleted.

UnitTests/GitExtensions.GerritPlugin.Tests/Server/CommandBuilderWithDraftSupportTests.cs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
using GitExtensions.GerritPlugin.Server;
1+
using GitExtensions.GerritPlugin.Server;
72
using NUnit.Framework;
83

94
namespace GitExtensions.GerritPlugin.Tests.Server
105
{
11-
public static class CommandBuilderWithDraftSupportTests
6+
[TestFixture]
7+
public class CommandBuilderWithDraftSupportTests
128
{
139
[TestCase("a, b, c", "fix-7521", ExpectedResult = "refs/for/fix-7521%r=a,r=b,r=c")]
1410
[TestCase("a|b|c", "fix-7521", ExpectedResult = "refs/for/fix-7521%r=a,r=b,r=c")]
@@ -17,21 +13,21 @@ public static class CommandBuilderWithDraftSupportTests
1713
[TestCase("q", "fix-7521", ExpectedResult = "refs/for/fix-7521%r=q")]
1814
[TestCase("", "fix-7521", ExpectedResult = "refs/for/fix-7521")]
1915
[TestCase(null, "fix-7521", ExpectedResult = "refs/for/fix-7521")]
20-
public static string Build_WithReviewers_splits_reviewrs_and_builds_expected_command(string reviewer, string branch)
16+
public string Build_WithReviewers_splits_reviewrs_and_builds_expected_command(string reviewer, string branch)
2117
{
2218
var sut = new CommandBuilderWithDraftSupport();
2319
return sut.WithReviewers(reviewer).Build(branch);
2420
}
2521

2622
[Test(ExpectedResult = "refs/drafts/master%r=a")]
27-
public static string Build_when_publishtype_is_drafts_builds_expected_command()
23+
public string Build_when_publishtype_is_drafts_builds_expected_command()
2824
{
2925
var sut = new CommandBuilderWithDraftSupport();
3026
return sut.WithReviewers("a").WithPublishType("drafts").Build("master");
3127
}
3228

3329
[Test(ExpectedResult = "refs/for/fix-7521")]
34-
public static string Build_with_all_values_on_default_builds_expected_command()
30+
public string Build_with_all_values_on_default_builds_expected_command()
3531
{
3632
var sut = new CommandBuilderWithDraftSupport();
3733
return sut.WithReviewers(string.Empty)
@@ -43,7 +39,7 @@ public static string Build_with_all_values_on_default_builds_expected_command()
4339
}
4440

4541
[Test(ExpectedResult = "refs/for/fix-7521%r=mygroup,cc=team2,topic=ABC-123,hashtag=what")]
46-
public static string Build_with_values_for_all_options_builds_expected_command()
42+
public string Build_with_values_for_all_options_builds_expected_command()
4743
{
4844
var sut = new CommandBuilderWithDraftSupport();
4945
return sut.WithReviewers("mygroup")

UnitTests/GitExtensions.GerritPlugin.Tests/Server/CommandBuilderWithPrivateSupportTests.cs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
using GitExtensions.GerritPlugin.Server;
1+
using GitExtensions.GerritPlugin.Server;
72
using NUnit.Framework;
83

94
namespace GitExtensions.GerritPlugin.Tests.Server
105
{
11-
public static class CommandBuilderWithPrivateSupportTests
6+
[TestFixture]
7+
public class CommandBuilderWithPrivateSupportTests
128
{
139
[TestCase("", ExpectedResult = "refs/for/mybranch")]
1410
[TestCase("wip", ExpectedResult = "refs/for/mybranch%wip")]
1511
[TestCase("private", ExpectedResult = "refs/for/mybranch%private")]
16-
public static string Build_given_a_publishType_builds_expected_command(string publishType)
12+
public string Build_given_a_publishType_builds_expected_command(string publishType)
1713
{
1814
var sut = new CommandBuilderWithPrivateSupport();
1915

2016
return sut.WithPublishType(publishType).Build("mybranch");
2117
}
2218

2319
[Test]
24-
public static void Build_given_a_set_of_values_builds_expected_command()
20+
public void Build_given_a_set_of_values_builds_expected_command()
2521
{
2622
var sut = new CommandBuilderWithPrivateSupport();
2723

UnitTests/GitExtensions.GerritPlugin.Tests/Server/GerritCapabilityTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@
44

55
namespace GitExtensions.GerritPlugin.Tests.Server
66
{
7-
public static class GerritCapabilityTests
7+
[TestFixture]
8+
public class GerritCapabilityTests
89
{
910
[Test]
10-
public static void PublishTypes_for_Version2_15_has_expected_list_of_values()
11+
public void PublishTypes_for_Version2_15_has_expected_list_of_values()
1112
{
1213
RunTest(GerritCapabilities.Version2_15, new[] { string.Empty, "wip", "private" });
1314
}
1415

1516
[Test]
16-
public static void PublishTypes_for_OlderVersion_has_expected_list_of_values()
17+
public void PublishTypes_for_OlderVersion_has_expected_list_of_values()
1718
{
1819
RunTest(GerritCapabilities.OldestVersion, new[] { string.Empty, "drafts" });
1920
}
2021

21-
private static void RunTest(GerritCapabilities capability, string[] expectedValues)
22+
private void RunTest(GerritCapabilities capability, string[] expectedValues)
2223
{
2324
var publishTypes = capability.PublishTypes
2425
.Select(x => x.Value)

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#---------------------------------#
44

55
# version format
6-
version: 1.3.1.{build}
6+
version: 1.3.2.{build}
77

88
# version suffix, if any (e.g. '-RC1', '-beta' otherwise '')
99
environment:

0 commit comments

Comments
 (0)