@@ -9,65 +9,65 @@ namespace System.Windows.Forms.Design.Tests;
9
9
10
10
public class ChangeToolStripParentVerbTests : IDisposable
11
11
{
12
+ private readonly Mock < IDesignerHost > _designerHostMock = new ( ) ;
13
+ private readonly Mock < IServiceProvider > _serviceProviderMock = new ( ) ;
14
+ private readonly Mock < ISite > _siteMock = new ( ) ;
15
+ private readonly Mock < IComponentChangeService > _componentChangeServiceMock = new ( ) ;
12
16
private readonly ToolStripDesigner _designer = new ( ) ;
13
- private readonly ToolStrip _toolStrip ;
14
-
15
- public ChangeToolStripParentVerbTests ( )
16
- {
17
- _toolStrip = MockToolStrip ( ) ;
18
- _designer . Initialize ( _toolStrip ) ;
19
- }
17
+ private ToolStrip _toolStrip = new ( ) ;
20
18
21
19
public void Dispose ( )
22
20
{
23
21
_toolStrip ? . Dispose ( ) ;
24
22
_designer . Dispose ( ) ;
25
23
}
26
24
27
- private ToolStrip MockToolStrip ( )
25
+ private ToolStrip MockMinimalControl ( )
28
26
{
29
- Mock < ISite > mockSite = new ( ) ;
30
27
Mock < ISelectionService > mockSelectionService = new ( ) ;
31
- mockSite . Setup ( s => s . GetService ( typeof ( ISelectionService ) ) ) . Returns ( mockSelectionService . Object ) ;
32
-
33
- Mock < IDesignerHost > mockDesignerHost = new ( ) ;
34
- mockSite . Setup ( s => s . GetService ( typeof ( IDesignerHost ) ) ) . Returns ( mockDesignerHost . Object ) ;
35
-
36
- Mock < IComponentChangeService > mockComponentChangeService = new ( ) ;
37
- mockDesignerHost
28
+ _siteMock
29
+ . Setup ( s => s . GetService ( typeof ( ISelectionService ) ) )
30
+ . Returns ( mockSelectionService . Object ) ;
31
+ _siteMock
32
+ . Setup ( s => s . GetService ( typeof ( IDesignerHost ) ) )
33
+ . Returns ( _designerHostMock . Object ) ;
34
+ _serviceProviderMock
35
+ . Setup ( s => s . GetService ( typeof ( IDesignerHost ) ) )
36
+ . Returns ( _designerHostMock . Object ) ;
37
+ _serviceProviderMock
38
+ . Setup ( s => s . GetService ( typeof ( IComponentChangeService ) ) )
39
+ . Returns ( new Mock < IComponentChangeService > ( ) . Object ) ;
40
+ _designerHostMock
38
41
. Setup ( dh => dh . GetService ( typeof ( IComponentChangeService ) ) )
39
- . Returns ( mockComponentChangeService . Object ) ;
42
+ . Returns ( _componentChangeServiceMock . Object ) ;
43
+ _designerHostMock
44
+ . Setup ( dh => dh . GetDesigner ( It . IsAny < IComponent > ( ) ) )
45
+ . Returns ( new Mock < ParentControlDesigner > ( ) . Object ) ;
40
46
41
- ToolStrip toolStrip = new ( ) { Site = mockSite . Object } ;
47
+ ToolStrip toolStrip = new ( ) { Site = _siteMock . Object } ;
42
48
43
49
return toolStrip ;
44
50
}
45
51
46
52
[ Fact ]
47
- public void Constructor_WithNullDesigner_Throws ( )
53
+ public void ChangeParent_WithoutDesignerActionUIService_DoesNotChangeParent ( )
48
54
{
49
- Action action = ( ) => new ChangeToolStripParentVerb ( null ) ;
50
-
51
- action . Should ( ) . Throw < Exception > ( ) ;
52
- }
55
+ Control ? oldParent = _toolStrip . Parent ;
56
+ _toolStrip = MockMinimalControl ( ) ;
57
+ _designer . Initialize ( _toolStrip ) ;
53
58
54
- [ Fact ]
55
- public void ChangeParent_DeepestPossibleTest ( )
56
- {
57
- var changeToolStripParentVerb = new ChangeToolStripParentVerb ( _designer ) ;
59
+ ChangeToolStripParentVerb changeToolStripParentVerb = new ( _designer ) ;
58
60
59
61
changeToolStripParentVerb . ChangeParent ( ) ;
60
-
61
- throw new NotImplementedException ( ) ;
62
+ Control ? newParent = _toolStrip . Parent ;
63
+ newParent . Should ( ) . Be ( oldParent ) ;
62
64
}
63
65
64
66
[ Fact ]
65
- public void ChangeParent_WithNullRootDesigner_DoesNotChangesParent ( )
67
+ public void Constructor_WithNullDesigner_Throws ( )
66
68
{
67
- var changeToolStripParentVerb = new ChangeToolStripParentVerb ( _designer ) ;
68
-
69
- changeToolStripParentVerb . ChangeParent ( ) ;
69
+ Action action = ( ) => new ChangeToolStripParentVerb ( null ) ;
70
70
71
- throw new NotImplementedException ( ) ;
71
+ action . Should ( ) . Throw < Exception > ( ) ;
72
72
}
73
73
}
0 commit comments