From 304437b834e8c87687f68333ae67a13ee1377a73 Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Wed, 12 Jun 2019 21:47:51 +0200 Subject: Adjust Codestyle --- .../Auxiliary/Calculator/ArgumentTests.cs | 39 ++++------- .../Auxiliary/Calculator/StringSolverTests.cs | 79 +++++++++------------- dsa/NUnitTestProject1/Auxiliary/DiceTests.cs | 53 ++++++--------- 3 files changed, 68 insertions(+), 103 deletions(-) (limited to 'dsa/NUnitTestProject1/Auxiliary') diff --git a/dsa/NUnitTestProject1/Auxiliary/Calculator/ArgumentTests.cs b/dsa/NUnitTestProject1/Auxiliary/Calculator/ArgumentTests.cs index 3e8dbeb..cf2c1b4 100644 --- a/dsa/NUnitTestProject1/Auxiliary/Calculator/ArgumentTests.cs +++ b/dsa/NUnitTestProject1/Auxiliary/Calculator/ArgumentTests.cs @@ -2,39 +2,29 @@ using DSALib.Auxiliary.Calculator; using Moq; using NUnit.Framework; -namespace NUnitTest.Auxiliary.Calculator -{ +namespace NUnitTest.Auxiliary.Calculator { [TestFixture] - public class ArgumentTests - { - private MockRepository mockRepository; - - - + public class ArgumentTests { [SetUp] - public void SetUp() - { - this.mockRepository = new MockRepository(MockBehavior.Strict); - - + public void SetUp() { + mockRepository = new MockRepository(MockBehavior.Strict); } [TearDown] - public void TearDown() - { - this.mockRepository.VerifyAll(); + public void TearDown() { + mockRepository.VerifyAll(); } - private Argument CreateArgument() - { + private MockRepository mockRepository; + + private Argument CreateArgument() { return new Argument("3"); } [Test] - public void Solve_StateUnderTest_ExpectedBehavior() - { + public void Solve_StateUnderTest_ExpectedBehavior() { // Arrange - var unitUnderTest = this.CreateArgument(); + var unitUnderTest = CreateArgument(); // Act var result = unitUnderTest.Solve(); @@ -44,10 +34,9 @@ namespace NUnitTest.Auxiliary.Calculator } [Test] - public void ToString_StateUnderTest_ExpectedBehavior() - { + public void ToString_StateUnderTest_ExpectedBehavior() { // Arrange - var unitUnderTest = this.CreateArgument(); + var unitUnderTest = CreateArgument(); // Act var result = unitUnderTest.ToString(); @@ -56,4 +45,4 @@ namespace NUnitTest.Auxiliary.Calculator Assert.AreEqual("3", result); } } -} +} \ No newline at end of file diff --git a/dsa/NUnitTestProject1/Auxiliary/Calculator/StringSolverTests.cs b/dsa/NUnitTestProject1/Auxiliary/Calculator/StringSolverTests.cs index 998a78b..877d871 100644 --- a/dsa/NUnitTestProject1/Auxiliary/Calculator/StringSolverTests.cs +++ b/dsa/NUnitTestProject1/Auxiliary/Calculator/StringSolverTests.cs @@ -1,99 +1,86 @@ +using System; using DSALib.Auxiliary.Calculator; using Moq; using NUnit.Framework; -namespace NUnitTest.Auxiliary.Calculator -{ +namespace NUnitTest.Auxiliary.Calculator { [TestFixture] - public class StringSolverTests - { - private MockRepository mockRepository; - - - + public class StringSolverTests { [SetUp] - public void SetUp() - { - this.mockRepository = new MockRepository(MockBehavior.Strict); - - + public void SetUp() { + mockRepository = new MockRepository(MockBehavior.Strict); } [TearDown] - public void TearDown() - { - this.mockRepository.VerifyAll(); + public void TearDown() { + mockRepository.VerifyAll(); } - private StringSolver CreateStringSolver(string input) - { + private MockRepository mockRepository; + + private StringSolver CreateStringSolver(string input) { return new StringSolver(input); } [Test] - public void Solve_StateUnderTest_ExpectedBehavior() - { + public void Solve_braces() { // Arrange - var unitUnderTest = this.CreateStringSolver("1+1"); + var unitUnderTest = CreateStringSolver("1+(1-4)*6+2"); // Act var result = unitUnderTest.Solve(); // Assert - Assert.AreEqual(2,result); + Assert.AreEqual(-15, result); } [Test] - public void Solve_mult() - { + [MaxTime(200)] + public void Solve_braces_timeout() { // Arrange - var unitUnderTest = this.CreateStringSolver("1+1-4*6+2"); + var unitUnderTest = CreateStringSolver("1+(1-(4)*6+2"); // Act - var result = unitUnderTest.Solve(); - - // Assert - Assert.AreEqual(-20, result); + Assert.Throws(() => unitUnderTest.Solve(), "Invalid brace sequence"); } [Test] - public void Solve_braces() - { + public void Solve_mult() { // Arrange - var unitUnderTest = this.CreateStringSolver("1+(1-4)*6+2"); + var unitUnderTest = CreateStringSolver("1+1-4*6+2"); // Act var result = unitUnderTest.Solve(); // Assert - Assert.AreEqual(-15, result); + Assert.AreEqual(-20, result); } [Test] - public void Solve_wrong_braces() - { + public void Solve_StateUnderTest_ExpectedBehavior() { // Arrange - var unitUnderTest = this.CreateStringSolver("1+)(1-4)*6+2"); + var unitUnderTest = CreateStringSolver("1+1"); // Act - Assert.Throws(() =>unitUnderTest.Solve(), "Invalid brace sequence"); + var result = unitUnderTest.Solve(); + + // Assert + Assert.AreEqual(2, result); } - [Test, MaxTime(200)] - public void Solve_braces_timeout() - { + [Test] + public void Solve_wrong_braces() { // Arrange - var unitUnderTest = this.CreateStringSolver("1+(1-(4)*6+2"); + var unitUnderTest = CreateStringSolver("1+)(1-4)*6+2"); // Act - Assert.Throws(() => unitUnderTest.Solve(), "Invalid brace sequence"); + Assert.Throws(() => unitUnderTest.Solve(), "Invalid brace sequence"); } [Test] - public void ToString_StateUnderTest_ExpectedBehavior() - { + public void ToString_StateUnderTest_ExpectedBehavior() { // Arrange - var unitUnderTest = this.CreateStringSolver("3+-4"); + var unitUnderTest = CreateStringSolver("3+-4"); // Act var result = unitUnderTest.ToString(); @@ -102,4 +89,4 @@ namespace NUnitTest.Auxiliary.Calculator Assert.AreEqual("(0+3+-4)", result); } } -} +} \ No newline at end of file diff --git a/dsa/NUnitTestProject1/Auxiliary/DiceTests.cs b/dsa/NUnitTestProject1/Auxiliary/DiceTests.cs index 6b37492..9f9c208 100644 --- a/dsa/NUnitTestProject1/Auxiliary/DiceTests.cs +++ b/dsa/NUnitTestProject1/Auxiliary/DiceTests.cs @@ -1,63 +1,52 @@ +using System; using DSALib.Auxiliary; using Moq; using NUnit.Framework; -using System; -namespace NUnitTest.Auxiliary -{ +namespace NUnitTest.Auxiliary { [TestFixture] - public class DiceTests - { - private MockRepository mockRepository; - - - + public class DiceTests { [SetUp] - public void SetUp() - { - this.mockRepository = new MockRepository(MockBehavior.Strict); - - + public void SetUp() { + mockRepository = new MockRepository(MockBehavior.Strict); } [TearDown] - public void TearDown() - { - this.mockRepository.VerifyAll(); + public void TearDown() { + mockRepository.VerifyAll(); } - private void CreateDice() - {} + private MockRepository mockRepository; + + private void CreateDice() { + } [Test] - public void Roll_StateUnderTest_ExpectedBehavior() - { + public void Roll_StateUnderTest_ExpectedBehavior() { // Arrange - int d = 20; + var d = 20; // Act var result = Dice.Roll(d); // Assert - Assert.True(result > 0 && result < d+1); + Assert.True(result > 0 && result < d + 1); } [Test] - public void Roll_StateUnderTest_ExpectedBehavior1() - { + public void Roll_StateUnderTest_ExpectedBehavior1() { // Arrange - string input = "w"; + var input = "w"; // Act - Assert.Throws( () => Dice.Roll(input)); + Assert.Throws(() => Dice.Roll(input)); } [Test] - public void Roll_zero_dice() - { + public void Roll_zero_dice() { // Arrange - int count = 0; - int d = 2; + var count = 0; + var d = 2; // Act var result = Dice.Roll( @@ -68,4 +57,4 @@ namespace NUnitTest.Auxiliary Assert.AreEqual(0, result); } } -} +} \ No newline at end of file -- cgit v1.2.3-70-g09d2