Skip to content

Commit 0f38f19

Browse files
committed
Improve executeas() test
1 parent eeceb29 commit 0f38f19

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/main/java/com/laytonsmith/core/functions/DataHandling.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3267,7 +3267,7 @@ public Construct exec(Target t, Environment environment, Construct... args) thro
32673267
GlobalEnv gEnv = closure.getEnv().getEnv(GlobalEnv.class);
32683268

32693269
MCCommandSender originalSender = cEnv.GetCommandSender();
3270-
cEnv.SetCommandSender(Static.GetCommandSender(args[0].val(), t));
3270+
cEnv.SetCommandSender(Static.GetPlayer(args[0].val(), t));
32713271

32723272
String originalLabel = gEnv.GetLabel();
32733273
if(!(args[1] instanceof CNull)) {

src/test/java/com/laytonsmith/core/functions/DataHandlingTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public static void tearDownClass() throws Exception {
4949
public void setUp() {
5050
fakePlayer = StaticTest.GetOnlinePlayer();
5151
fakeServer = StaticTest.GetFakeServer();
52-
when(fakeServer.getPlayer(fakePlayer.getName())).thenReturn(fakePlayer);
5352
env.getEnv(CommandHelperEnvironment.class).SetPlayer(fakePlayer);
5453
}
5554

@@ -478,11 +477,12 @@ public void testClosure9() throws Exception {
478477

479478
@Test(timeout = 10000)
480479
public void testClosure10() throws Exception {
481-
SRun("@a = closure(msg('yes'));"
482-
+ "@b = closure(msg('no'));"
483-
+ "executeas('" + fakePlayer.getName() + "', null, @a);"
484-
+ "execute(@b);", fakeServer.getConsole());
485-
verify(fakePlayer).sendMessage("yes");
480+
MCPlayer fakePlayer2 = StaticTest.GetOnlinePlayer("Player02", fakeServer);
481+
when(fakeServer.getPlayer("Player02")).thenReturn(fakePlayer2);
482+
SRun("@c = closure(){msg(reflect_pull('label'))};"
483+
+ "executeas('Player02', 'newlabel', @c);"
484+
+ "execute(@c);", fakePlayer);
485+
verify(fakePlayer2).sendMessage("newlabel");
486486
}
487487

488488
@Test(timeout = 10000)

0 commit comments

Comments
 (0)