11using System ;
2- using Microsoft . VisualStudio . TestTools . UnitTesting ;
2+ using NUnit . Framework ;
33using Moq ;
44using Rubberduck . Common . Hotkeys ;
55using Rubberduck . Settings ;
66using Rubberduck . UI . Command ;
77
88namespace RubberduckTests . Settings
99{
10- [ TestClass ]
10+ [ TestFixture ]
1111 public class HotkeyFactoryTests
1212 {
13- [ TestMethod ]
13+ [ Test ]
1414 public void CreatingHotkeyReturnsNullWhenNoSettingProvided ( )
1515 {
1616 var factory = new HotkeyFactory ( null ) ;
@@ -20,7 +20,7 @@ public void CreatingHotkeyReturnsNullWhenNoSettingProvided()
2020 Assert . IsNull ( hotkey ) ;
2121 }
2222
23- [ TestMethod ]
23+ [ Test ]
2424 public void CreatingHotkeyReturnsNullWhenNoMatchingCommandExists ( )
2525 {
2626 var mockCommand = new Mock < CommandBase > ( null ) . Object ;
@@ -32,7 +32,7 @@ public void CreatingHotkeyReturnsNullWhenNoMatchingCommandExists()
3232 Assert . IsNull ( hotkey ) ;
3333 }
3434
35- [ TestMethod ]
35+ [ Test ]
3636 public void CreatingHotkeyReturnsCorrectResult ( )
3737 {
3838 var mockCommand = new Mock < CommandBase > ( null ) . Object ;
@@ -46,9 +46,10 @@ public void CreatingHotkeyReturnsCorrectResult()
4646
4747 var hotkey = factory . Create ( setting , IntPtr . Zero ) ;
4848
49- MultiAssert . Aggregate (
50- ( ) => Assert . AreEqual ( mockCommand , hotkey . Command ) ,
51- ( ) => Assert . AreEqual ( setting . ToString ( ) , hotkey . Key ) ) ;
49+ Assert . Multiple ( ( ) => {
50+ Assert . AreEqual ( mockCommand , hotkey . Command ) ;
51+ Assert . AreEqual ( setting . ToString ( ) , hotkey . Key ) ;
52+ } ) ;
5253 }
5354 }
5455}
0 commit comments