|
@@ -87,7 +87,7 @@ public class CoreAliasDialogModelTest {
|
87
|
87
|
when(aliasModel.getAliases()).thenReturn(aliases);
|
88
|
88
|
final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
|
89
|
89
|
assertEquals(model.getAliases().size(), 0);
|
90
|
|
- model.addAlias(alias1);
|
|
90
|
+ model.addAlias(alias1.getName(), alias1.getMinArguments(), alias1.getSubstitution());
|
91
|
91
|
assertEquals(model.getAliases().size(), 1);
|
92
|
92
|
}
|
93
|
93
|
|
|
@@ -96,7 +96,7 @@ public class CoreAliasDialogModelTest {
|
96
|
96
|
when(aliasModel.getAliases()).thenReturn(aliases);
|
97
|
97
|
final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
|
98
|
98
|
model.addListener(listener);
|
99
|
|
- model.addAlias(alias1);
|
|
99
|
+ model.addAlias(alias1.getName(), alias1.getMinArguments(), alias1.getSubstitution());
|
100
|
100
|
verify(listener).aliasAdded(alias1);
|
101
|
101
|
}
|
102
|
102
|
|
|
@@ -107,27 +107,17 @@ public class CoreAliasDialogModelTest {
|
107
|
107
|
final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
|
108
|
108
|
assertEquals(model.getAliases().size(), 1);
|
109
|
109
|
assertEquals(model.getAlias("alias1").get().getMinArguments(), 0);
|
110
|
|
- model.editAlias("alias1", alias2Edited);
|
|
110
|
+ model.editAlias("alias1", alias2Edited.getMinArguments(), alias2Edited.getSubstitution());
|
111
|
111
|
assertEquals(model.getAlias("alias1").get().getMinArguments(), 1);
|
112
|
112
|
}
|
113
|
113
|
|
114
|
|
- @Test(expected = IllegalArgumentException.class)
|
115
|
|
- public void testEditAliasFail() {
|
116
|
|
- aliases.add(alias1);
|
117
|
|
- when(aliasModel.getAliases()).thenReturn(aliases);
|
118
|
|
- final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
|
119
|
|
- assertEquals(model.getAliases().size(), 1);
|
120
|
|
- assertEquals(model.getAlias("alias1").get().getMinArguments(), 0);
|
121
|
|
- model.editAlias("alias1", alias2);
|
122
|
|
- }
|
123
|
|
-
|
124
|
114
|
@Test
|
125
|
115
|
public void testEditAliasListener() {
|
126
|
116
|
aliases.add(alias1);
|
127
|
117
|
when(aliasModel.getAliases()).thenReturn(aliases);
|
128
|
118
|
final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
|
129
|
119
|
model.addListener(listener);
|
130
|
|
- model.editAlias("alias1", alias2Edited);
|
|
120
|
+ model.editAlias("alias1", alias2Edited.getMinArguments(), alias2Edited.getSubstitution());
|
131
|
121
|
verify(listener).aliasEdited("alias1");
|
132
|
122
|
}
|
133
|
123
|
|
|
@@ -218,9 +208,9 @@ public class CoreAliasDialogModelTest {
|
218
|
208
|
when(aliasModel.getAliases()).thenReturn(aliases);
|
219
|
209
|
final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
|
220
|
210
|
model.addListener(listener);
|
221
|
|
- model.addAlias(alias1);
|
|
211
|
+ model.addAlias(alias1.getName(), alias1.getMinArguments(), alias1.getSubstitution());
|
222
|
212
|
model.removeListener(listener);
|
223
|
|
- model.addAlias(alias2);
|
|
213
|
+ model.addAlias(alias2.getName(), alias2.getMinArguments(), alias2.getSubstitution());
|
224
|
214
|
verify(listener).aliasAdded(alias1);
|
225
|
215
|
verify(listener, never()).aliasAdded(alias2);
|
226
|
216
|
}
|