ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-05-14 17:44:29 +02:00
parent 28a7157341 ac244c1425
commit 98e3351b6e
3 changed files with 2 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/Dependencies.kt
View File

@@ -25,7 +25,7 @@
object ProjectVersions {
const val launcherVersion = "2.2.0"
const val rlVersion = "1.6.14"
const val rlVersion = "1.6.15"
const val openosrsVersion = "3.3.2"

2
runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
View File

@@ -431,7 +431,7 @@ public class MenuManager
client.setTempMenuEntry(leftClickEntry);
}
private void onMenuOptionClicked(MenuOptionClicked event)
void onMenuOptionClicked(MenuOptionClicked event)
{
// option and target will be the same if this one came from "tempMenuAction"
if (!client.isMenuOpen() && !event.getOption().equals(event.getTarget()) && event.isAuthentic())

95
runelite-client/src/test/java/net/runelite/client/menus/MenuManagerTest.java
View File

@@ -1,95 +0,0 @@
/*
* Copyright (c) 2020, bfmoatbio <bfmoatbio@protonmail.com>
* Copyright (c) 2020, Jordan Atwood <nightfirecat@protonmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.menus;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.testing.fieldbinder.Bind;
import com.google.inject.testing.fieldbinder.BoundFieldModule;
import net.runelite.api.Client;
import net.runelite.api.MenuAction;
import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.events.PlayerMenuOptionClicked;
import net.runelite.client.eventbus.EventBus;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import static org.mockito.Mockito.verify;
import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
@RunWith(MockitoJUnitRunner.class)
public class MenuManagerTest
{
@Inject
private MenuManager menuManager;
@Mock
@Bind
private Client client;
@Mock
@Bind
private EventBus eventBus;
@Before
public void before()
{
Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
}
@Test
public void testPlayerMenuOptionClicked()
{
MenuOptionClicked event = new MenuOptionClicked();
event.setMenuAction(MenuAction.RUNELITE);
event.setMenuTarget("username<col=40ff00> (level-42)");
menuManager.onMenuOptionClicked(event);
ArgumentCaptor<PlayerMenuOptionClicked> captor = ArgumentCaptor.forClass(PlayerMenuOptionClicked.class);
verify(eventBus).post(captor.capture());
PlayerMenuOptionClicked clicked = captor.getValue();
assertEquals("username", clicked.getMenuTarget());
}
@Test
public void testPlayerMenuOptionWithBountyHunterEmblemClicked()
{
MenuOptionClicked event = new MenuOptionClicked();
event.setMenuAction(MenuAction.RUNELITE);
event.setMenuTarget("username<img=20>5<col=40ff00> (level-42)");
menuManager.onMenuOptionClicked(event);
ArgumentCaptor<PlayerMenuOptionClicked> captor = ArgumentCaptor.forClass(PlayerMenuOptionClicked.class);
verify(eventBus).post(captor.capture());
PlayerMenuOptionClicked clicked = captor.getValue();
assertEquals("username", clicked.getMenuTarget());
}
}