Sweetgum/sweetgum-server
1
0
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

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());
}