Fix obsolete messages

M-Zuber · M-Zuber · commit 10174ceb45c7 · 2020-10-01T08:07:34.000+03:00
diff --git a/Tests/Features/MyHome.Spec/CategoryManagement/AddingACategorySteps.cs b/Tests/Features/MyHome.Spec/CategoryManagement/AddingACategorySteps.cs
@@ -16,6 +16,12 @@ public class AddingACategorySteps
         private AccountingDataContext _context;
         private ICategoryService<DataClasses.Category> _categoryService;
         private string _categoryName;
+        private readonly ScenarioContext _scenarioContext;
+
+        public AddingACategorySteps(ScenarioContext scenarioContext)
+        {
+            _scenarioContext = scenarioContext;
+        }
 
         [BeforeScenario]
         public void Setup()
@@ -73,7 +79,7 @@ public void GivenThereIsAnotherCategoryWithTheSameName()
             }
             catch (Exception e)
             {
-                ScenarioContext.Current.Add("add_category_result", e);
+                _scenarioContext.Add("add_category_result", e);
             }
         }
 
@@ -86,7 +92,7 @@ public void GivenIHaveEnteredNothingForTheName()
             }
             catch (ArgumentException e)
             {
-                ScenarioContext.Current.Add("add_category_result", e);
+                _scenarioContext.Add("add_category_result", e);
             }
         }
 
@@ -99,14 +105,14 @@ public void WhenIPressAdd()
             }
             catch (Exception e)
             {
-                ScenarioContext.Current.Add("add_category_result", e);
+                _scenarioContext.Add("add_category_result", e);
             }
         }
 
         [Then(@"the handler returns an error indicator")]
         public void TheHandlerReturnsAnErrorIndicator()
         {
-            var exception = ScenarioContext.Current.Get<Exception>("add_category_result");
+            var exception = _scenarioContext.Get<Exception>("add_category_result");
             Assert.IsNotNull(exception);
         }
 
diff --git a/Tests/Features/MyHome.Spec/CategoryManagement/UpdatingCategorySteps.cs b/Tests/Features/MyHome.Spec/CategoryManagement/UpdatingCategorySteps.cs
@@ -14,7 +14,7 @@ namespace MyHome.Spec.CategoryManagement
     public class UpdatingCategorySteps
     {
         private const string AddCategoryResultKey = "add_category_result";
-
+        private readonly ScenarioContext _scenarioContext;
         private AccountingDataContext _context;
         private string _categoryName;
         private string _newName;
@@ -23,6 +23,10 @@ public class UpdatingCategorySteps
 
         ICategoryService<DataClasses.Category> _categoryService;
 
+        public UpdatingCategorySteps(ScenarioContext scenarioContext)
+        {
+            _scenarioContext = scenarioContext;
+        }
         [BeforeScenario]
         public void Setup()
         {
@@ -111,7 +115,7 @@ public void GivenIHaveEnteredNothingForTheName()
             }
             catch (Exception e)
             {
-                ScenarioContext.Current.Add(AddCategoryResultKey, e);
+                _scenarioContext.Add(AddCategoryResultKey, e);
             }
         }
 
@@ -127,7 +131,7 @@ public void WhenIChangeTheNameTo(string newName)
             }
             catch (Exception e)
             {
-                ScenarioContext.Current.Add(AddCategoryResultKey, e);
+                _scenarioContext.Add(AddCategoryResultKey, e);
             }
         }
 
@@ -142,7 +146,7 @@ public void ThenTheCategoryIsUpdated()
         [Then(@"the handler returns an error indicator")]
         public void TheHandlerReturnsAnErrorIndicator()
         {
-            var exception = ScenarioContext.Current.Get<Exception>(AddCategoryResultKey);
+            var exception = _scenarioContext.Get<Exception>(AddCategoryResultKey);
             Assert.IsNotNull(exception);
         }
 
diff --git a/Tests/Features/MyHome.Spec/TransactionManagement/AddingATransactionSteps.cs b/Tests/Features/MyHome.Spec/TransactionManagement/AddingATransactionSteps.cs
@@ -16,6 +16,7 @@ namespace MyHome.Spec.TransactionManagement
     public class AddingATransactionSteps
     {
         const string ExceptionContextKey = "add_transaction_result";
+        private readonly ScenarioContext _scenarioContext;
         private TransactionTypes _transactionType;
         private Transaction _transaction;
         private ITransactionService _transactionService;
@@ -25,6 +26,11 @@ public class AddingATransactionSteps
         private PaymentMethod _paymentMethod;
         private AccountingDataContext _context;
 
+        public AddingATransactionSteps(ScenarioContext scenarioContext)
+        {
+            _scenarioContext = scenarioContext;
+        }
+
         [BeforeScenario]
         public void Setup()
         {
@@ -109,7 +115,7 @@ public void WhenIPressAdd()
             }
             catch (Exception e)
             {
-                ScenarioContext.Current.Add(ExceptionContextKey, e);
+                _scenarioContext.Add(ExceptionContextKey, e);
             }
         }
 
@@ -124,7 +130,7 @@ public void ThenTheTransactionShouldBeAddedToTheList()
         [Then(@"the handler returns an error indicator - '(.*)'")]
         public void ThenTheHandlerReturnsAnErrorIndicator(string errorMessage)
         {
-            var e = ScenarioContext.Current.Get<Exception>(ExceptionContextKey);
+            var e = _scenarioContext.Get<Exception>(ExceptionContextKey);
             Assert.IsNotNull(e);
             Assert.IsInstanceOfType(e, typeof(ArgumentException));
             Assert.AreEqual(errorMessage, e.Message, ignoreCase: true);
diff --git a/Tests/Features/MyHome.Spec/TransactionManagement/EditingATransactionSteps.cs b/Tests/Features/MyHome.Spec/TransactionManagement/EditingATransactionSteps.cs
@@ -26,6 +26,7 @@ public enum Properties
     public class EditingATransactionSteps
     {
         const string ExceptionContextKey = "edit_transaction_result";
+        private readonly ScenarioContext _scenarioContext;
         private TransactionTypes _transactionType;
         private Transaction _transaction;
         private ITransactionService _transactionService;
@@ -35,6 +36,11 @@ public class EditingATransactionSteps
         private PaymentMethod _paymentMethod;
         private AccountingDataContext _context;
 
+        public EditingATransactionSteps(ScenarioContext scenarioContext)
+        {
+            _scenarioContext = scenarioContext;
+        }
+
         [BeforeScenario]
         public void Setup()
         {
@@ -135,7 +141,7 @@ public void WhenIChangeTheTo(Properties propChanging, string value)
             }
             catch (Exception e)
             {
-                ScenarioContext.Current.Add(ExceptionContextKey, e);
+                _scenarioContext.Add(ExceptionContextKey, e);
             }
         }
 
@@ -175,7 +181,7 @@ public void ThenTheTransactionShouldBeAddedToTheList()
         [Then(@"the handler returns an error indicator - '(.*)'")]
         public void ThenTheHandlerReturnsAnErrorIndicator(string errorMessage)
         {
-            var e = ScenarioContext.Current.Get<Exception>(ExceptionContextKey);
+            var e = _scenarioContext.Get<Exception>(ExceptionContextKey);
             Assert.IsNotNull(e);
             Assert.IsInstanceOfType(e, typeof(ArgumentException));
             Assert.AreEqual(errorMessage, e.Message, true);

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,12 @@ public class AddingACategorySteps`
`16`	`16`	`private AccountingDataContext _context;`
`17`	`17`	`private ICategoryService<DataClasses.Category> _categoryService;`
`18`	`18`	`private string _categoryName;`
	`19`	`+ private readonly ScenarioContext _scenarioContext;`
	`20`	`+`
	`21`	`+ public AddingACategorySteps(ScenarioContext scenarioContext)`
	`22`	`+ {`
	`23`	`+ _scenarioContext = scenarioContext;`
	`24`	`+ }`
`19`	`25`
`20`	`26`	`[BeforeScenario]`
`21`	`27`	`public void Setup()`
`@@ -73,7 +79,7 @@ public void GivenThereIsAnotherCategoryWithTheSameName()`
`73`	`79`	`}`
`74`	`80`	`catch (Exception e)`
`75`	`81`	`{`
`76`		`- ScenarioContext.Current.Add("add_category_result", e);`
	`82`	`+ _scenarioContext.Add("add_category_result", e);`
`77`	`83`	`}`
`78`	`84`	`}`
`79`	`85`
`@@ -86,7 +92,7 @@ public void GivenIHaveEnteredNothingForTheName()`
`86`	`92`	`}`
`87`	`93`	`catch (ArgumentException e)`
`88`	`94`	`{`
`89`		`- ScenarioContext.Current.Add("add_category_result", e);`
	`95`	`+ _scenarioContext.Add("add_category_result", e);`
`90`	`96`	`}`
`91`	`97`	`}`
`92`	`98`
`@@ -99,14 +105,14 @@ public void WhenIPressAdd()`
`99`	`105`	`}`
`100`	`106`	`catch (Exception e)`
`101`	`107`	`{`
`102`		`- ScenarioContext.Current.Add("add_category_result", e);`
	`108`	`+ _scenarioContext.Add("add_category_result", e);`
`103`	`109`	`}`
`104`	`110`	`}`
`105`	`111`
`106`	`112`	`[Then(@"the handler returns an error indicator")]`
`107`	`113`	`public void TheHandlerReturnsAnErrorIndicator()`
`108`	`114`	`{`
`109`		`- var exception = ScenarioContext.Current.Get<Exception>("add_category_result");`
	`115`	`+ var exception = _scenarioContext.Get<Exception>("add_category_result");`
`110`	`116`	`Assert.IsNotNull(exception);`
`111`	`117`	`}`
`112`	`118`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace MyHome.Spec.CategoryManagement`
`14`	`14`	`public class UpdatingCategorySteps`
`15`	`15`	`{`
`16`	`16`	`private const string AddCategoryResultKey = "add_category_result";`
`17`		`-`
	`17`	`+ private readonly ScenarioContext _scenarioContext;`
`18`	`18`	`private AccountingDataContext _context;`
`19`	`19`	`private string _categoryName;`
`20`	`20`	`private string _newName;`
`@@ -23,6 +23,10 @@ public class UpdatingCategorySteps`
`23`	`23`
`24`	`24`	`ICategoryService<DataClasses.Category> _categoryService;`
`25`	`25`
	`26`	`+ public UpdatingCategorySteps(ScenarioContext scenarioContext)`
	`27`	`+ {`
	`28`	`+ _scenarioContext = scenarioContext;`
	`29`	`+ }`
`26`	`30`	`[BeforeScenario]`
`27`	`31`	`public void Setup()`
`28`	`32`	`{`
`@@ -111,7 +115,7 @@ public void GivenIHaveEnteredNothingForTheName()`
`111`	`115`	`}`
`112`	`116`	`catch (Exception e)`
`113`	`117`	`{`
`114`		`- ScenarioContext.Current.Add(AddCategoryResultKey, e);`
	`118`	`+ _scenarioContext.Add(AddCategoryResultKey, e);`
`115`	`119`	`}`
`116`	`120`	`}`
`117`	`121`
`@@ -127,7 +131,7 @@ public void WhenIChangeTheNameTo(string newName)`
`127`	`131`	`}`
`128`	`132`	`catch (Exception e)`
`129`	`133`	`{`
`130`		`- ScenarioContext.Current.Add(AddCategoryResultKey, e);`
	`134`	`+ _scenarioContext.Add(AddCategoryResultKey, e);`
`131`	`135`	`}`
`132`	`136`	`}`
`133`	`137`
`@@ -142,7 +146,7 @@ public void ThenTheCategoryIsUpdated()`
`142`	`146`	`[Then(@"the handler returns an error indicator")]`
`143`	`147`	`public void TheHandlerReturnsAnErrorIndicator()`
`144`	`148`	`{`
`145`		`- var exception = ScenarioContext.Current.Get<Exception>(AddCategoryResultKey);`
	`149`	`+ var exception = _scenarioContext.Get<Exception>(AddCategoryResultKey);`
`146`	`150`	`Assert.IsNotNull(exception);`
`147`	`151`	`}`
`148`	`152`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ namespace MyHome.Spec.TransactionManagement`
`16`	`16`	`public class AddingATransactionSteps`
`17`	`17`	`{`
`18`	`18`	`const string ExceptionContextKey = "add_transaction_result";`
	`19`	`+ private readonly ScenarioContext _scenarioContext;`
`19`	`20`	`private TransactionTypes _transactionType;`
`20`	`21`	`private Transaction _transaction;`
`21`	`22`	`private ITransactionService _transactionService;`
`@@ -25,6 +26,11 @@ public class AddingATransactionSteps`
`25`	`26`	`private PaymentMethod _paymentMethod;`
`26`	`27`	`private AccountingDataContext _context;`
`27`	`28`
	`29`	`+ public AddingATransactionSteps(ScenarioContext scenarioContext)`
	`30`	`+ {`
	`31`	`+ _scenarioContext = scenarioContext;`
	`32`	`+ }`
	`33`	`+`
`28`	`34`	`[BeforeScenario]`
`29`	`35`	`public void Setup()`
`30`	`36`	`{`
`@@ -109,7 +115,7 @@ public void WhenIPressAdd()`
`109`	`115`	`}`
`110`	`116`	`catch (Exception e)`
`111`	`117`	`{`
`112`		`- ScenarioContext.Current.Add(ExceptionContextKey, e);`
	`118`	`+ _scenarioContext.Add(ExceptionContextKey, e);`
`113`	`119`	`}`
`114`	`120`	`}`
`115`	`121`
`@@ -124,7 +130,7 @@ public void ThenTheTransactionShouldBeAddedToTheList()`
`124`	`130`	`[Then(@"the handler returns an error indicator - '(.*)'")]`
`125`	`131`	`public void ThenTheHandlerReturnsAnErrorIndicator(string errorMessage)`
`126`	`132`	`{`
`127`		`- var e = ScenarioContext.Current.Get<Exception>(ExceptionContextKey);`
	`133`	`+ var e = _scenarioContext.Get<Exception>(ExceptionContextKey);`
`128`	`134`	`Assert.IsNotNull(e);`
`129`	`135`	`Assert.IsInstanceOfType(e, typeof(ArgumentException));`
`130`	`136`	`Assert.AreEqual(errorMessage, e.Message, ignoreCase: true);`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public enum Properties`
`26`	`26`	`public class EditingATransactionSteps`
`27`	`27`	`{`
`28`	`28`	`const string ExceptionContextKey = "edit_transaction_result";`
	`29`	`+ private readonly ScenarioContext _scenarioContext;`
`29`	`30`	`private TransactionTypes _transactionType;`
`30`	`31`	`private Transaction _transaction;`
`31`	`32`	`private ITransactionService _transactionService;`
`@@ -35,6 +36,11 @@ public class EditingATransactionSteps`
`35`	`36`	`private PaymentMethod _paymentMethod;`
`36`	`37`	`private AccountingDataContext _context;`
`37`	`38`
	`39`	`+ public EditingATransactionSteps(ScenarioContext scenarioContext)`
	`40`	`+ {`
	`41`	`+ _scenarioContext = scenarioContext;`
	`42`	`+ }`
	`43`	`+`
`38`	`44`	`[BeforeScenario]`
`39`	`45`	`public void Setup()`
`40`	`46`	`{`
`@@ -135,7 +141,7 @@ public void WhenIChangeTheTo(Properties propChanging, string value)`
`135`	`141`	`}`
`136`	`142`	`catch (Exception e)`
`137`	`143`	`{`
`138`		`- ScenarioContext.Current.Add(ExceptionContextKey, e);`
	`144`	`+ _scenarioContext.Add(ExceptionContextKey, e);`
`139`	`145`	`}`
`140`	`146`	`}`
`141`	`147`
`@@ -175,7 +181,7 @@ public void ThenTheTransactionShouldBeAddedToTheList()`
`175`	`181`	`[Then(@"the handler returns an error indicator - '(.*)'")]`
`176`	`182`	`public void ThenTheHandlerReturnsAnErrorIndicator(string errorMessage)`
`177`	`183`	`{`
`178`		`- var e = ScenarioContext.Current.Get<Exception>(ExceptionContextKey);`
	`184`	`+ var e = _scenarioContext.Get<Exception>(ExceptionContextKey);`
`179`	`185`	`Assert.IsNotNull(e);`
`180`	`186`	`Assert.IsInstanceOfType(e, typeof(ArgumentException));`
`181`	`187`	`Assert.AreEqual(errorMessage, e.Message, true);`