From 22efc1e2c0489c0e1355d46461bd7c343a61ec20 Mon Sep 17 00:00:00 2001 From: Adam Patridge Date: Sun, 16 Jul 2017 20:43:39 -0600 Subject: [PATCH] Code formatting settings and normalizing code files. --- ...ArgumentOrEnvironmentVariableAliasTests.cs | 188 ++++++++---------- Cake.ArgumentHelpers.sln | 38 ++++ .../ArgumentOrEnvironmentVariableAlias.cs | 32 ++- 3 files changed, 139 insertions(+), 119 deletions(-) diff --git a/Cake.ArgumentHelpers.Tests/ArgumentOrEnvironmentVariableAliasTests.cs b/Cake.ArgumentHelpers.Tests/ArgumentOrEnvironmentVariableAliasTests.cs index a628d33..a54aeae 100644 --- a/Cake.ArgumentHelpers.Tests/ArgumentOrEnvironmentVariableAliasTests.cs +++ b/Cake.ArgumentHelpers.Tests/ArgumentOrEnvironmentVariableAliasTests.cs @@ -2,18 +2,15 @@ using Cake.Core; using Moq; -namespace Cake.ArgumentHelpers.Tests -{ +namespace Cake.ArgumentHelpers.Tests { [TestFixture()] - public class ArgumentOrEnvironmentVariableAliasTests - { + public class ArgumentOrEnvironmentVariableAliasTests { Mock cakeContextMock; Mock cakeArgumentsMock; Mock cakeEnvironmentMock; [SetUp] - public void Setup() - { + public void Setup() { cakeContextMock = new Mock(); cakeArgumentsMock = new Mock(); cakeEnvironmentMock = new Mock(); @@ -21,20 +18,17 @@ namespace Cake.ArgumentHelpers.Tests cakeContextMock.Setup(cakeContext => cakeContext.Environment).Returns(cakeEnvironmentMock.Object); } - void SetupVariables(string key, string environmentPrefix, bool? argumentValue, bool? environmentValue) - { + void SetupVariables(string key, string environmentPrefix, bool? argumentValue, bool? environmentValue) { bool hasArgument = argumentValue != null; - cakeArgumentsMock.Setup(x => x.HasArgument(key)).Returns(hasArgument); - if (hasArgument) - { + cakeArgumentsMock.Setup(x => x.HasArgument(key)).Returns(hasArgument); + if (hasArgument) { cakeArgumentsMock.Setup(x => x.GetArgument(key)).Returns(argumentValue.ToString()); } cakeEnvironmentMock.Setup(x => x.GetEnvironmentVariable(environmentPrefix + key)).Returns(environmentValue != null ? environmentValue.Value.ToString() : null); - } + } [Test] - public void TrueArgumentAndNullEnvironment_ReturnsTrue() - { + public void TrueArgumentAndNullEnvironment_ReturnsTrue() { var testKey = "someVariable"; var testKeyEnvironmentPrefix = "somePrefix_"; bool? testArgumentValue = true; @@ -47,125 +41,117 @@ namespace Cake.ArgumentHelpers.Tests Assert.AreEqual(expected, actual, "Didn't find Argument variable."); } - [Test] - public void FalseArgumentAndNullEnvironment_ReturnsFalse() - { - var testKey = "someVariable"; - var testKeyEnvironmentPrefix = "somePrefix_"; + [Test] + public void FalseArgumentAndNullEnvironment_ReturnsFalse() { + var testKey = "someVariable"; + var testKeyEnvironmentPrefix = "somePrefix_"; bool? testArgumentValue = false; - bool? testEnvironmentValue = null; + bool? testEnvironmentValue = null; - SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); + SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); var expected = false; - var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); + var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); - Assert.AreEqual(expected, actual, "Didn't find Argument variable."); - } - [Test] - public void NullArgumentAndTrueEnvironment_ReturnsTrue() - { - var testKey = "someVariable"; - var testKeyEnvironmentPrefix = "somePrefix_"; - bool? testArgumentValue = null; - bool? testEnvironmentValue = true; + Assert.AreEqual(expected, actual, "Didn't find Argument variable."); + } + [Test] + public void NullArgumentAndTrueEnvironment_ReturnsTrue() { + var testKey = "someVariable"; + var testKeyEnvironmentPrefix = "somePrefix_"; + bool? testArgumentValue = null; + bool? testEnvironmentValue = true; - SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); + SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); - var expected = true; - var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); + var expected = true; + var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); - Assert.AreEqual(expected, actual, "Didn't find Environment variable."); - } - [Test] - public void NullArgumentAndFalseEnvironment_ReturnsFalse() - { - var testKey = "someVariable"; - var testKeyEnvironmentPrefix = "somePrefix_"; - bool? testArgumentValue = null; + Assert.AreEqual(expected, actual, "Didn't find Environment variable."); + } + [Test] + public void NullArgumentAndFalseEnvironment_ReturnsFalse() { + var testKey = "someVariable"; + var testKeyEnvironmentPrefix = "somePrefix_"; + bool? testArgumentValue = null; bool? testEnvironmentValue = false; SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); - var expected = false; - var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); + var expected = false; + var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); - Assert.AreEqual(expected, actual, "Didn't find Environment variable."); - } + Assert.AreEqual(expected, actual, "Didn't find Environment variable."); + } [Test] - public void NullArgumentAndTrueEnvironmentWithoutPrefix_ReturnsTrue() - { - var testKey = "someVariable"; - var testKeyEnvironmentPrefix = (string)null; - bool? testArgumentValue = null; - bool? testEnvironmentValue = true; + public void NullArgumentAndTrueEnvironmentWithoutPrefix_ReturnsTrue() { + var testKey = "someVariable"; + var testKeyEnvironmentPrefix = (string)null; + bool? testArgumentValue = null; + bool? testEnvironmentValue = true; - SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); + SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); - var expected = true; - var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); + var expected = true; + var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); - Assert.AreEqual(expected, actual, "Didn't find Environment variable without prefix."); - } + Assert.AreEqual(expected, actual, "Didn't find Environment variable without prefix."); + } [Test] - public void NullArgumentAndTrueEnvironmentNoPrefixOverload_ReturnsTrue() - { - var testKey = "someVariable"; - var testKeyEnvironmentPrefix = (string)null; - bool? testArgumentValue = null; - bool? testEnvironmentValue = true; + public void NullArgumentAndTrueEnvironmentNoPrefixOverload_ReturnsTrue() { + var testKey = "someVariable"; + var testKeyEnvironmentPrefix = (string)null; + bool? testArgumentValue = null; + bool? testEnvironmentValue = true; - SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); + SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); - var expected = true; - var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, true); + var expected = true; + var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, true); - Assert.AreEqual(expected, actual, "Didn't find Environment variable without prefix."); - } - [Test] - public void TrueArgumentAndTrueEnvironment_ReturnsTrue() - { - var testKey = "someVariable"; - var testKeyEnvironmentPrefix = "somePrefix_"; - bool? testArgumentValue = true; - bool? testEnvironmentValue = true; + Assert.AreEqual(expected, actual, "Didn't find Environment variable without prefix."); + } + [Test] + public void TrueArgumentAndTrueEnvironment_ReturnsTrue() { + var testKey = "someVariable"; + var testKeyEnvironmentPrefix = "somePrefix_"; + bool? testArgumentValue = true; + bool? testEnvironmentValue = true; - SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); + SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); - var expected = true; - var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); + var expected = true; + var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); - Assert.AreEqual(expected, actual, "Didn't find variable value from either source."); - } - [Test] - public void TrueArgumentAndFalseEnvironment_ReturnsTrue() - { - var testKey = "someVariable"; - var testKeyEnvironmentPrefix = "somePrefix_"; - bool? testArgumentValue = true; + Assert.AreEqual(expected, actual, "Didn't find variable value from either source."); + } + [Test] + public void TrueArgumentAndFalseEnvironment_ReturnsTrue() { + var testKey = "someVariable"; + var testKeyEnvironmentPrefix = "somePrefix_"; + bool? testArgumentValue = true; bool? testEnvironmentValue = false; - SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); + SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); - var expected = true; - var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); + var expected = true; + var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); - Assert.AreEqual(expected, actual, "Explicit argument variable didn't override opposite environment variable."); - } - [Test] - public void FalseArgumentAndTrueEnvironment_ReturnsFalse() - { - var testKey = "someVariable"; - var testKeyEnvironmentPrefix = "somePrefix_"; + Assert.AreEqual(expected, actual, "Explicit argument variable didn't override opposite environment variable."); + } + [Test] + public void FalseArgumentAndTrueEnvironment_ReturnsFalse() { + var testKey = "someVariable"; + var testKeyEnvironmentPrefix = "somePrefix_"; bool? testArgumentValue = false; - bool? testEnvironmentValue = true; + bool? testEnvironmentValue = true; - SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); + SetupVariables(testKey, testKeyEnvironmentPrefix, testArgumentValue, testEnvironmentValue); var expected = false; - var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); + var actual = cakeContextMock.Object.ArgumentOrEnvironmentVariable(testKey, testKeyEnvironmentPrefix, true); - Assert.AreEqual(expected, actual, "Explicit argument variable didn't override opposite environment variable."); - } + Assert.AreEqual(expected, actual, "Explicit argument variable didn't override opposite environment variable."); + } } } diff --git a/Cake.ArgumentHelpers.sln b/Cake.ArgumentHelpers.sln index 8e907f9..742caf1 100644 --- a/Cake.ArgumentHelpers.sln +++ b/Cake.ArgumentHelpers.sln @@ -30,4 +30,42 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + Policies = $0 + $0.TextStylePolicy = $1 + $1.NoTabsAfterNonTabs = True + $1.inheritsSet = VisualStudio + $1.inheritsScope = text/plain + $1.scope = text/x-csharp + $0.CSharpFormattingPolicy = $2 + $2.NamespaceBraceStyle = EndOfLine + $2.ClassBraceStyle = EndOfLine + $2.InterfaceBraceStyle = EndOfLine + $2.StructBraceStyle = EndOfLine + $2.EnumBraceStyle = EndOfLine + $2.MethodBraceStyle = EndOfLine + $2.ConstructorBraceStyle = EndOfLine + $2.DestructorBraceStyle = EndOfLine + $2.ElseNewLinePlacement = NewLine + $2.BeforeMethodDeclarationParentheses = False + $2.BeforeMethodCallParentheses = False + $2.BeforeConstructorDeclarationParentheses = False + $2.BeforeIndexerDeclarationBracket = False + $2.BeforeDelegateDeclarationParentheses = False + $2.AfterDelegateDeclarationParameterComma = True + $2.NewParentheses = False + $2.SpacesBeforeBrackets = False + $2.inheritsSet = Mono + $2.inheritsScope = text/x-csharp + $2.scope = text/x-csharp + $2.NewLinesForBracesInTypes = False + $2.NewLinesForBracesInMethods = False + $2.SpacingAfterMethodDeclarationName = False + $2.SpaceAfterMethodCallName = False + $2.SpaceBeforeOpenSquareBracket = False + $0.DotNetNamingPolicy = $3 + $3.DirectoryNamespaceAssociation = None + $3.ResourceNamePolicy = FileFormatDefault + StartupItem = Smudges.iOS\Smudges.iOS.csproj + EndGlobalSection EndGlobal diff --git a/Cake.ArgumentHelpers/ArgumentOrEnvironmentVariableAlias.cs b/Cake.ArgumentHelpers/ArgumentOrEnvironmentVariableAlias.cs index 8d3d943..23b5185 100644 --- a/Cake.ArgumentHelpers/ArgumentOrEnvironmentVariableAlias.cs +++ b/Cake.ArgumentHelpers/ArgumentOrEnvironmentVariableAlias.cs @@ -3,38 +3,34 @@ using Cake.Core; using Cake.Core.Annotations; using Cake.Common; -namespace Cake.ArgumentHelpers -{ +namespace Cake.ArgumentHelpers { /// /// Contains Aliases for helping work with combinations of Argument and Environment variables. /// [CakeAliasCategory("Argument")] [CakeAliasCategory("Environment")] - public static class ArgumentOrEnvironmentVariableAlias - { + public static class ArgumentOrEnvironmentVariableAlias { /// /// Get a bool variable from various script inputs: first via Argument, then falling back on EnvironmentVariable, finally falling back on a default. /// /// An optional prefix used to qualify the same variable name when present in EnvironmentVariable form (e.g., "MySetting" command-line argument vs. "MyTool_MySetting" environment variable). /// Value found or default, first checked in command-line argument, then environment variable. [CakeMethodAlias] - [CakeAliasCategory("Argument")] - [CakeAliasCategory("Environment")] - public static bool ArgumentOrEnvironmentVariable(this ICakeContext context, string name, string environmentNamePrefix, bool defaultValue) - { + [CakeAliasCategory("Argument")] + [CakeAliasCategory("Environment")] + public static bool ArgumentOrEnvironmentVariable(this ICakeContext context, string name, string environmentNamePrefix, bool defaultValue) { return ArgumentAliases.Argument(context, name, EnvironmentAliases.EnvironmentVariable(context, (environmentNamePrefix ?? "") + name) ?? defaultValue.ToString()).Equals("true", StringComparison.OrdinalIgnoreCase); } - /// - /// Get a bool variable from various script inputs: first via Argument, then falling back on EnvironmentVariable, finally falling back on a default. - /// - /// Value found or default, first checked in command-line argument, then environment variable. - [CakeMethodAlias] - [CakeAliasCategory("Argument")] - [CakeAliasCategory("Environment")] - public static bool ArgumentOrEnvironmentVariable(this ICakeContext context, string name, bool defaultValue) - { + /// + /// Get a bool variable from various script inputs: first via Argument, then falling back on EnvironmentVariable, finally falling back on a default. + /// + /// Value found or default, first checked in command-line argument, then environment variable. + [CakeMethodAlias] + [CakeAliasCategory("Argument")] + [CakeAliasCategory("Environment")] + public static bool ArgumentOrEnvironmentVariable(this ICakeContext context, string name, bool defaultValue) { return context.ArgumentOrEnvironmentVariable(name, null, defaultValue); - } + } } }