Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-13 10:42:54 +00:00
Code Releases Activity

Several improvements

Browse Source 
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-05-19 01:40:53 -03:00
parent 9bb83652e4
commit 2c4af6d91d
263 changed files with 2135 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java
View File

@@ -24,7 +24,7 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.l2jserver.GameServerModule;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.model.id.object.factory.CharacterIDFactory;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.service.ServiceManager;
import com.l2jserver.service.ServiceStartException;
@@ -42,9 +42,9 @@ public class MySQL5CharacterDAOTest {
final CharacterDAO dao = injector.getInstance(CharacterDAO.class);
final L2Character char1 = dao.load(injector.getInstance(
CharacterIDFactory.class).createID(268437456));
CharacterIDProvider.class).createID(268437456));
final L2Character char2 = dao.load(injector.getInstance(
CharacterIDFactory.class).createID(268437456));
CharacterIDProvider.class).createID(268437456));
Assert.assertSame(char1, char2);
}

9
src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java
View File

@@ -26,7 +26,8 @@ import com.google.inject.Injector;
import com.l2jserver.db.dao.MySQL5DAOModule;
import com.l2jserver.model.id.ID;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.factory.CharacterIDFactory;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.provider.IDProviderModule;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.service.ServiceModule;
import com.l2jserver.service.ServiceStartException;
@@ -36,9 +37,9 @@ import com.l2jserver.service.game.template.TemplateService;
public class IDFactoryTest {
private final Injector injector = Guice.createInjector(new ServiceModule(),
new MySQL5DAOModule(), new IDFactoryModule());
private final CharacterIDFactory charIdFactory = injector
.getInstance(CharacterIDFactory.class);
new MySQL5DAOModule(), new IDProviderModule());
private final CharacterIDProvider charIdFactory = injector
.getInstance(CharacterIDProvider.class);
@Test
public void testCreateID() {

10
src/test/java/com/l2jserver/model/world/character/CharacterFriendListTest.java
View File

@@ -25,9 +25,9 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.l2jserver.db.dao.CharacterFriendDAO;
import com.l2jserver.db.dao.MySQL5DAOModule;
import com.l2jserver.model.id.factory.IDFactoryModule;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.id.object.factory.CharacterIDFactory;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.provider.IDProviderModule;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.service.ServiceModule;
import com.l2jserver.service.ServiceStartException;
@@ -37,9 +37,9 @@ import com.l2jserver.service.game.template.TemplateService;
public class CharacterFriendListTest {
private final Injector injector = Guice.createInjector(new ServiceModule(),
new MySQL5DAOModule(), new IDFactoryModule());
private final CharacterIDFactory charIdFactory = injector
.getInstance(CharacterIDFactory.class);
new MySQL5DAOModule(), new IDProviderModule());
private final CharacterIDProvider charIdFactory = injector
.getInstance(CharacterIDProvider.class);
@Test
public void testIterator() throws ServiceStartException {

10
src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java
View File

@@ -23,18 +23,18 @@ import script.template.item.AdenaItemTemplate;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.l2jserver.db.dao.MySQL5DAOModule;
import com.l2jserver.model.id.factory.IDFactoryModule;
import com.l2jserver.model.id.template.factory.ItemTemplateIDFactory;
import com.l2jserver.model.id.provider.IDProviderModule;
import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider;
import com.l2jserver.service.ServiceModule;
import com.l2jserver.service.ServiceStartException;
public class StaticTemplateServiceTest {
private final Injector injector = Guice.createInjector(new ServiceModule(),
new IDFactoryModule(), new MySQL5DAOModule());
new IDProviderModule(), new MySQL5DAOModule());
private final TemplateService service = injector
.getInstance(TemplateService.class);
private final ItemTemplateIDFactory factory = injector
.getInstance(ItemTemplateIDFactory.class);
private final ItemTemplateIDProvider factory = injector
.getInstance(ItemTemplateIDProvider.class);
@Test
public void testAdena() throws ServiceStartException {

33
src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java
View File

@@ -23,14 +23,11 @@ import junit.framework.Assert;
import org.junit.Before;
import org.junit.Test;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Scopes;
import com.l2jserver.db.dao.MySQL5DAOModule;
import com.l2jserver.model.id.factory.IDFactoryModule;
import com.l2jserver.model.id.object.factory.CharacterIDFactory;
import com.l2jserver.model.id.object.factory.ItemIDFactory;
import com.l2jserver.GameServerModule;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
import com.l2jserver.model.id.object.provider.ItemIDProvider;
import com.l2jserver.model.world.Item;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.model.world.item.ItemDropEvent;
@@ -39,37 +36,23 @@ import com.l2jserver.model.world.item.ItemListener;
import com.l2jserver.model.world.player.event.PlayerEvent;
import com.l2jserver.model.world.player.event.PlayerListener;
import com.l2jserver.model.world.player.event.PlayerSpawnEvent;
import com.l2jserver.service.ServiceModule;
import com.l2jserver.service.ServiceStartException;
import com.l2jserver.service.game.world.WorldService;
import com.l2jserver.service.game.world.WorldServiceImpl;
import com.l2jserver.service.game.world.event.WorldEventDispatcher;
import com.l2jserver.service.game.world.event.WorldEventDispatcherImpl;
public class WorldEventDispatcherImplTest {
private WorldService world;
private WorldEventDispatcher dispatcher;
private CharacterIDFactory cidFactory;
private ItemIDFactory iidFactory;
private CharacterIDProvider cidFactory;
private ItemIDProvider iidFactory;
@Before
public void tearUp() throws ServiceStartException {
Injector injector = Guice.createInjector(new ServiceModule(),
new MySQL5DAOModule(), new IDFactoryModule(),
new AbstractModule() {
@Override
protected void configure() {
bind(WorldService.class).to(WorldServiceImpl.class).in(
Scopes.SINGLETON);
bind(WorldEventDispatcher.class).to(
WorldEventDispatcherImpl.class).in(
Scopes.SINGLETON);
}
});
Injector injector = Guice.createInjector(new GameServerModule());
cidFactory = injector.getInstance(CharacterIDFactory.class);
iidFactory = injector.getInstance(ItemIDFactory.class);
cidFactory = injector.getInstance(CharacterIDProvider.class);
iidFactory = injector.getInstance(ItemIDProvider.class);
world = injector.getInstance(WorldService.class);
dispatcher = injector.getInstance(WorldEventDispatcher.class);

106
src/test/java/com/l2jserver/util/calculator/CalculatorTest.java
View File

@@ -29,76 +29,110 @@ public class CalculatorTest {
public void testSimple() {
final Calculator calc = new Calculator();
calc.add(0, new SetOperation(10));
calc.add(1, new MultiplicationOperation(2));
calc.add(2, new SetOperation(30));
calc.add(0, new SetFunction(10));
calc.add(1, new MultiplicationFunction(2));
calc.add(2, new SetFunction(30));
Assert.assertEquals(30.0, calc.compute());
Assert.assertEquals(30.0, calc.calculate());
}
@Test
public void testPercent() {
final Calculator calc = new Calculator();
calc.add(0, new SetOperation(10));
calc.add(1, new MultiplicationOperation(2));
calc.add(2, new PercentOperation(75));
calc.add(0, new SetFunction(10));
calc.add(1, new MultiplicationFunction(2));
calc.add(2, new PercentFunction(75));
Assert.assertEquals(15.0, calc.compute());
Assert.assertEquals(15.0, calc.calculate());
}
@Test
public void testComplex() {
final Calculator calc = new Calculator();
calc.add(0, new SetOperation(10));
calc.add(1, new MultiplicationOperation(2));
calc.add(2, new PercentOperation(75));
calc.add(3, new SumOperation(3));
calc.add(4, new SubtractOperation(8));
calc.add(5, new DivisionOperation(2));
calc.add(0, new SetFunction(10));
calc.add(1, new MultiplicationFunction(2));
calc.add(2, new PercentFunction(75));
calc.add(3, new SumFunction(3));
calc.add(4, new SubtractFunction(8));
calc.add(5, new DivisionFunction(2));
Assert.assertEquals(5.0, calc.compute());
Assert.assertEquals(5.0, calc.calculate());
}
@Test
public void testNesting() {
final Calculator calc1 = new Calculator();
calc1.add(0, new SetOperation(10));
calc1.add(1, new MultiplicationOperation(2));
calc1.add(2, new PercentOperation(75));
calc1.add(3, new SumOperation(3));
calc1.add(4, new SubtractOperation(8));
calc1.add(5, new DivisionOperation(2));
Assert.assertEquals(5.0, calc1.compute());
calc1.add(0, new SetFunction(10));
calc1.add(1, new MultiplicationFunction(2));
calc1.add(2, new PercentFunction(75));
calc1.add(3, new SumFunction(3));
calc1.add(4, new SubtractFunction(8));
calc1.add(5, new DivisionFunction(2));
Assert.assertEquals(5.0, calc1.calculate());
final Calculator calc2 = new Calculator();
calc2.add(0, new MultiplicationOperation(2));
calc2.add(1, new PercentOperation(75));
calc2.add(2, new SumOperation(3));
calc2.add(3, new SubtractOperation(8));
calc2.add(4, new DivisionOperation(2));
Assert.assertEquals(-2.5, calc2.compute());
calc2.add(0, new MultiplicationFunction(2));
calc2.add(1, new PercentFunction(75));
calc2.add(2, new SumFunction(3));
calc2.add(3, new SubtractFunction(8));
calc2.add(4, new DivisionFunction(2));
Assert.assertEquals(-2.5, calc2.calculate());
final Calculator calc3 = new Calculator();
calc3.add(0, calc1);
calc3.add(1, calc2);
Assert.assertEquals(1.25, calc3.compute());
// this should be executed
calc2.add(5, new SumFunction(1));
Assert.assertEquals(2.25, calc3.calculate());
}
@Test
public void testImporting() {
final Calculator calc1 = new Calculator();
calc1.add(0, new SetFunction(10));
calc1.add(2, new MultiplicationFunction(2));
calc1.add(4, new PercentFunction(75));
calc1.add(6, new SumFunction(3));
calc1.add(8, new SubtractFunction(8));
calc1.add(10, new DivisionFunction(2));
Assert.assertEquals(5.0, calc1.calculate());
final Calculator calc2 = new Calculator();
calc2.add(1, new MultiplicationFunction(2));
calc2.add(3, new PercentFunction(75));
calc2.add(5, new SumFunction(3));
calc2.add(7, new SubtractFunction(8));
calc2.add(9, new DivisionFunction(2));
Assert.assertEquals(-2.5, calc2.calculate());
final Calculator calc3 = new Calculator();
calc3.importFunctions(calc1);
calc3.importFunctions(calc2);
// this should not be executed
calc2.add(5, new SumFunction(50));
Assert.assertEquals(1.25, calc3.calculate());
}
@Test
public void testRounding() {
final Calculator calc1 = new Calculator();
calc1.add(0, new MultiplicationOperation(2));
calc1.add(1, new PercentOperation(75));
calc1.add(2, new SumOperation(3));
calc1.add(3, new SubtractOperation(8.1));
calc1.add(4, new DivisionOperation(2));
calc1.add(5, new RoundOperation());
Assert.assertEquals(-3.0, calc1.compute());
calc1.add(0, new MultiplicationFunction(2));
calc1.add(1, new PercentFunction(75));
calc1.add(2, new SumFunction(3));
calc1.add(3, new SubtractFunction(8.1));
calc1.add(4, new DivisionFunction(2));
calc1.add(5, new RoundFunction());
Assert.assertEquals(-3.0, calc1.calculate());
}
}