mirror of
https://github.com/Rogiel/l2jserver2
synced 2025-12-13 10:42:54 +00:00
Removed "core" project dependency
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
@@ -12,7 +12,6 @@ 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.world.L2Character;
|
||||
import com.l2jserver.service.BasicServiceModule;
|
||||
import com.l2jserver.service.ServiceModule;
|
||||
import com.l2jserver.service.ServiceStartException;
|
||||
import com.l2jserver.service.database.DatabaseService;
|
||||
@@ -21,8 +20,7 @@ import com.l2jserver.service.game.template.TemplateService;
|
||||
|
||||
public class IDFactoryTest {
|
||||
private final Injector injector = Guice.createInjector(new ServiceModule(),
|
||||
new BasicServiceModule(), new DAOModuleMySQL5(),
|
||||
new IDFactoryModule());
|
||||
new DAOModuleMySQL5(), new IDFactoryModule());
|
||||
private final CharacterIDFactory charIdFactory = injector
|
||||
.getInstance(CharacterIDFactory.class);
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@ 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.world.L2Character;
|
||||
import com.l2jserver.service.BasicServiceModule;
|
||||
import com.l2jserver.service.ServiceModule;
|
||||
import com.l2jserver.service.ServiceStartException;
|
||||
import com.l2jserver.service.database.DatabaseService;
|
||||
@@ -22,8 +21,7 @@ import com.l2jserver.service.game.template.TemplateService;
|
||||
|
||||
public class CharacterFriendListTest {
|
||||
private final Injector injector = Guice.createInjector(new ServiceModule(),
|
||||
new BasicServiceModule(), new DAOModuleMySQL5(),
|
||||
new IDFactoryModule());
|
||||
new DAOModuleMySQL5(), new IDFactoryModule());
|
||||
private final CharacterIDFactory charIdFactory = injector
|
||||
.getInstance(CharacterIDFactory.class);
|
||||
|
||||
|
||||
@@ -11,15 +11,13 @@ import com.google.inject.Scopes;
|
||||
import com.l2jserver.db.dao.DAOModuleMySQL5;
|
||||
import com.l2jserver.model.id.factory.IDFactoryModule;
|
||||
import com.l2jserver.model.id.template.factory.ItemTemplateIDFactory;
|
||||
import com.l2jserver.service.BasicServiceModule;
|
||||
import com.l2jserver.service.ServiceStartException;
|
||||
import com.l2jserver.service.game.scripting.ScriptingService;
|
||||
import com.l2jserver.service.game.scripting.ScriptingServiceImpl;
|
||||
|
||||
public class StaticTemplateServiceTest {
|
||||
private final Injector injector = Guice.createInjector(
|
||||
new BasicServiceModule(), new IDFactoryModule(),
|
||||
new DAOModuleMySQL5(), new AbstractModule() {
|
||||
new IDFactoryModule(), new DAOModuleMySQL5(), new AbstractModule() {
|
||||
@Override
|
||||
protected void configure() {
|
||||
bind(ScriptingService.class).to(ScriptingServiceImpl.class)
|
||||
|
||||
@@ -23,7 +23,6 @@ import com.l2jserver.model.world.item.ItemListener;
|
||||
import com.l2jserver.model.world.player.PlayerEvent;
|
||||
import com.l2jserver.model.world.player.PlayerListener;
|
||||
import com.l2jserver.model.world.player.PlayerSpawnEvent;
|
||||
import com.l2jserver.service.BasicServiceModule;
|
||||
import com.l2jserver.service.ServiceModule;
|
||||
import com.l2jserver.service.ServiceStartException;
|
||||
import com.l2jserver.service.game.world.WorldService;
|
||||
@@ -40,9 +39,9 @@ public class WorldEventDispatcherImplTest {
|
||||
|
||||
@Before
|
||||
public void tearUp() throws ServiceStartException {
|
||||
Injector injector = Guice.createInjector(new BasicServiceModule(),
|
||||
new ServiceModule(), new DAOModuleMySQL5(),
|
||||
new IDFactoryModule(), new AbstractModule() {
|
||||
Injector injector = Guice.createInjector(new ServiceModule(),
|
||||
new DAOModuleMySQL5(), new IDFactoryModule(),
|
||||
new AbstractModule() {
|
||||
@Override
|
||||
protected void configure() {
|
||||
bind(WorldService.class).to(WorldServiceImpl.class).in(
|
||||
|
||||
@@ -13,7 +13,6 @@ import com.l2jserver.model.world.Item;
|
||||
import com.l2jserver.model.world.L2Character;
|
||||
import com.l2jserver.model.world.WorldObject;
|
||||
import com.l2jserver.model.world.filter.impl.InstanceFilter;
|
||||
import com.l2jserver.service.BasicServiceModule;
|
||||
import com.l2jserver.service.ServiceStartException;
|
||||
import com.l2jserver.service.game.world.WorldService;
|
||||
import com.l2jserver.service.game.world.WorldServiceImpl;
|
||||
@@ -25,17 +24,15 @@ public class WorldServiceImplTest {
|
||||
|
||||
@Before
|
||||
public void tearUp() throws ServiceStartException {
|
||||
Injector injector = Guice.createInjector(new BasicServiceModule(),
|
||||
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 AbstractModule() {
|
||||
@Override
|
||||
protected void configure() {
|
||||
bind(WorldService.class).to(WorldServiceImpl.class).in(
|
||||
Scopes.SINGLETON);
|
||||
bind(WorldEventDispatcher.class).to(
|
||||
WorldEventDispatcherImpl.class).in(Scopes.SINGLETON);
|
||||
}
|
||||
});
|
||||
|
||||
world = injector.getInstance(WorldService.class);
|
||||
Assert.assertNotNull(world);
|
||||
|
||||
Reference in New Issue
Block a user