Skip to content
Snippets Groups Projects
Commit 54cb75bf authored by Zoey76's avatar Zoey76
Browse files

Update to Java 16 

Replaced TestNG with JUnit.
Updated SLF4J from 1.7.30 to 1.7.31.
parent f55c2283
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 179 additions and 281 deletions
.settings/org.eclipse.jdt.core.prefs
+ 3
− 3
View file @ 54cb75bf
...@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= ...@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=14 org.eclipse.jdt.core.compiler.codegen.targetPlatform=16
org.eclipse.jdt.core.compiler.compliance=14 org.eclipse.jdt.core.compiler.compliance=16
org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
...@@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore ...@@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=14 org.eclipse.jdt.core.compiler.source=16
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
......
pom.xml
+ 28
− 24
View file @ 54cb75bf
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.l2jserver</groupId> <groupId>com.l2jserver</groupId>
<artifactId>l2j-server-datapack</artifactId> <artifactId>l2j-server-datapack</artifactId>
<version>2.6.3.0-SNAPSHOT</version> <version>2.6.3.0-SNAPSHOT</version>
<name>L2J DataPack</name> <name>L2J DataPack</name>
<properties> <properties>
<maven.compiler.source>14</maven.compiler.source> <maven.compiler.source>16</maven.compiler.source>
<maven.compiler.target>14</maven.compiler.target> <maven.compiler.target>16</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<slf4j.version>1.7.30</slf4j.version> <slf4j.version>1.7.31</slf4j.version>
<!-- L2J --> <!-- L2J -->
<l2j-server-game.version>2.6.3.0-SNAPSHOT</l2j-server-game.version> <l2j-server-game.version>2.6.3.0-SNAPSHOT</l2j-server-game.version>
<!-- Test --> <!-- Test -->
<testng.version>7.3.0</testng.version> <junit-jupiter.version>5.7.2</junit-jupiter.version>
<easymock.version>4.2</easymock.version> <mockito.version>3.11.2</mockito.version>
<powermock.version>2.0.7</powermock.version>
<!-- Plugins --> <!-- Plugins -->
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
</properties> </properties>
...@@ -34,38 +33,43 @@ ...@@ -34,38 +33,43 @@
</dependency> </dependency>
<!-- Test --> <!-- Test -->
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>testng</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<version>${testng.version}</version> <version>${junit-jupiter.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.easymock</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>easymock</artifactId> <artifactId>junit-jupiter-params</artifactId>
<version>${easymock.version}</version> <version>${junit-jupiter.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.powermock</groupId> <groupId>org.mockito</groupId>
<artifactId>powermock-core</artifactId> <artifactId>mockito-core</artifactId>
<version>${powermock.version}</version> <version>${mockito.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.powermock</groupId> <groupId>org.mockito</groupId>
<artifactId>powermock-api-easymock</artifactId> <artifactId>mockito-junit-jupiter</artifactId>
<version>${powermock.version}</version> <version>${mockito.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.powermock</groupId> <groupId>org.mockito</groupId>
<artifactId>powermock-module-testng</artifactId> <artifactId>mockito-inline</artifactId>
<version>${powermock.version}</version> <version>${mockito.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
......
src/test/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminReloadTest.java
+ 12
− 16
View file @ 54cb75bf
...@@ -19,39 +19,35 @@ ...@@ -19,39 +19,35 @@
package com.l2jserver.datapack.handlers.admincommandhandlers; package com.l2jserver.datapack.handlers.admincommandhandlers;
import static com.l2jserver.gameserver.config.Configuration.general; import static com.l2jserver.gameserver.config.Configuration.general;
import static org.easymock.EasyMock.anyString; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.easymock.EasyMock.expect; import static org.mockito.Mockito.when;
import static org.easymock.EasyMock.expectLastCall;
import static org.powermock.api.easymock.PowerMock.replay;
import static org.testng.Assert.assertFalse;
import org.powermock.api.easymock.annotation.Mock; import org.junit.jupiter.api.Test;
import org.testng.annotations.Test; import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import com.l2jserver.datapack.test.AbstractTest;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/** /**
* Admin Reload test. * Admin Reload test.
* @author Zoey76 * @author Zoey76
* @version 2.6.1.0 * @version 2.6.3.0
*/ */
public class AdminReloadTest extends AbstractTest { @ExtendWith(MockitoExtension.class)
public class AdminReloadTest {
@Mock @Mock
private L2PcInstance player; private L2PcInstance player;
private final AdminReload adminReload = new AdminReload(); private static final AdminReload ADMIN_RELOAD = new AdminReload();
@Test @Test
public void useAdminCommandTest() { public void useAdminCommandTest() {
general().setProperty("ServerListBrackets", "True"); general().setProperty("ServerListBrackets", "True");
expect(player.getName()).andReturn("Zoey76"); when(player.getName()).thenReturn("Zoey76");
player.sendMessage(anyString());
expectLastCall();
replay(player);
adminReload.useAdminCommand("admin_reload config general", player); ADMIN_RELOAD.useAdminCommand("admin_reload config general", player);
assertFalse(general().getServerListBrackets()); assertFalse(general().getServerListBrackets());
} }
} }
src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantBetrayTest.java
+ 55
− 84
View file @ 54cb75bf
...@@ -18,21 +18,17 @@ ...@@ -18,21 +18,17 @@
*/ */
package com.l2jserver.datapack.handlers.effecthandlers.instant; package com.l2jserver.datapack.handlers.effecthandlers.instant;
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK; import static org.mockito.Mockito.mockStatic;
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import static org.mockito.Mockito.when;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.powermock.api.easymock.PowerMock.mockStatic;
import static org.powermock.api.easymock.PowerMock.replayAll;
import java.util.Map; import java.util.Map;
import org.powermock.api.easymock.annotation.Mock; import org.junit.jupiter.api.BeforeAll;
import org.powermock.core.classloader.annotations.PrepareForTest; import org.junit.jupiter.api.Test;
import org.testng.annotations.BeforeSuite; import org.junit.jupiter.api.extension.ExtendWith;
import org.testng.annotations.Test; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import com.l2jserver.datapack.test.AbstractTest;
import com.l2jserver.gameserver.ai.L2CharacterAI; import com.l2jserver.gameserver.ai.L2CharacterAI;
import com.l2jserver.gameserver.model.StatsSet; import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Attackable; import com.l2jserver.gameserver.model.actor.L2Attackable;
...@@ -45,13 +41,10 @@ import com.l2jserver.gameserver.model.stats.Formulas; ...@@ -45,13 +41,10 @@ import com.l2jserver.gameserver.model.stats.Formulas;
/** /**
* Betray instant effect test. * Betray instant effect test.
* @author Zoey76 * @author Zoey76
* @version 2.6.2.0 * @version 2.6.3.0
*/ */
@PrepareForTest({ @ExtendWith(MockitoExtension.class)
BuffInfo.class, public class InstantBetrayTest {
Formulas.class
})
public class InstantBetrayTest extends AbstractTest {
@Mock @Mock
private BuffInfo buffInfo; private BuffInfo buffInfo;
...@@ -70,10 +63,11 @@ public class InstantBetrayTest extends AbstractTest { ...@@ -70,10 +63,11 @@ public class InstantBetrayTest extends AbstractTest {
@Mock @Mock
private L2CharacterAI creatureAI; private L2CharacterAI creatureAI;
private InstantBetray effect; private static InstantBetray effect;
@BeforeSuite @BeforeAll
void init() { static void init() {
mockStatic(Formulas.class);
final var set = new StatsSet(Map.of("name", "InstantBetray")); final var set = new StatsSet(Map.of("name", "InstantBetray"));
final var params = new StatsSet(Map.of("chance", "80", "time", "30")); final var params = new StatsSet(Map.of("chance", "80", "time", "30"));
effect = new InstantBetray(null, null, set, params); effect = new InstantBetray(null, null, set, params);
...@@ -86,100 +80,77 @@ public class InstantBetrayTest extends AbstractTest { ...@@ -86,100 +80,77 @@ public class InstantBetrayTest extends AbstractTest {
@Test @Test
public void test_effected_is_raid() { public void test_effected_is_raid() {
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffected()).thenReturn(effected);
expect(effected.isRaid()).andReturn(true); when(effected.isRaid()).thenReturn(true);
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
@Test @Test
public void test_effected_not_servitor_summon_raid_minion() { public void test_effected_not_servitor_summon_raid_minion() {
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffected()).thenReturn(effected);
expect(effected.isRaid()).andReturn(false); when(effected.isRaid()).thenReturn(false);
expect(effected.isServitor()).andReturn(false); when(effected.isServitor()).thenReturn(false);
expect(effected.isSummon()).andReturn(false); when(effected.isSummon()).thenReturn(false);
expect(effected.isRaidMinion()).andReturn(false); when(effected.isRaidMinion()).thenReturn(false);
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
@Test @Test
public void test_effected_is_servitor_probability_fail() { public void test_effected_is_servitor_probability_fail() {
mockStatic(Formulas.class); when(buffInfo.getEffected()).thenReturn(effected);
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffector()).thenReturn(effector);
expect(buffInfo.getEffector()).andReturn(effector); when(buffInfo.getSkill()).thenReturn(skill);
expect(buffInfo.getSkill()).andReturn(skill); when(effected.isRaid()).thenReturn(false);
expect(effected.isRaid()).andReturn(false); when(effected.isServitor()).thenReturn(true);
expect(effected.isServitor()).andReturn(true); when(effected.getActingPlayer()).thenReturn(masterPlayer);
expect(effected.getActingPlayer()).andReturn(masterPlayer); when(Formulas.calcProbability(80, effector, effected, skill)).thenReturn(false);
expect(Formulas.calcProbability(80, effector, effected, skill)).andReturn(false);
expect(effected.getAI()).andReturn(creatureAI);
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
@Test @Test
public void test_effected_is_servitor() { public void test_effected_is_servitor() {
mockStatic(Formulas.class); when(buffInfo.getEffected()).thenReturn(effected);
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffector()).thenReturn(effector);
expect(buffInfo.getEffector()).andReturn(effector); when(buffInfo.getSkill()).thenReturn(skill);
expect(buffInfo.getSkill()).andReturn(skill); when(effected.isRaid()).thenReturn(false);
expect(effected.isRaid()).andReturn(false); when(effected.isServitor()).thenReturn(true);
expect(effected.isServitor()).andReturn(true); when(effected.getActingPlayer()).thenReturn(masterPlayer);
expect(effected.getActingPlayer()).andReturn(masterPlayer); when(Formulas.calcProbability(80, effector, effected, skill)).thenReturn(true);
expect(Formulas.calcProbability(80, effector, effected, skill)).andReturn(true); when(effected.getAI()).thenReturn(creatureAI);
expect(effected.getAI()).andReturn(creatureAI);
creatureAI.setIntention(AI_INTENTION_ATTACK, masterPlayer);
expectLastCall();
creatureAI.setIntention(AI_INTENTION_IDLE, masterPlayer);
expectLastCall();
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
@Test @Test
public void test_effected_is_summon() { public void test_effected_is_summon() {
mockStatic(Formulas.class); when(buffInfo.getEffected()).thenReturn(effected);
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffector()).thenReturn(effector);
expect(buffInfo.getEffector()).andReturn(effector); when(buffInfo.getSkill()).thenReturn(skill);
expect(buffInfo.getSkill()).andReturn(skill); when(effected.isRaid()).thenReturn(false);
expect(effected.isRaid()).andReturn(false); when(effected.isServitor()).thenReturn(false);
expect(effected.isServitor()).andReturn(false); when(effected.isSummon()).thenReturn(true);
expect(effected.isSummon()).andReturn(true); when(effected.getActingPlayer()).thenReturn(masterPlayer);
expect(effected.getActingPlayer()).andReturn(masterPlayer); when(Formulas.calcProbability(80, effector, effected, skill)).thenReturn(true);
expect(Formulas.calcProbability(80, effector, effected, skill)).andReturn(true); when(effected.getAI()).thenReturn(creatureAI);
expect(effected.getAI()).andReturn(creatureAI);
creatureAI.setIntention(AI_INTENTION_ATTACK, masterPlayer);
expectLastCall();
creatureAI.setIntention(AI_INTENTION_IDLE, masterPlayer);
expectLastCall();
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
@Test @Test
public void test_effected_is_raid_minion() { public void test_effected_is_raid_minion() {
mockStatic(Formulas.class); when(buffInfo.getEffected()).thenReturn(effectedMinion);
expect(buffInfo.getEffected()).andReturn(effectedMinion); when(buffInfo.getEffector()).thenReturn(effector);
expect(buffInfo.getEffector()).andReturn(effector); when(buffInfo.getSkill()).thenReturn(skill);
expect(buffInfo.getSkill()).andReturn(skill); when(effectedMinion.isRaid()).thenReturn(false);
expect(effectedMinion.isRaid()).andReturn(false); when(effectedMinion.isServitor()).thenReturn(false);
expect(effectedMinion.isServitor()).andReturn(false); when(effectedMinion.isSummon()).thenReturn(false);
expect(effectedMinion.isSummon()).andReturn(false); when(effectedMinion.isRaidMinion()).thenReturn(true);
expect(effectedMinion.isRaidMinion()).andReturn(true); when(effectedMinion.getLeader()).thenReturn(effectedLeader);
expect(effectedMinion.getLeader()).andReturn(effectedLeader); when(Formulas.calcProbability(80, effector, effectedMinion, skill)).thenReturn(true);
expect(Formulas.calcProbability(80, effector, effectedMinion, skill)).andReturn(true); when(effectedMinion.getAI()).thenReturn(creatureAI);
expect(effectedMinion.getAI()).andReturn(creatureAI);
creatureAI.setIntention(AI_INTENTION_ATTACK, effectedLeader);
expectLastCall();
creatureAI.setIntention(AI_INTENTION_IDLE, effectedLeader);
expectLastCall();
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
......
src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantCallTargetPartyTest.java
+ 28
− 35
View file @ 54cb75bf
package com.l2jserver.datapack.handlers.effecthandlers.instant; package com.l2jserver.datapack.handlers.effecthandlers.instant;
import static org.easymock.EasyMock.expect; import static org.mockito.Mockito.when;
import static org.easymock.EasyMock.expectLastCall;
import static org.powermock.api.easymock.PowerMock.replayAll;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.powermock.api.easymock.annotation.Mock; import org.junit.jupiter.api.BeforeAll;
import org.powermock.core.classloader.annotations.PrepareForTest; import org.junit.jupiter.api.Test;
import org.testng.annotations.BeforeSuite; import org.junit.jupiter.api.extension.ExtendWith;
import org.testng.annotations.Test; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import com.l2jserver.datapack.test.AbstractTest;
import com.l2jserver.gameserver.model.L2Party; import com.l2jserver.gameserver.model.L2Party;
import com.l2jserver.gameserver.model.StatsSet; import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character; import com.l2jserver.gameserver.model.actor.L2Character;
...@@ -22,10 +20,10 @@ import com.l2jserver.gameserver.model.skills.BuffInfo; ...@@ -22,10 +20,10 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
/** /**
* Instant Call Target Party effect test. * Instant Call Target Party effect test.
* @author Zoey76 * @author Zoey76
* @version 2.6.2.0 * @version 2.6.3.0
*/ */
@PrepareForTest(BuffInfo.class) @ExtendWith(MockitoExtension.class)
public class InstantCallTargetPartyTest extends AbstractTest { public class InstantCallTargetPartyTest {
@Mock @Mock
private BuffInfo buffInfo; private BuffInfo buffInfo;
...@@ -38,10 +36,10 @@ public class InstantCallTargetPartyTest extends AbstractTest { ...@@ -38,10 +36,10 @@ public class InstantCallTargetPartyTest extends AbstractTest {
@Mock @Mock
private L2PcInstance partyMember; private L2PcInstance partyMember;
private InstantCallTargetParty effect; private static InstantCallTargetParty effect;
@BeforeSuite @BeforeAll
void init() { static void init() {
final var set = new StatsSet(Map.of("name", "InstantBetray")); final var set = new StatsSet(Map.of("name", "InstantBetray"));
final var params = new StatsSet(Map.of("chance", "80", "time", "30")); final var params = new StatsSet(Map.of("chance", "80", "time", "30"));
effect = new InstantCallTargetParty(null, null, set, params); effect = new InstantCallTargetParty(null, null, set, params);
...@@ -49,39 +47,34 @@ public class InstantCallTargetPartyTest extends AbstractTest { ...@@ -49,39 +47,34 @@ public class InstantCallTargetPartyTest extends AbstractTest {
@Test @Test
void test_target_not_in_party() { void test_target_not_in_party() {
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffected()).thenReturn(effected);
expect(effected.isInParty()).andReturn(false); when(effected.isInParty()).thenReturn(false);
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
@Test @Test
void test_target_in_party_cannot_summon_party_member() { void test_target_in_party_cannot_summon_party_member() {
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffected()).thenReturn(effected);
expect(effected.isInParty()).andReturn(true); when(effected.isInParty()).thenReturn(true);
expect(effected.getParty()).andReturn(party); when(effected.getParty()).thenReturn(party);
expect(party.getMembers()).andReturn(List.of(effectedPlayer, partyMember)); when(party.getMembers()).thenReturn(List.of(effectedPlayer, partyMember));
expect(effected.getActingPlayer()).andReturn(effectedPlayer); when(effected.getActingPlayer()).thenReturn(effectedPlayer);
expect(effectedPlayer.canSummonTarget(partyMember)).andReturn(false); when(effectedPlayer.canSummonTarget(partyMember)).thenReturn(false);
expect(effectedPlayer.canSummonTarget(effectedPlayer)).andReturn(false); when(effectedPlayer.canSummonTarget(effectedPlayer)).thenReturn(false);
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
@Test @Test
void test_target_in_party_can_summon_party_member() { void test_target_in_party_can_summon_party_member() {
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffected()).thenReturn(effected);
expect(effected.isInParty()).andReturn(true); when(effected.isInParty()).thenReturn(true);
expect(effected.getParty()).andReturn(party); when(effected.getParty()).thenReturn(party);
expect(party.getMembers()).andReturn(List.of(effectedPlayer, partyMember)); when(party.getMembers()).thenReturn(List.of(effectedPlayer, partyMember));
expect(effected.getActingPlayer()).andReturn(effectedPlayer); when(effected.getActingPlayer()).thenReturn(effectedPlayer);
expect(effectedPlayer.canSummonTarget(partyMember)).andReturn(true); when(effectedPlayer.canSummonTarget(partyMember)).thenReturn(true);
expect(effectedPlayer.canSummonTarget(effectedPlayer)).andReturn(false); when(effectedPlayer.canSummonTarget(effectedPlayer)).thenReturn(false);
partyMember.teleToLocation(effected, true);
expectLastCall();
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
......
src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantDespawnTest.java
+ 28
− 39
View file @ 54cb75bf
...@@ -18,20 +18,18 @@ ...@@ -18,20 +18,18 @@
*/ */
package com.l2jserver.datapack.handlers.effecthandlers.instant; package com.l2jserver.datapack.handlers.effecthandlers.instant;
import static org.easymock.EasyMock.expect; import static org.mockito.Mockito.mockStatic;
import static org.easymock.EasyMock.expectLastCall; import static org.mockito.Mockito.when;
import static org.powermock.api.easymock.PowerMock.mockStatic;
import static org.powermock.api.easymock.PowerMock.replayAll;
import java.util.Map; import java.util.Map;
import org.powermock.api.easymock.annotation.Mock; import org.junit.jupiter.api.BeforeAll;
import org.powermock.core.classloader.annotations.PrepareForTest; import org.junit.jupiter.api.Test;
import org.testng.annotations.BeforeSuite; import org.junit.jupiter.api.extension.ExtendWith;
import org.testng.annotations.Test; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import com.l2jserver.commons.util.Rnd; import com.l2jserver.commons.util.Rnd;
import com.l2jserver.datapack.test.AbstractTest;
import com.l2jserver.gameserver.model.StatsSet; import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character; import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon; import com.l2jserver.gameserver.model.actor.L2Summon;
...@@ -41,13 +39,10 @@ import com.l2jserver.gameserver.model.skills.BuffInfo; ...@@ -41,13 +39,10 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
/** /**
* Despawn instant effect test. * Despawn instant effect test.
* @author Zoey76 * @author Zoey76
* @version 2.6.2.0 * @version 2.6.3.0
*/ */
@PrepareForTest({ @ExtendWith(MockitoExtension.class)
BuffInfo.class, public class InstantDespawnTest {
Rnd.class
})
public class InstantDespawnTest extends AbstractTest {
private static final int CHANCE = 75; private static final int CHANCE = 75;
...@@ -60,10 +55,12 @@ public class InstantDespawnTest extends AbstractTest { ...@@ -60,10 +55,12 @@ public class InstantDespawnTest extends AbstractTest {
@Mock @Mock
private L2Summon summon; private L2Summon summon;
private InstantDespawn effect; private static InstantDespawn effect;
@BeforeSuite @BeforeAll
void init() { static void init() {
mockStatic(Rnd.class);
final var set = new StatsSet(Map.of("name", "InstantDespawn")); final var set = new StatsSet(Map.of("name", "InstantDespawn"));
final var params = new StatsSet(Map.of("chance", CHANCE)); final var params = new StatsSet(Map.of("chance", CHANCE));
effect = new InstantDespawn(null, null, set, params); effect = new InstantDespawn(null, null, set, params);
...@@ -76,45 +73,37 @@ public class InstantDespawnTest extends AbstractTest { ...@@ -76,45 +73,37 @@ public class InstantDespawnTest extends AbstractTest {
@Test @Test
public void test_null_player() { public void test_null_player() {
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffected()).thenReturn(effected);
expect(effected.getActingPlayer()).andReturn(null); when(effected.getActingPlayer()).thenReturn(null);
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
@Test @Test
public void test_null_summon() { public void test_null_summon() {
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffected()).thenReturn(effected);
expect(effected.getActingPlayer()).andReturn(player); when(effected.getActingPlayer()).thenReturn(player);
expect(player.getSummon()).andReturn(null); when(player.getSummon()).thenReturn(null);
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
@Test @Test
public void test_chance_fail() { public void test_chance_fail() {
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffected()).thenReturn(effected);
expect(effected.getActingPlayer()).andReturn(player); when(effected.getActingPlayer()).thenReturn(player);
expect(player.getSummon()).andReturn(summon); when(player.getSummon()).thenReturn(summon);
mockStatic(Rnd.class); when(Rnd.get(100)).thenReturn(CHANCE - 1);
expect(Rnd.get(100)).andReturn(CHANCE - 1);
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
@Test @Test
public void test_chance_success() { public void test_chance_success() {
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffected()).thenReturn(effected);
expect(effected.getActingPlayer()).andReturn(player); when(effected.getActingPlayer()).thenReturn(player);
expect(player.getSummon()).andReturn(summon); when(player.getSummon()).thenReturn(summon);
mockStatic(Rnd.class); when(Rnd.get(100)).thenReturn(CHANCE);
expect(Rnd.get(100)).andReturn(CHANCE);
summon.unSummon(player);
expectLastCall();
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
......
src/test/java/com/l2jserver/datapack/handlers/effecthandlers/instant/InstantDispelByNameTest.java
+ 14
− 23
View file @ 54cb75bf
...@@ -18,18 +18,16 @@ ...@@ -18,18 +18,16 @@
*/ */
package com.l2jserver.datapack.handlers.effecthandlers.instant; package com.l2jserver.datapack.handlers.effecthandlers.instant;
import static org.easymock.EasyMock.expect; import static org.mockito.Mockito.when;
import static org.easymock.EasyMock.expectLastCall;
import static org.powermock.api.easymock.PowerMock.replayAll;
import java.util.Map; import java.util.Map;
import org.powermock.api.easymock.annotation.Mock; import org.junit.jupiter.api.BeforeAll;
import org.powermock.core.classloader.annotations.PrepareForTest; import org.junit.jupiter.api.Test;
import org.testng.annotations.BeforeSuite; import org.junit.jupiter.api.extension.ExtendWith;
import org.testng.annotations.Test; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import com.l2jserver.datapack.test.AbstractTest;
import com.l2jserver.gameserver.model.CharEffectList; import com.l2jserver.gameserver.model.CharEffectList;
import com.l2jserver.gameserver.model.StatsSet; import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character; import com.l2jserver.gameserver.model.actor.L2Character;
...@@ -38,13 +36,10 @@ import com.l2jserver.gameserver.model.skills.BuffInfo; ...@@ -38,13 +36,10 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
/** /**
* Dispel By Name instant effect test. * Dispel By Name instant effect test.
* @author Zoey76 * @author Zoey76
* @version 2.6.2.0 * @version 2.6.3.0
*/ */
@PrepareForTest({ @ExtendWith(MockitoExtension.class)
BuffInfo.class, public class InstantDispelByNameTest {
CharEffectList.class
})
public class InstantDispelByNameTest extends AbstractTest {
private static final int SKILL_ID = 4342; private static final int SKILL_ID = 4342;
...@@ -55,10 +50,10 @@ public class InstantDispelByNameTest extends AbstractTest { ...@@ -55,10 +50,10 @@ public class InstantDispelByNameTest extends AbstractTest {
@Mock @Mock
private CharEffectList effectList; private CharEffectList effectList;
private InstantDispelByName effect; private static InstantDispelByName effect;
@BeforeSuite @BeforeAll
void init() { static void init() {
final var set = new StatsSet(Map.of("name", "InstantDispelByName")); final var set = new StatsSet(Map.of("name", "InstantDispelByName"));
final var params = new StatsSet(Map.of("id", SKILL_ID)); final var params = new StatsSet(Map.of("id", SKILL_ID));
effect = new InstantDispelByName(null, null, set, params); effect = new InstantDispelByName(null, null, set, params);
...@@ -71,12 +66,8 @@ public class InstantDispelByNameTest extends AbstractTest { ...@@ -71,12 +66,8 @@ public class InstantDispelByNameTest extends AbstractTest {
@Test @Test
public void test_effect_dispel() { public void test_effect_dispel() {
expect(buffInfo.getEffected()).andReturn(effected); when(buffInfo.getEffected()).thenReturn(effected);
expect(effected.getEffectList()).andReturn(effectList); when(effected.getEffectList()).thenReturn(effectList);
effectList.stopSkillEffects(true, SKILL_ID);
expectLastCall().once();
replayAll();
effect.onStart(buffInfo); effect.onStart(buffInfo);
} }
......
src/test/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TransformHangoverTest.java
+ 11
− 11
View file @ 54cb75bf
...@@ -20,30 +20,30 @@ package com.l2jserver.datapack.handlers.effecthandlers.pump; ...@@ -20,30 +20,30 @@ package com.l2jserver.datapack.handlers.effecthandlers.pump;
import java.util.Map; import java.util.Map;
import org.powermock.api.easymock.annotation.Mock; import org.junit.jupiter.api.BeforeAll;
import org.powermock.core.classloader.annotations.PrepareForTest; import org.junit.jupiter.api.Test;
import org.testng.annotations.BeforeSuite; import org.junit.jupiter.api.extension.ExtendWith;
import org.testng.annotations.Test; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import com.l2jserver.datapack.test.AbstractTest;
import com.l2jserver.gameserver.model.StatsSet; import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.skills.BuffInfo; import com.l2jserver.gameserver.model.skills.BuffInfo;
/** /**
* Transform Hangover pump effect test. * Transform Hangover pump effect test.
* @author Zoey76 * @author Zoey76
* @version 2.6.2.0 * @version 2.6.3.0
*/ */
@PrepareForTest(BuffInfo.class) @ExtendWith(MockitoExtension.class)
public class TransformHangoverTest extends AbstractTest { public class TransformHangoverTest {
@Mock @Mock
private BuffInfo buffInfo; private BuffInfo buffInfo;
private TransformHangover effect; private static TransformHangover effect;
@BeforeSuite @BeforeAll
void init() { static void init() {
final var set = new StatsSet(Map.of("name", "TransformHangover")); final var set = new StatsSet(Map.of("name", "TransformHangover"));
final var params = new StatsSet(Map.of()); final var params = new StatsSet(Map.of());
effect = new TransformHangover(null, null, set, params); effect = new TransformHangover(null, null, set, params);
......
src/test/java/com/l2jserver/datapack/test/AbstractTest.java deleted 100644 → 0
+ 0
− 46
View file @ f55c2283
/*
* Copyright © 2004-2021 L2J DataPack
*
* This file is part of L2J DataPack.
*
* L2J DataPack is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* L2J DataPack is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.datapack.test;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.testng.PowerMockTestCase;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.skills.Skill;
/**
* Abstract Test.
* @author Zoey76
* @version 2.6.2.0
*/
@PrepareForTest({
L2PcInstance.class,
Skill.class
})
@PowerMockIgnore({
"javax.xml.*",
"org.w3c.*",
"org.apache.*",
"org.slf4j.*",
"com.sun.*"
})
public class AbstractTest extends PowerMockTestCase {
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment