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

Fix Event tests not failing correctly

Browse Source
This commit is contained in:
James Seibel
2022-11-24 22:32:37 -06:00
parent 840b02c2db
commit 0647d212d6
4 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/test/java/testItems/events/abstractObjects/DhApiOneTimeTestEvent.java
+1 -1
View File
@@ -30,7 +30,7 @@ public abstract class DhApiOneTimeTestEvent implements IDhApiEvent<Boolean>
return input;
}
private static boolean firstTimeSetupComplete = false;
public static boolean firstTimeSetupComplete = false;
public DhApiOneTimeTestEvent()
{
if (!firstTimeSetupComplete)
api/src/test/java/testItems/events/abstractObjects/DhApiTestEvent.java
+1 -1
View File
@@ -31,7 +31,7 @@ public abstract class DhApiTestEvent implements IDhApiEvent<Boolean>
return input;
}
private static boolean firstTimeSetupComplete = false;
public static boolean firstTimeSetupComplete = false;
public DhApiTestEvent()
{
if (!firstTimeSetupComplete)
api/src/test/java/tests/EventInjectorTest.java
+27 -3
View File
@@ -1,8 +1,13 @@
package tests;
import com.seibel.lod.api.objects.events.DhApiEventDefinition;
import com.seibel.lod.core.DependencyInjection.ApiEventInjector;
import com.seibel.lod.core.events.ApiEventDefinitionHandler;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order;
import testItems.events.abstractObjects.DhApiOneTimeTestEvent;
import testItems.events.objects.DhOneTimeTestEventHandler;
import testItems.events.objects.DhOneTimeTestEventHandlerAlt;
@@ -19,13 +24,25 @@ import java.util.ArrayList;
*/
public class EventInjectorTest
{
@Before
public void testSetup()
{
// reset the injectors and event definitions
ApiEventInjector.INSTANCE.clear();
ApiEventDefinitionHandler.INSTANCE.clear();
DhApiTestEvent.firstTimeSetupComplete = false;
DhApiOneTimeTestEvent.firstTimeSetupComplete = false;
}
@Test
public void testGeneralAndRecurringEvents() // this also tests list dependencies since there can be more than one event handler bound per event
{
// Injector setup
ApiEventInjector TEST_EVENT_HANDLER = ApiEventInjector.INSTANCE;
TEST_EVENT_HANDLER.clear();
// pre-dependency setup
@@ -87,12 +104,19 @@ public class EventInjectorTest
}
@Test
public void testEventDefinition()
{
String errorMessagePrefix = "Missing " + DhApiEventDefinition.class.getSimpleName() + " for event class [";
Assert.assertNotNull(errorMessagePrefix + DhApiTestEvent.class.getSimpleName() + "]", ApiEventDefinitionHandler.getEventDefinition(DhApiTestEvent.class));
Assert.assertNotNull(errorMessagePrefix + DhApiOneTimeTestEvent.class.getSimpleName() + "]", ApiEventDefinitionHandler.getEventDefinition(DhApiOneTimeTestEvent.class));
}
@Test
public void testOneTimeEventFiring()
{
// Injector setup
ApiEventInjector TEST_EVENT_HANDLER = ApiEventInjector.INSTANCE;
TEST_EVENT_HANDLER.clear();
// pre-dependency setup
@@ -124,7 +148,7 @@ public class EventInjectorTest
// recurring event test
TEST_EVENT_HANDLER.bind(DhApiTestEvent.class, new DhTestEventHandler());
ArrayList<DhApiTestEvent> recurringEventList = TEST_EVENT_HANDLER.getAll(DhApiTestEvent.class);
Assert.assertNull("This unrealted recurring event shouldn't have been fired.", recurringEventList.get(0).getTestValue());
Assert.assertNull("This unrelated recurring event shouldn't have been fired.", recurringEventList.get(0).getTestValue());
}