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