Skip to content
This repository was archived by the owner on Jan 6, 2021. It is now read-only.

Backported some fixes from GitVersion into GitTools.Testing #1

Merged
merged 1 commit into from
Jan 27, 2016
Merged

Backported some fixes from GitVersion into GitTools.Testing #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/GitTools.Testing.NET4/Fixtures/RepositoryFixtureBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ namespace GitTools.Testing
/// </summary>
public abstract class RepositoryFixtureBase : IDisposable
{
private static readonly ILog Logger = LogProvider.For<RepositoryFixtureBase>();
private readonly SequenceDiagram _sequenceDiagram;
static readonly ILog Logger = LogProvider.For<RepositoryFixtureBase>();
readonly SequenceDiagram _sequenceDiagram;

protected RepositoryFixtureBase(Func<string, IRepository> repoBuilder)
: this(repoBuilder(PathHelper.GetTempPath()))
Expand Down
8 changes: 4 additions & 4 deletions src/GitTools.Testing.NET4/GitTestExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ public static class GitTestExtensions
{
static int _pad = 1;

public static Commit MakeACommit(this IRepository repository)
public static Commit MakeACommit(this IRepository repository, string commitMessage = null)
{
return CreateFileAndCommit(repository, Guid.NewGuid().ToString());
return CreateFileAndCommit(repository, Guid.NewGuid().ToString(), commitMessage);
}

public static void MergeNoFF(this IRepository repository, string branch)
Expand All @@ -34,7 +34,7 @@ public static Commit[] MakeCommits(this IRepository repository, int numCommitsTo
.ToArray();
}

public static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName)
public static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName, string commitMessage = null)
{
var randomFile = Path.Combine(repository.Info.WorkingDirectory, relativeFileName);
if (File.Exists(randomFile))
Expand All @@ -48,7 +48,7 @@ public static Commit CreateFileAndCommit(this IRepository repository, string rel

repository.Stage(randomFile);

return repository.Commit(string.Format("Test Commit for file '{0}'", relativeFileName),
return repository.Commit(string.Format("Test Commit for file '{0}' - {1}", relativeFileName, commitMessage),
Generate.SignatureNow(), Generate.SignatureNow());
}

Expand Down
11 changes: 6 additions & 5 deletions src/GitTools.Testing.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
&lt;/Entry.Match&gt;&#xD;
&lt;/Entry&gt;&#xD;
&lt;Entry DisplayName="All other members" /&gt;&#xD;
&lt;Entry DisplayName="Test Methods" Priority="100"&gt;&#xD;
&lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
&lt;Entry.Match&gt;&#xD;
&lt;And&gt;&#xD;
&lt;Kind Is="Method" /&gt;&#xD;
Expand All @@ -50,7 +50,7 @@
&lt;/Entry&gt;&#xD;
&lt;/TypePattern&gt;&#xD;
&lt;TypePattern DisplayName="Default Pattern" RemoveRegions="All"&gt;&#xD;
&lt;Entry DisplayName="Public Delegates" Priority="100"&gt;&#xD;
&lt;Entry Priority="100" DisplayName="Public Delegates"&gt;&#xD;
&lt;Entry.Match&gt;&#xD;
&lt;And&gt;&#xD;
&lt;Access Is="Public" /&gt;&#xD;
Expand All @@ -61,7 +61,7 @@
&lt;Name /&gt;&#xD;
&lt;/Entry.SortBy&gt;&#xD;
&lt;/Entry&gt;&#xD;
&lt;Entry DisplayName="Public Enums" Priority="100"&gt;&#xD;
&lt;Entry Priority="100" DisplayName="Public Enums"&gt;&#xD;
&lt;Entry.Match&gt;&#xD;
&lt;And&gt;&#xD;
&lt;Access Is="Public" /&gt;&#xD;
Expand Down Expand Up @@ -116,7 +116,7 @@
&lt;/Or&gt;&#xD;
&lt;/Entry.Match&gt;&#xD;
&lt;/Entry&gt;&#xD;
&lt;Entry DisplayName="Interface Implementations" Priority="100"&gt;&#xD;
&lt;Entry Priority="100" DisplayName="Interface Implementations"&gt;&#xD;
&lt;Entry.Match&gt;&#xD;
&lt;And&gt;&#xD;
&lt;Kind Is="Member" /&gt;&#xD;
Expand All @@ -137,4 +137,5 @@
&lt;/Patterns&gt;</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>