wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor/Clean Dependency tests before adding Override tests

Browse Source
This commit is contained in:
James Seibel
2022-07-19 19:57:03 -05:00
parent 3f89c485e1
commit d5f7818252
6 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/testItems/dependencyInjection/interfaces/ITestOne.java → src/test/java/testItems/dependencyInjection/interfaces/ISingletonTestOne.java
+1 -1
View File
@@ -8,7 +8,7 @@ import com.seibel.lod.core.handlers.dependencyInjection.IBindable;
* @author James Seibel
* @version 2022-7-16
*/
public interface ITestOne extends IBindable
public interface ISingletonTestOne extends IBindable
{
public int getValue();
src/test/java/testItems/dependencyInjection/interfaces/ITestTwo.java → src/test/java/testItems/dependencyInjection/interfaces/ISingletonTestTwo.java
+1 -1
View File
@@ -8,7 +8,7 @@ import com.seibel.lod.core.handlers.dependencyInjection.IBindable;
* @author James Seibel
* @version 2022-7-16
*/
public interface ITestTwo extends IBindable
public interface ISingletonTestTwo extends IBindable
{
public int getValue();
src/test/java/testItems/dependencyInjection/objects/ConcreteTestBoth.java → src/test/java/testItems/dependencyInjection/objects/ConcreteSingletonTestBoth.java
+3 -3
View File
@@ -1,8 +1,8 @@
package testItems.dependencyInjection.objects;
import com.seibel.lod.core.handlers.dependencyInjection.IBindable;
import testItems.dependencyInjection.interfaces.ITestOne;
import testItems.dependencyInjection.interfaces.ITestTwo;
import testItems.dependencyInjection.interfaces.ISingletonTestOne;
import testItems.dependencyInjection.interfaces.ISingletonTestTwo;
/**
* Dummy test implementation object for dependency injection unit tests.
@@ -10,7 +10,7 @@ import testItems.dependencyInjection.interfaces.ITestTwo;
* @author James Seibel
* @version 2022-7-16
*/
public class ConcreteTestBoth implements ITestOne, ITestTwo, IBindable
public class ConcreteSingletonTestBoth implements ISingletonTestOne, ISingletonTestTwo, IBindable
{
public static final int VALUE = 3;
src/test/java/testItems/dependencyInjection/objects/ConcreteTestOne.java → src/test/java/testItems/dependencyInjection/objects/ConcreteSingletonTestOne.java
+5 -5
View File
@@ -1,8 +1,8 @@
package testItems.dependencyInjection.objects;
import com.seibel.lod.core.handlers.dependencyInjection.IBindable;
import testItems.dependencyInjection.interfaces.ITestOne;
import testItems.dependencyInjection.interfaces.ITestTwo;
import testItems.dependencyInjection.interfaces.ISingletonTestOne;
import testItems.dependencyInjection.interfaces.ISingletonTestTwo;
import tests.DependencyInjectorTest;
/**
@@ -11,16 +11,16 @@ import tests.DependencyInjectorTest;
* @author James Seibel
* @version 2022-7-16
*/
public class ConcreteTestOne implements ITestOne, IBindable
public class ConcreteSingletonTestOne implements ISingletonTestOne, IBindable
{
private ITestTwo testInterTwo;
private ISingletonTestTwo testInterTwo;
public static int VALUE = 1;
@Override
public void finishDelayedSetup() { testInterTwo = DependencyInjectorTest.TEST_SINGLETON_HANDLER.get(ITestTwo.class, true); }
public void finishDelayedSetup() { testInterTwo = DependencyInjectorTest.TEST_SINGLETON_HANDLER.get(ISingletonTestTwo.class, true); }
@Override
public boolean getDelayedSetupComplete() { return testInterTwo != null; }
src/test/java/testItems/dependencyInjection/objects/ConcreteTestTwo.java → src/test/java/testItems/dependencyInjection/objects/ConcreteSingletonTestTwo.java
+5 -5
View File
@@ -1,8 +1,8 @@
package testItems.dependencyInjection.objects;
import com.seibel.lod.core.handlers.dependencyInjection.IBindable;
import testItems.dependencyInjection.interfaces.ITestOne;
import testItems.dependencyInjection.interfaces.ITestTwo;
import testItems.dependencyInjection.interfaces.ISingletonTestOne;
import testItems.dependencyInjection.interfaces.ISingletonTestTwo;
import tests.DependencyInjectorTest;
/**
@@ -11,15 +11,15 @@ import tests.DependencyInjectorTest;
* @author James Seibel
* @version 2022-7-16
*/
public class ConcreteTestTwo implements ITestTwo, IBindable
public class ConcreteSingletonTestTwo implements ISingletonTestTwo, IBindable
{
private ITestOne testInterOne;
private ISingletonTestOne testInterOne;
public static int VALUE = 2;
@Override
public void finishDelayedSetup() { testInterOne = DependencyInjectorTest.TEST_SINGLETON_HANDLER.get(ITestOne.class, true); }
public void finishDelayedSetup() { testInterOne = DependencyInjectorTest.TEST_SINGLETON_HANDLER.get(ISingletonTestOne.class, true); }
@Override
public boolean getDelayedSetupComplete() { return testInterOne != null; }
src/test/java/tests/DependencyInjectorTest.java
+33 -36
View File
@@ -8,11 +8,11 @@ import org.junit.Assert;
import org.junit.Test;
import testItems.dependencyInjection.implementations.DhTestEvent;
import testItems.dependencyInjection.implementations.DhTestEventAlt;
import testItems.dependencyInjection.interfaces.ITestOne;
import testItems.dependencyInjection.interfaces.ITestTwo;
import testItems.dependencyInjection.objects.ConcreteTestBoth;
import testItems.dependencyInjection.objects.ConcreteTestOne;
import testItems.dependencyInjection.objects.ConcreteTestTwo;
import testItems.dependencyInjection.interfaces.ISingletonTestOne;
import testItems.dependencyInjection.interfaces.ISingletonTestTwo;
import testItems.dependencyInjection.objects.ConcreteSingletonTestBoth;
import testItems.dependencyInjection.objects.ConcreteSingletonTestOne;
import testItems.dependencyInjection.objects.ConcreteSingletonTestTwo;
import testItems.dependencyInjection.objects.DhApiTestEvent;
import java.util.ArrayList;
@@ -20,74 +20,71 @@ import java.util.ArrayList;
/**
* @author James Seibel
* @version 7-16-2022
* @version 2022-7-19
*/
public class DependencyInjectorTest
{
public static DependencyInjector<IBindable> TEST_SINGLETON_HANDLER;
public static DhApiEventInjector TEST_EVENT_HANDLER;
@Test
public void testSingleImplementations()
public void testSingleImplementationSingleton()
{
// clear the previous dependencies and only allow single dependencies
TEST_SINGLETON_HANDLER = new DependencyInjector<>(IBindable.class, false);
DependencyInjector<IBindable> TEST_SINGLETON_HANDLER = new DependencyInjector<>(IBindable.class, false);
// pre-setup
Assert.assertNull(ITestOne.class.getSimpleName() + " should not have been bound.", TEST_SINGLETON_HANDLER.get(ITestOne.class));
Assert.assertNull(ISingletonTestOne.class.getSimpleName() + " should not have been bound.", TEST_SINGLETON_HANDLER.get(ISingletonTestOne.class));
// dependency setup
TEST_SINGLETON_HANDLER.bind(ITestOne.class, new ConcreteTestOne());
TEST_SINGLETON_HANDLER.bind(ITestTwo.class, new ConcreteTestTwo());
TEST_SINGLETON_HANDLER.bind(ISingletonTestOne.class, new ConcreteSingletonTestOne());
TEST_SINGLETON_HANDLER.bind(ISingletonTestTwo.class, new ConcreteSingletonTestTwo());
TEST_SINGLETON_HANDLER.runDelayedSetup();
// basic dependencies
ITestOne testInterOne = TEST_SINGLETON_HANDLER.get(ITestOne.class);
Assert.assertNotNull(ITestOne.class.getSimpleName() + " not bound.", testInterOne);
Assert.assertEquals(ITestOne.class.getSimpleName() + " incorrect value.", testInterOne.getValue(), ConcreteTestOne.VALUE);
ISingletonTestOne testInterOne = TEST_SINGLETON_HANDLER.get(ISingletonTestOne.class);
Assert.assertNotNull(ISingletonTestOne.class.getSimpleName() + " not bound.", testInterOne);
Assert.assertEquals(ISingletonTestOne.class.getSimpleName() + " incorrect value.", testInterOne.getValue(), ConcreteSingletonTestOne.VALUE);
ITestTwo testInterTwo = TEST_SINGLETON_HANDLER.get(ITestTwo.class);
Assert.assertNotNull(ITestTwo.class.getSimpleName() + " not bound.", testInterTwo);
Assert.assertEquals(ITestTwo.class.getSimpleName() + " incorrect value.", testInterTwo.getValue(), ConcreteTestTwo.VALUE);
ISingletonTestTwo testInterTwo = TEST_SINGLETON_HANDLER.get(ISingletonTestTwo.class);
Assert.assertNotNull(ISingletonTestTwo.class.getSimpleName() + " not bound.", testInterTwo);
Assert.assertEquals(ISingletonTestTwo.class.getSimpleName() + " incorrect value.", testInterTwo.getValue(), ConcreteSingletonTestTwo.VALUE);
// circular dependencies (if this throws an exception the dependency isn't set up)
Assert.assertEquals(ITestOne.class.getSimpleName() + " incorrect value.", testInterOne.getDependentValue(), ConcreteTestTwo.VALUE);
Assert.assertEquals(ITestTwo.class.getSimpleName() + " incorrect value.", testInterTwo.getDependentValue(), ConcreteTestOne.VALUE);
Assert.assertEquals(ISingletonTestOne.class.getSimpleName() + " incorrect value.", testInterOne.getDependentValue(), ConcreteSingletonTestTwo.VALUE);
Assert.assertEquals(ISingletonTestTwo.class.getSimpleName() + " incorrect value.", testInterTwo.getDependentValue(), ConcreteSingletonTestOne.VALUE);
}
@Test
public void testMultipleImplementations()
public void testMultipleImplementationSingleton()
{
// clear the previous dependencies and only allow single dependencies
TEST_SINGLETON_HANDLER = new DependencyInjector<IBindable>(IBindable.class, false);
DependencyInjector<IBindable> TEST_SINGLETON_HANDLER = new DependencyInjector<IBindable>(IBindable.class, false);
// pre-setup
Assert.assertNull(ITestOne.class.getSimpleName() + " should not have been bound.", TEST_SINGLETON_HANDLER.get(ITestOne.class));
Assert.assertNull(ISingletonTestOne.class.getSimpleName() + " should not have been bound.", TEST_SINGLETON_HANDLER.get(ISingletonTestOne.class));
// dependency setup
ConcreteTestBoth concreteInstance = new ConcreteTestBoth();
ConcreteSingletonTestBoth concreteInstance = new ConcreteSingletonTestBoth();
TEST_SINGLETON_HANDLER.bind(ITestOne.class, concreteInstance);
TEST_SINGLETON_HANDLER.bind(ITestTwo.class, concreteInstance);
TEST_SINGLETON_HANDLER.bind(ISingletonTestOne.class, concreteInstance);
TEST_SINGLETON_HANDLER.bind(ISingletonTestTwo.class, concreteInstance);
// basic dependencies
ITestOne testInterOne = TEST_SINGLETON_HANDLER.get(ITestOne.class);
Assert.assertNotNull(ITestOne.class.getSimpleName() + " not bound.", testInterOne);
Assert.assertEquals(ITestOne.class.getSimpleName() + " incorrect value.", testInterOne.getValue(), ConcreteTestBoth.VALUE);
ISingletonTestOne testInterOne = TEST_SINGLETON_HANDLER.get(ISingletonTestOne.class);
Assert.assertNotNull(ISingletonTestOne.class.getSimpleName() + " not bound.", testInterOne);
Assert.assertEquals(ISingletonTestOne.class.getSimpleName() + " incorrect value.", testInterOne.getValue(), ConcreteSingletonTestBoth.VALUE);
ITestTwo testInterTwo = TEST_SINGLETON_HANDLER.get(ITestTwo.class);
Assert.assertNotNull(ITestTwo.class.getSimpleName() + " not bound.", testInterTwo);
Assert.assertEquals(ITestTwo.class.getSimpleName() + " incorrect value.", testInterTwo.getValue(), ConcreteTestBoth.VALUE);
ISingletonTestTwo testInterTwo = TEST_SINGLETON_HANDLER.get(ISingletonTestTwo.class);
Assert.assertNotNull(ISingletonTestTwo.class.getSimpleName() + " not bound.", testInterTwo);
Assert.assertEquals(ISingletonTestTwo.class.getSimpleName() + " incorrect value.", testInterTwo.getValue(), ConcreteSingletonTestBoth.VALUE);
}
@@ -95,9 +92,9 @@ public class DependencyInjectorTest
public void testEventDependencies() // this also tests list dependencies since there can be more than one event handler bound per event
{
// clear the previous dependencies and only allow single dependencies
TEST_SINGLETON_HANDLER = new DependencyInjector<>(IBindable.class, false);
DependencyInjector<IBindable> TEST_SINGLETON_HANDLER = new DependencyInjector<>(IBindable.class, false);
// setup the list (event) dependency handler
TEST_EVENT_HANDLER = new DhApiEventInjector();
DhApiEventInjector TEST_EVENT_HANDLER = new DhApiEventInjector();
// pre-setup