Index: src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs =================================================================== diff -u -r312 -r313 --- src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs (.../ControlTester.cs) (revision 312) +++ src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs (.../ControlTester.cs) (revision 313) @@ -1,5 +1,6 @@ using System.Reflection; using System.Windows.Forms; +using Deltares.Standard; using Deltares.Standard.Forms.DExpress; using Deltares.Standard.Language; using DevExpress.XtraEditors; @@ -11,6 +12,7 @@ { private bool oldBypass; private LanguageType oldLanguage; + private IContext oldContext; [TestFixtureSetUp] public virtual void TestFixtureSetUp() @@ -20,13 +22,17 @@ oldLanguage = LocalizationManager.CurrentLanguage; LocalizationManager.CurrentLanguage = LanguageType.English; + + oldContext = Context.CurrentContext; + Context.CurrentContext = new DSoilModelContext(); } [TestFixtureTearDown] public virtual void TestFixtureTearDown() { BindSupport.BypassTimerForUnitTest = oldBypass; LocalizationManager.CurrentLanguage = oldLanguage; + Context.CurrentContext = oldContext; } protected object GetPrivateField(object obj, string field)