Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into feat/postgresql-database

Browse Source 
# Conflicts:
#	config.yaml
#	docker-compose.yml
#	pom.xml
#	src/main/java/client/Character.java
#	src/main/java/client/Client.java
#	src/main/java/client/MonsterBook.java
#	src/main/java/client/command/commands/gm0/BuyBackCommand.java
#	src/main/java/client/processor/stat/AssignAPProcessor.java
#	src/main/java/config/ServerConfig.java
#	src/main/java/net/server/channel/Channel.java
#	src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java
#	src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java
#	src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java
#	src/main/java/net/server/channel/handlers/EnterMTSHandler.java
#	src/main/java/net/server/channel/handlers/NPCTalkHandler.java
#	src/main/java/net/server/channel/handlers/RangedAttackHandler.java
#	src/main/java/net/server/channel/handlers/SummonDamageHandler.java
#	src/main/java/net/server/channel/handlers/UseCashItemHandler.java
#	src/main/java/net/server/handlers/login/CreateCharHandler.java
#	src/main/java/net/server/world/World.java
#	src/main/java/scripting/npc/NPCConversationManager.java
#	src/main/java/server/ItemInformationProvider.java
#	src/main/java/server/life/Monster.java
#	src/main/java/server/life/MonsterInformationProvider.java
#	src/main/java/server/maps/MapleMap.java
#	src/main/java/tools/PacketCreator.java
#	src/test/java/service/NoteServiceTest.java
#	src/test/java/testutil/Any.java
This commit is contained in:
P0nk
2024-09-02 20:29:52 +02:00
parent a7d03cf8c0 8f2b8dd013
commit 559fe2d550
179 changed files with 3447 additions and 2090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

237
src/test/java/client/processor/stat/AssignAPProcessorTest.java Normal file
View File

@@ -0,0 +1,237 @@
package client.processor.stat;
import client.Job;
import org.junit.jupiter.api.Test;
import java.util.function.BiFunction;
import static org.junit.jupiter.api.Assertions.*;
class AssignAPProcessorTest {
@Test
void getMinHp() {
int max_level = 200;
int cygnus_max_level = 120;
BiFunction<Job,Integer,Integer> f = AssignAPProcessor::getMinHp;
assertAll(
// Beginners
() -> assertEquals(2438, f.apply(Job.BEGINNER, max_level)),
() -> assertEquals(1478, f.apply(Job.NOBLESSE, cygnus_max_level)),
// Warrior (Explorer)
() -> assertEquals(4918, f.apply(Job.WARRIOR, max_level)),
() -> assertEquals(5218, f.apply(Job.FIGHTER, max_level)),
() -> assertEquals(5218, f.apply(Job.CRUSADER, max_level)),
() -> assertEquals(5218, f.apply(Job.HERO, max_level)),
() -> assertEquals(4918, f.apply(Job.PAGE, max_level)),
() -> assertEquals(4918, f.apply(Job.WHITEKNIGHT, max_level)),
() -> assertEquals(4918, f.apply(Job.PALADIN, max_level)),
() -> assertEquals(4918, f.apply(Job.SPEARMAN, max_level)),
() -> assertEquals(4918, f.apply(Job.DRAGONKNIGHT, max_level)),
() -> assertEquals(4918, f.apply(Job.DARKKNIGHT, max_level)),
// Warrior (Cygnus)
() -> assertEquals(2998, f.apply(Job.DAWNWARRIOR1, cygnus_max_level)),
() -> assertEquals(3298, f.apply(Job.DAWNWARRIOR2, cygnus_max_level)),
() -> assertEquals(3298, f.apply(Job.DAWNWARRIOR3, cygnus_max_level)),
() -> assertEquals(3298, f.apply(Job.DAWNWARRIOR4, cygnus_max_level)),
// Warrior (Aran)
() -> assertEquals(4918, f.apply(Job.ARAN1, max_level)),
() -> assertEquals(5218, f.apply(Job.ARAN2, max_level)),
() -> assertEquals(5218, f.apply(Job.ARAN3, max_level)),
() -> assertEquals(5218, f.apply(Job.ARAN4, max_level)),
// Magician (Explorer)
() -> assertEquals(2054, f.apply(Job.MAGICIAN, max_level)),
() -> assertEquals(2054, f.apply(Job.FP_WIZARD, max_level)),
() -> assertEquals(2054, f.apply(Job.FP_MAGE, max_level)),
() -> assertEquals(2054, f.apply(Job.FP_ARCHMAGE, max_level)),
() -> assertEquals(2054, f.apply(Job.IL_WIZARD, max_level)),
() -> assertEquals(2054, f.apply(Job.IL_MAGE, max_level)),
() -> assertEquals(2054, f.apply(Job.IL_ARCHMAGE, max_level)),
() -> assertEquals(2054, f.apply(Job.CLERIC, max_level)),
() -> assertEquals(2054, f.apply(Job.PRIEST, max_level)),
() -> assertEquals(2054, f.apply(Job.BISHOP, max_level)),
// Magician (Cygnus)
() -> assertEquals(1254, f.apply(Job.BLAZEWIZARD1, cygnus_max_level)),
() -> assertEquals(1254, f.apply(Job.BLAZEWIZARD2, cygnus_max_level)),
() -> assertEquals(1254, f.apply(Job.BLAZEWIZARD3, cygnus_max_level)),
() -> assertEquals(1254, f.apply(Job.BLAZEWIZARD4, cygnus_max_level)),
// Bowman (Explorer)
() -> assertEquals(4058, f.apply(Job.BOWMAN, max_level)),
() -> assertEquals(4358, f.apply(Job.HUNTER, max_level)),
() -> assertEquals(4358, f.apply(Job.RANGER, max_level)),
() -> assertEquals(4358, f.apply(Job.BOWMASTER, max_level)),
() -> assertEquals(4358, f.apply(Job.CROSSBOWMAN, max_level)),
() -> assertEquals(4358, f.apply(Job.SNIPER, max_level)),
() -> assertEquals(4358, f.apply(Job.MARKSMAN, max_level)),
// Bowman (Cygnus)
() -> assertEquals(2458, f.apply(Job.WINDARCHER1, cygnus_max_level)),
() -> assertEquals(2758, f.apply(Job.WINDARCHER2, cygnus_max_level)),
() -> assertEquals(2758, f.apply(Job.WINDARCHER3, cygnus_max_level)),
() -> assertEquals(2758, f.apply(Job.WINDARCHER4, cygnus_max_level)),
// Thief (Explorer)
() -> assertEquals(4058, f.apply(Job.THIEF, max_level)),
() -> assertEquals(4358, f.apply(Job.ASSASSIN, max_level)),
() -> assertEquals(4358, f.apply(Job.HERMIT, max_level)),
() -> assertEquals(4358, f.apply(Job.NIGHTLORD, max_level)),
() -> assertEquals(4358, f.apply(Job.BANDIT, max_level)),
() -> assertEquals(4358, f.apply(Job.CHIEFBANDIT, max_level)),
() -> assertEquals(4358, f.apply(Job.SHADOWER, max_level)),
// Thief (Cygnus)
() -> assertEquals(2458, f.apply(Job.NIGHTWALKER1, cygnus_max_level)),
() -> assertEquals(2758, f.apply(Job.NIGHTWALKER2, cygnus_max_level)),
() -> assertEquals(2758, f.apply(Job.NIGHTWALKER3, cygnus_max_level)),
() -> assertEquals(2758, f.apply(Job.NIGHTWALKER4, cygnus_max_level)),
// Pirate (Explorer)
() -> assertEquals(4438, f.apply(Job.PIRATE, max_level)),
() -> assertEquals(4738, f.apply(Job.BRAWLER, max_level)),
() -> assertEquals(4738, f.apply(Job.MARAUDER, max_level)),
() -> assertEquals(4738, f.apply(Job.BUCCANEER, max_level)),
() -> assertEquals(4738, f.apply(Job.GUNSLINGER, max_level)),
() -> assertEquals(4738, f.apply(Job.OUTLAW, max_level)),
() -> assertEquals(4738, f.apply(Job.CORSAIR, max_level)),
// Pirate (Cygnus)
() -> assertEquals(2678, f.apply(Job.THUNDERBREAKER1, cygnus_max_level)),
() -> assertEquals(2978, f.apply(Job.THUNDERBREAKER2, cygnus_max_level)),
() -> assertEquals(2978, f.apply(Job.THUNDERBREAKER3, cygnus_max_level)),
() -> assertEquals(2978, f.apply(Job.THUNDERBREAKER4, cygnus_max_level))
);
}
@Test
void getMinMp() {
int max_level = 200;
int cygnus_max_level = 120;
BiFunction<Job,Integer,Integer> f = AssignAPProcessor::getMinMp;
assertAll(
// Beginners
() -> assertEquals(1995, f.apply(Job.BEGINNER, max_level)),
() -> assertEquals(1195, f.apply(Job.NOBLESSE, cygnus_max_level)),
// Warrior (Explorer)
() -> assertEquals(855, f.apply(Job.WARRIOR, max_level)),
() -> assertEquals(855, f.apply(Job.FIGHTER, max_level)),
() -> assertEquals(855, f.apply(Job.CRUSADER, max_level)),
() -> assertEquals(855, f.apply(Job.HERO, max_level)),
() -> assertEquals(955, f.apply(Job.PAGE, max_level)),
() -> assertEquals(955, f.apply(Job.WHITEKNIGHT, max_level)),
() -> assertEquals(955, f.apply(Job.PALADIN, max_level)),
() -> assertEquals(955, f.apply(Job.SPEARMAN, max_level)),
() -> assertEquals(955, f.apply(Job.DRAGONKNIGHT, max_level)),
() -> assertEquals(955, f.apply(Job.DARKKNIGHT, max_level)),
// Warrior (Cygnus)
() -> assertEquals(535, f.apply(Job.DAWNWARRIOR1, cygnus_max_level)),
() -> assertEquals(535, f.apply(Job.DAWNWARRIOR2, cygnus_max_level)),
() -> assertEquals(535, f.apply(Job.DAWNWARRIOR3, cygnus_max_level)),
() -> assertEquals(535, f.apply(Job.DAWNWARRIOR4, cygnus_max_level)),
// Warrior (Aran)
() -> assertEquals(855, f.apply(Job.ARAN1, max_level)),
() -> assertEquals(855, f.apply(Job.ARAN2, max_level)),
() -> assertEquals(855, f.apply(Job.ARAN3, max_level)),
() -> assertEquals(855, f.apply(Job.ARAN4, max_level)),
// Magician (Explorer)
() -> assertEquals(4399, f.apply(Job.MAGICIAN, max_level)),
() -> assertEquals(4849, f.apply(Job.FP_WIZARD, max_level)),
() -> assertEquals(4849, f.apply(Job.FP_MAGE, max_level)),
() -> assertEquals(4849, f.apply(Job.FP_ARCHMAGE, max_level)),
() -> assertEquals(4849, f.apply(Job.IL_WIZARD, max_level)),
() -> assertEquals(4849, f.apply(Job.IL_MAGE, max_level)),
() -> assertEquals(4849, f.apply(Job.IL_ARCHMAGE, max_level)),
() -> assertEquals(4849, f.apply(Job.CLERIC, max_level)),
() -> assertEquals(4849, f.apply(Job.PRIEST, max_level)),
() -> assertEquals(4849, f.apply(Job.BISHOP, max_level)),
// Magician (Cygnus)
() -> assertEquals(2639, f.apply(Job.BLAZEWIZARD1, cygnus_max_level)),
() -> assertEquals(3089, f.apply(Job.BLAZEWIZARD2, cygnus_max_level)),
() -> assertEquals(3089, f.apply(Job.BLAZEWIZARD3, cygnus_max_level)),
() -> assertEquals(3089, f.apply(Job.BLAZEWIZARD4, cygnus_max_level)),
// Bowman (Explorer)
() -> assertEquals(2785, f.apply(Job.BOWMAN, max_level)),
() -> assertEquals(2935, f.apply(Job.HUNTER, max_level)),
() -> assertEquals(2935, f.apply(Job.RANGER, max_level)),
() -> assertEquals(2935, f.apply(Job.BOWMASTER, max_level)),
() -> assertEquals(2935, f.apply(Job.CROSSBOWMAN, max_level)),
() -> assertEquals(2935, f.apply(Job.SNIPER, max_level)),
() -> assertEquals(2935, f.apply(Job.MARKSMAN, max_level)),
// Bowman (Cygnus)
() -> assertEquals(1665, f.apply(Job.WINDARCHER1, cygnus_max_level)),
() -> assertEquals(1815, f.apply(Job.WINDARCHER2, cygnus_max_level)),
() -> assertEquals(1815, f.apply(Job.WINDARCHER3, cygnus_max_level)),
() -> assertEquals(1815, f.apply(Job.WINDARCHER4, cygnus_max_level)),
// Thief (Explorer)
() -> assertEquals(2785, f.apply(Job.THIEF, max_level)),
() -> assertEquals(2935, f.apply(Job.ASSASSIN, max_level)),
() -> assertEquals(2935, f.apply(Job.HERMIT, max_level)),
() -> assertEquals(2935, f.apply(Job.NIGHTLORD, max_level)),
() -> assertEquals(2935, f.apply(Job.BANDIT, max_level)),
() -> assertEquals(2935, f.apply(Job.CHIEFBANDIT, max_level)),
() -> assertEquals(2935, f.apply(Job.SHADOWER, max_level)),
// Thief (Cygnus)
() -> assertEquals(1665, f.apply(Job.NIGHTWALKER1, cygnus_max_level)),
() -> assertEquals(1815, f.apply(Job.NIGHTWALKER2, cygnus_max_level)),
() -> assertEquals(1815, f.apply(Job.NIGHTWALKER3, cygnus_max_level)),
() -> assertEquals(1815, f.apply(Job.NIGHTWALKER4, cygnus_max_level)),
// Pirate (Explorer)
() -> assertEquals(3545, f.apply(Job.PIRATE, max_level)),
() -> assertEquals(3695, f.apply(Job.BRAWLER, max_level)),
() -> assertEquals(3695, f.apply(Job.MARAUDER, max_level)),
() -> assertEquals(3695, f.apply(Job.BUCCANEER, max_level)),
() -> assertEquals(3695, f.apply(Job.GUNSLINGER, max_level)),
() -> assertEquals(3695, f.apply(Job.OUTLAW, max_level)),
() -> assertEquals(3695, f.apply(Job.CORSAIR, max_level)),
// Pirate (Cygnus)
() -> assertEquals(2105, f.apply(Job.THUNDERBREAKER1, cygnus_max_level)),
() -> assertEquals(2255, f.apply(Job.THUNDERBREAKER2, cygnus_max_level)),
() -> assertEquals(2255, f.apply(Job.THUNDERBREAKER3, cygnus_max_level)),
() -> assertEquals(2255, f.apply(Job.THUNDERBREAKER4, cygnus_max_level))
);
}
}

19
src/test/java/constants/id/ItemIdTest.java Normal file
View File

@@ -0,0 +1,19 @@
package constants.id;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class ItemIdTest {
@Test
void isCashPackage() {
assertTrue(ItemId.isCashPackage(9102237));
}
@Test
void isNotCashPackage() {
assertFalse(ItemId.isCashPackage(4000000));
}
}

14
src/test/java/database/drop/DropProviderTest.java
View File

@@ -6,7 +6,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import server.life.MonsterDropEntry;
import server.life.MonsterGlobalDropEntry;
import testutil.Any;
import testutil.AnyValues;
import java.util.Collections;
import java.util.List;
@@ -14,7 +14,9 @@ import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
class DropProviderTest {
@@ -83,8 +85,8 @@ class DropProviderTest {
GlobalMonsterDrop globalDrop = new GlobalMonsterDrop(2049100, -1, 2, 3, null, 450);
when(dropDao.getGlobalMonsterDrops()).thenReturn(List.of(globalDrop));
List<MonsterGlobalDropEntry> dropEntries1 = dropProvider.getRelevantGlobalDrops(Any.integer());
List<MonsterGlobalDropEntry> dropEntries2 = dropProvider.getRelevantGlobalDrops(Any.integer());
List<MonsterGlobalDropEntry> dropEntries1 = dropProvider.getRelevantGlobalDrops(AnyValues.integer());
List<MonsterGlobalDropEntry> dropEntries2 = dropProvider.getRelevantGlobalDrops(AnyValues.integer());
assertEquals(1, dropEntries1.size());
assertEquals(1, dropEntries2.size());
@@ -107,7 +109,7 @@ class DropProviderTest {
@Test
void getRelevantGlobalDrop() {
GlobalMonsterDrop ossyriaDrop = new GlobalMonsterDrop(Any.integer(), 2, Any.integer(), Any.integer(), Any.integer(), Any.integer());
GlobalMonsterDrop ossyriaDrop = new GlobalMonsterDrop(AnyValues.integer(), 2, AnyValues.integer(), AnyValues.integer(), AnyValues.integer(), AnyValues.integer());
when(dropDao.getGlobalMonsterDrops()).thenReturn(List.of(ossyriaDrop));
int ossyriaMapId = 200_000_200;
@@ -118,7 +120,7 @@ class DropProviderTest {
@Test
void getRelevantGlobalDrop_wrongContinent() {
GlobalMonsterDrop ellinDrop = new GlobalMonsterDrop(Any.integer(), 3, Any.integer(), Any.integer(), Any.integer(), Any.integer());
GlobalMonsterDrop ellinDrop = new GlobalMonsterDrop(AnyValues.integer(), 3, AnyValues.integer(), AnyValues.integer(), AnyValues.integer(), AnyValues.integer());
when(dropDao.getGlobalMonsterDrops()).thenReturn(List.of(ellinDrop));
int victoriaMapId = 102_000_000;

17
src/test/java/database/maker/MakerInfoProviderTest.java
View File

@@ -5,14 +5,19 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import server.MakerItemFactory;
import testutil.Any;
import testutil.AnyValues;
import tools.Pair;
import java.util.List;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
class MakerInfoProviderTest {
@@ -80,7 +85,7 @@ class MakerInfoProviderTest {
void getRecipeFromDb_notFound() {
givenNoRecipe();
Optional<MakerRecipe> recipe = makerInfoProvider.getMakerRecipe(Any.integer());
Optional<MakerRecipe> recipe = makerInfoProvider.getMakerRecipe(AnyValues.integer());
assertTrue(recipe.isEmpty());
}
@@ -111,7 +116,7 @@ class MakerInfoProviderTest {
MakerRecipe recipeWithCatalyst = new MakerRecipe(0, (short) 0, (short) 0, (short) 0, 0, null, null, catalyst, (short) 0, (short) 0);
when(makerDao.getRecipe(anyInt())).thenReturn(Optional.of(recipeWithCatalyst));
Optional<Integer> stimulant = makerInfoProvider.getStimulant(Any.integer());
Optional<Integer> stimulant = makerInfoProvider.getStimulant(AnyValues.integer());
assertTrue(stimulant.isPresent());
assertEquals(catalyst, stimulant.get());
@@ -121,7 +126,7 @@ class MakerInfoProviderTest {
void getStimulant_noRecipe() {
givenNoRecipe();
Optional<Integer> stimulant = makerInfoProvider.getStimulant(Any.integer());
Optional<Integer> stimulant = makerInfoProvider.getStimulant(AnyValues.integer());
assertTrue(stimulant.isEmpty());
}

5
src/test/java/model/NoteTest.java
View File

@@ -2,7 +2,8 @@ package model;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
class NoteTest {
@@ -25,4 +26,4 @@ class NoteTest {
void createNew() {
assertDoesNotThrow(() -> new Note(4, "message", "from", "to", System.currentTimeMillis(), 5));
}
}
}

10
src/test/java/net/packet/ByteBufInPacketTest.java
View File

@@ -235,4 +235,12 @@ class ByteBufInPacketTest {
assertEquals(initial.length(), afterReadingOpcode.length());
}
}
@Test
void equalsShouldCompareBytes() {
ByteBufInPacket packet1 = new ByteBufInPacket(Unpooled.wrappedBuffer(new byte[]{ 11, 22, 33, 44 }));
ByteBufInPacket packet2 = new ByteBufInPacket(Unpooled.wrappedBuffer(new byte[]{ 11, 22, 33, 44 }));
assertEquals(packet1, packet2);
}
}

12
src/test/java/net/packet/ByteBufOutPacketTest.java
View File

@@ -203,4 +203,14 @@ class ByteBufOutPacketTest {
assertEquals(0, wrapped.readByte());
assertEquals(secondWrittenByte, wrapped.readByte());
}
}
@Test
void equalsShouldCompareBytes() {
ByteBufOutPacket packet1 = new ByteBufOutPacket();
packet1.writeBytes(new byte[] { 55, 66, 77, 88 });
ByteBufOutPacket packet2 = new ByteBufOutPacket();
packet2.writeBytes(new byte[] { 55, 66, 77, 88 });
assertEquals(packet1, packet2);
}
}

72
src/test/java/net/server/channel/handlers/CashShopSurpriseHandlerTest.java Normal file
View File

@@ -0,0 +1,72 @@
package net.server.channel.handlers;
import client.inventory.Item;
import constants.id.ItemId;
import net.packet.InPacket;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import server.CashShop;
import testutil.HandlerTest;
import testutil.Items;
import testutil.Packets;
import tools.PacketCreator;
import java.util.Optional;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class CashShopSurpriseHandlerTest extends HandlerTest {
private final CashShopSurpriseHandler handler = new CashShopSurpriseHandler();
@Mock
private CashShop cashShop;
@BeforeEach
void prepareCashShop() {
when(chr.getCashShop()).thenReturn(cashShop);
}
private InPacket useCashShopSurprisePacket(long cashId) {
return Packets.buildInPacket(out -> out.writeLong(cashId));
}
@Test
void shouldDoNothingWhenCsIsNotOpened() {
when(cashShop.isOpened()).thenReturn(false);
handler.handlePacket(useCashShopSurprisePacket(123), client);
verify(cashShop, never()).openCashShopSurprise(anyLong());
}
@Test
void shouldSendFailurePacketWhenFailToOpen() {
when(cashShop.isOpened()).thenReturn(true);
when(cashShop.openCashShopSurprise(anyLong())).thenReturn(Optional.empty());
handler.handlePacket(useCashShopSurprisePacket(456), client);
verify(client).sendPacket(PacketCreator.onCashItemGachaponOpenFailed());
}
@Test
void shouldSendSuccessPacketWhenSuccessfullyOpen() {
when(cashShop.isOpened()).thenReturn(true);
Item cashShopSurprise = Items.itemWithQuantity(ItemId.CASH_SHOP_SURPRISE, 3);
Item reward = Items.itemWithQuantity(5000012, 1);
when(cashShop.openCashShopSurprise(789)).thenReturn(Optional.of(new CashShop.CashShopSurpriseResult(
cashShopSurprise, reward)));
handler.handlePacket(useCashShopSurprisePacket(789), client);
verify(client).sendPacket(PacketCreator.onCashGachaponOpenSuccess(ACCOUNT_ID, cashShopSurprise.getCashId(), 3,
reward, 5000012, 1, true));
}
}

7
src/test/java/server/life/MobSkillFactoryTest.java
View File

@@ -10,7 +10,10 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
class MobSkillFactoryTest {
@@ -67,4 +70,4 @@ class MobSkillFactoryTest {
assertThrows(IllegalArgumentException.class, () -> MobSkillFactory.getMobSkillOrThrow(MobSkillType.DEFENSE_UP, 1));
}
}
}

17
src/test/java/service/NoteServiceTest.java
View File

@@ -8,17 +8,24 @@ import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import testutil.Any;
import testutil.AnyValues;
import testutil.Mocks;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static testutil.Any.daoException;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static testutil.AnyValues.daoException;
class NoteServiceTest {
@@ -73,7 +80,7 @@ class NoteServiceTest {
void sendFailure() {
doThrow(daoException()).when(noteDao).save(any());
boolean success = noteService.sendNormal(Any.string(), Any.string(), Any.string());
boolean success = noteService.sendNormal(AnyValues.string(), AnyValues.string(), AnyValues.string());
assertFalse(success);
verify(noteDao).save(any());

6
src/test/java/testutil/Any.java → src/test/java/testutil/AnyValues.java
View File

@@ -2,7 +2,7 @@ package testutil;
import database.DaoException;
public class Any {
public class AnyValues {
public static String string() {
return "string";
@@ -12,6 +12,10 @@ public class Any {
return 17;
}
public static short anyShort() {
return 4;
}
public static DaoException daoException() {
return new DaoException(string(), new RuntimeException());
}

24
src/test/java/testutil/HandlerTest.java Normal file
View File

@@ -0,0 +1,24 @@
package testutil;
import client.Character;
import client.Client;
import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
import static org.mockito.Mockito.lenient;
public abstract class HandlerTest {
protected static final int ACCOUNT_ID = 1702;
@Mock
protected Client client;
@Mock
protected Character chr;
@BeforeEach
void prepareClient() {
lenient().when(client.getAccID()).thenReturn(ACCOUNT_ID);
lenient().when(client.getPlayer()).thenReturn(chr);
}
}

10
src/test/java/testutil/Items.java Normal file
View File

@@ -0,0 +1,10 @@
package testutil;
import client.inventory.Item;
public class Items {
public static Item itemWithQuantity(int itemId, int quantity) {
return new Item(itemId, AnyValues.anyShort(), (short) quantity);
}
}

18
src/test/java/testutil/Packets.java Normal file
View File

@@ -0,0 +1,18 @@
package testutil;
import io.netty.buffer.Unpooled;
import net.packet.ByteBufInPacket;
import net.packet.ByteBufOutPacket;
import net.packet.InPacket;
import net.packet.OutPacket;
import java.util.function.Consumer;
public class Packets {
public static InPacket buildInPacket(Consumer<OutPacket> contentProvider) {
OutPacket builderInput = new ByteBufOutPacket();
contentProvider.accept(builderInput);
return new ByteBufInPacket(Unpooled.wrappedBuffer(builderInput.getBytes()));
}
}