Browse Source

Fix broken unit test

tags/0.6.3m2a1
Chris Smith 15 years ago
parent
commit
1b2ec9d230
1 changed files with 12 additions and 12 deletions
  1. 12
    12
      test/com/dmdirc/ui/WindowManagerTest.java

+ 12
- 12
test/com/dmdirc/ui/WindowManagerTest.java View File

24
 import com.dmdirc.FrameContainer;
24
 import com.dmdirc.FrameContainer;
25
 import com.dmdirc.harness.TestWritableFrameContainer;
25
 import com.dmdirc.harness.TestWritableFrameContainer;
26
 import com.dmdirc.addons.ui_dummy.DummyInputWindow;
26
 import com.dmdirc.addons.ui_dummy.DummyInputWindow;
27
-import com.dmdirc.ui.interfaces.FrameManager;
27
+import com.dmdirc.ui.interfaces.FrameListener;
28
 import com.dmdirc.ui.interfaces.Window;
28
 import com.dmdirc.ui.interfaces.Window;
29
 
29
 
30
 import org.junit.Test;
30
 import org.junit.Test;
35
 
35
 
36
     @Test
36
     @Test
37
     public void testAddRoot() {
37
     public void testAddRoot() {
38
-        final FrameManager tfm = mock(FrameManager.class);
38
+        final FrameListener tfm = mock(FrameListener.class);
39
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
39
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
40
         
40
         
41
-        WindowManager.addFrameManager(tfm);
41
+        WindowManager.addFrameListener(tfm);
42
 
42
 
43
         verify(tfm, never()).addWindow((FrameContainer) anyObject());
43
         verify(tfm, never()).addWindow((FrameContainer) anyObject());
44
         verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
44
         verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
51
 
51
 
52
     @Test
52
     @Test
53
     public void testAddChild() {
53
     public void testAddChild() {
54
-        final FrameManager tfm = mock(FrameManager.class);
54
+        final FrameListener tfm = mock(FrameListener.class);
55
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
55
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
56
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
56
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
57
         WindowManager.addWindow(parent);
57
         WindowManager.addWindow(parent);
58
-        WindowManager.addFrameManager(tfm);
58
+        WindowManager.addFrameListener(tfm);
59
         
59
         
60
         WindowManager.addWindow(parent, child);
60
         WindowManager.addWindow(parent, child);
61
         
61
         
65
 
65
 
66
     @Test
66
     @Test
67
     public void testRemoveRoot() {
67
     public void testRemoveRoot() {
68
-        final FrameManager tfm = mock(FrameManager.class);
68
+        final FrameListener tfm = mock(FrameListener.class);
69
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
69
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
70
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
70
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
71
         WindowManager.addWindow(parent);
71
         WindowManager.addWindow(parent);
72
-        WindowManager.addFrameManager(tfm);
72
+        WindowManager.addFrameListener(tfm);
73
 
73
 
74
         WindowManager.removeWindow(parent);
74
         WindowManager.removeWindow(parent);
75
         
75
         
78
 
78
 
79
     @Test
79
     @Test
80
     public void testRemoveChild() {
80
     public void testRemoveChild() {
81
-        final FrameManager tfm = mock(FrameManager.class);
81
+        final FrameListener tfm = mock(FrameListener.class);
82
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
82
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
83
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
83
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
84
         WindowManager.addWindow(parent);
84
         WindowManager.addWindow(parent);
85
         WindowManager.addWindow(parent, child);
85
         WindowManager.addWindow(parent, child);
86
-        WindowManager.addFrameManager(tfm);
86
+        WindowManager.addFrameListener(tfm);
87
 
87
 
88
         WindowManager.removeWindow(child);
88
         WindowManager.removeWindow(child);
89
 
89
 
95
 
95
 
96
     @Test
96
     @Test
97
     public void testRemoveFrameManager() {
97
     public void testRemoveFrameManager() {
98
-        final FrameManager tfm = mock(FrameManager.class);
98
+        final FrameListener tfm = mock(FrameListener.class);
99
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
99
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
100
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
100
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
101
         WindowManager.addWindow(parent);
101
         WindowManager.addWindow(parent);
102
         
102
         
103
-        WindowManager.addFrameManager(tfm);
103
+        WindowManager.addFrameListener(tfm);
104
 
104
 
105
-        WindowManager.removeFrameManager(tfm);
105
+        WindowManager.removeFrameListener(tfm);
106
         WindowManager.addWindow(parent, child);
106
         WindowManager.addWindow(parent, child);
107
         
107
         
108
         verify(tfm, never()).addWindow((FrameContainer) anyObject());
108
         verify(tfm, never()).addWindow((FrameContainer) anyObject());

Loading…
Cancel
Save