Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Groups Data Manager Serialization Test #88

Merged
merged 3 commits into from
Apr 7, 2023
Merged

Groups Data Manager Serialization Test #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9f3cdc
Updated Test
BaldwinAkinVarner Apr 6, 2023
682b8f5
Updated Groups Plugin Data
BaldwinAkinVarner Apr 6, 2023
be77e6a
Updated GroupsDataManagerTest
BaldwinAkinVarner Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 60 additions & 8 deletions gcm4/src/main/java/plugins/groups/GroupsPluginData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
package plugins.groups;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;

import org.apache.commons.math3.util.FastMath;

Expand Down Expand Up @@ -46,10 +39,36 @@ private static class GroupSpecification {
private GroupId groupId;
private GroupTypeId groupTypeId;
private List<GroupPropertyValue> groupPropertyValues;

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof GroupSpecification)) return false;
GroupSpecification that = (GroupSpecification) o;
return groupId.equals(that.groupId) && groupTypeId.equals(that.groupTypeId) && groupPropertyValues.equals(that.groupPropertyValues);
}

@Override
public int hashCode() {
return Objects.hash(groupId, groupTypeId, groupPropertyValues);
}
}

private static class Data {

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Data)) return false;
Data data = (Data) o;
return personCount == data.personCount && locked == data.locked && groupPropertyDefinitions.equals(data.groupPropertyDefinitions) && groupTypeIds.equals(data.groupTypeIds) && emptyGroupList.equals(data.emptyGroupList) && groupSpecifications.equals(data.groupSpecifications) && emptyGroupPropertyValues.equals(data.emptyGroupPropertyValues) && groupMemberships.equals(data.groupMemberships);
}

@Override
public int hashCode() {
return Objects.hash(groupPropertyDefinitions, groupTypeIds, emptyGroupList, personCount, locked, groupSpecifications, emptyGroupPropertyValues, groupMemberships);
}

private final Map<GroupTypeId, Map<GroupPropertyId, PropertyDefinition>> groupPropertyDefinitions;
private final Set<GroupTypeId> groupTypeIds;
private final List<GroupId> emptyGroupList;
Expand All @@ -62,6 +81,20 @@ private static class Data {
// indexed by person id
private final List<List<GroupId>> groupMemberships;

@Override
public String toString() {
return "Data{" +
"groupPropertyDefinitions=" + groupPropertyDefinitions +
", groupTypeIds=" + groupTypeIds +
", emptyGroupList=" + emptyGroupList +
", personCount=" + personCount +
", locked=" + locked +
", groupSpecifications=" + groupSpecifications +
", emptyGroupPropertyValues=" + emptyGroupPropertyValues +
", groupMemberships=" + groupMemberships +
'}';
}

public Data() {
groupPropertyDefinitions = new LinkedHashMap<>();
groupTypeIds = new LinkedHashSet<>();
Expand Down Expand Up @@ -688,4 +721,23 @@ public PluginDataBuilder getEmptyBuilder() {
return builder();
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof GroupsPluginData)) return false;
GroupsPluginData that = (GroupsPluginData) o;
return data.equals(that.data);
}

@Override
public int hashCode() {
return Objects.hash(data);
}

@Override
public String toString() {
return "GroupsPluginData{" +
"data=" + data +
'}';
}
}
123 changes: 123 additions & 0 deletions gcm4/src/test/java/plugins/groups/datamanagers/AT_GroupsDataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.Set;
import java.util.function.Consumer;

import nucleus.testsupport.testplugin.TestOutputConsumer;
import org.apache.commons.math3.random.RandomGenerator;
import org.apache.commons.math3.util.FastMath;
import org.apache.commons.math3.util.Pair;
Expand Down Expand Up @@ -64,13 +65,135 @@
import util.annotations.UnitTestConstructor;
import util.annotations.UnitTestMethod;
import util.errors.ContractException;
import util.random.RandomGeneratorProvider;
import util.wrappers.MultiKey;
import util.wrappers.MutableDouble;
import util.wrappers.MutableInteger;
import util.wrappers.MutableObject;

public class AT_GroupsDataManager {

@Test
@UnitTestMethod(target = GroupsDataManager.class, name = "init", args = {GroupId.class})
public void testInit_State() {

RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(385296335335709376L);
GroupsPluginData.Builder builder = GroupsPluginData.builder();
GroupsPluginData groupsPluginData = builder.build();

// add a property definition
PropertyDefinition propertyDefinition = TestGroupPropertyId.GROUP_PROPERTY_1_1_BOOLEAN_MUTABLE_NO_TRACK.getPropertyDefinition();
GroupPropertyDefinitionInitialization groupPropertyDefinitionInitialization = GroupPropertyDefinitionInitialization.builder()
.setGroupTypeId(TestGroupTypeId.GROUP_TYPE_1)
.setPropertyDefinition(propertyDefinition)
.setPropertyId(TestGroupPropertyId.GROUP_PROPERTY_1_1_BOOLEAN_MUTABLE_NO_TRACK)
.build();
List<GroupId> expectedGroupIds = new ArrayList<>();
TestPluginData.Builder pluginBuilder = TestPluginData.builder();

// define property definition with the data manager
pluginBuilder.addTestActorPlan("actor", new TestActorPlan(0, (c) -> {
GroupsDataManager groupsDataManager = c.getDataManager(GroupsDataManager.class);
groupsDataManager.addGroupType(groupPropertyDefinitionInitialization.getGroupTypeId());
groupsDataManager.defineGroupProperty(groupPropertyDefinitionInitialization);
GroupConstructionInfo groupConstructionInfo = GroupConstructionInfo.builder()
.setGroupTypeId(groupPropertyDefinitionInitialization.getGroupTypeId())
.setGroupPropertyValue(TestGroupPropertyId.GROUP_PROPERTY_1_1_BOOLEAN_MUTABLE_NO_TRACK, true)
.build();
GroupId groupId = groupsDataManager.addGroup(groupConstructionInfo);
expectedGroupIds.add(groupId);
groupsDataManager.setGroupPropertyValue(groupId, groupPropertyDefinitionInitialization.getPropertyId(), true);
}));

// show that the plugin data contains what we defined
TestPluginData testPluginData = pluginBuilder.build();
Long seed = randomGenerator.nextLong();
Factory factory = GroupsTestPluginFactory.factory(30, 1, 10, seed, testPluginData)
.setGroupsPluginData(groupsPluginData);
TestOutputConsumer testOutputConsumer = TestSimulation.builder().addPlugins(factory.getPlugins())
.setSimulationHaltTime(2)
.setProduceSimulationStateOnHalt(true)
.build()
.execute();
Map<GroupsPluginData, Integer> outputItems = testOutputConsumer.getOutputItems(GroupsPluginData.class);
assertEquals(1, outputItems.size());
GroupsPluginData actualPluginData = outputItems.keySet().iterator().next();
GroupsPluginData expectedPluginData = GroupsPluginData.builder()
.defineGroupProperty(groupPropertyDefinitionInitialization.getGroupTypeId(), groupPropertyDefinitionInitialization.getPropertyId(), groupPropertyDefinitionInitialization.getPropertyDefinition())
.addGroupTypeId(groupPropertyDefinitionInitialization.getGroupTypeId())
.addGroup(expectedGroupIds.get(0), groupPropertyDefinitionInitialization.getGroupTypeId())
.setGroupPropertyValue(expectedGroupIds.get(0), groupPropertyDefinitionInitialization.getPropertyId(), true)
.build();
assertEquals(expectedPluginData, actualPluginData);

// show that the plugin data persists after multiple actions
PropertyDefinition propertyDefinition2 = TestGroupPropertyId.GROUP_PROPERTY_2_2_INTEGER_MUTABLE_TRACK.getPropertyDefinition();
GroupPropertyDefinitionInitialization groupPropertyDefinitionInitialization2 = GroupPropertyDefinitionInitialization.builder()
.setGroupTypeId(TestGroupTypeId.GROUP_TYPE_2)
.setPropertyDefinition(propertyDefinition2)
.setPropertyId(TestGroupPropertyId.GROUP_PROPERTY_2_2_INTEGER_MUTABLE_TRACK)
.build();

PropertyDefinition propertyDefinition3 = TestGroupPropertyId.GROUP_PROPERTY_2_3_DOUBLE_MUTABLE_TRACK.getPropertyDefinition();
GroupPropertyDefinitionInitialization groupPropertyDefinitionInitialization3 = GroupPropertyDefinitionInitialization.builder()
.setGroupTypeId(TestGroupTypeId.GROUP_TYPE_3)
.setPropertyDefinition(propertyDefinition3)
.setPropertyId(TestGroupPropertyId.GROUP_PROPERTY_2_3_DOUBLE_MUTABLE_TRACK)
.build();

expectedGroupIds.clear();
pluginBuilder = TestPluginData.builder();

pluginBuilder.addTestActorPlan("actor", new TestActorPlan(1, (c) -> {
GroupsDataManager groupsDataManager = c.getDataManager(GroupsDataManager.class);
groupsDataManager.addGroupType(groupPropertyDefinitionInitialization2.getGroupTypeId());
groupsDataManager.defineGroupProperty(groupPropertyDefinitionInitialization2);
GroupConstructionInfo groupConstructionInfo = GroupConstructionInfo.builder()
.setGroupTypeId(groupPropertyDefinitionInitialization2.getGroupTypeId())
.setGroupPropertyValue(TestGroupPropertyId.GROUP_PROPERTY_2_2_INTEGER_MUTABLE_TRACK, 43)
.build();
GroupId groupId = groupsDataManager.addGroup(groupConstructionInfo);
expectedGroupIds.add(groupId);
groupsDataManager.setGroupPropertyValue(groupId, groupPropertyDefinitionInitialization2.getPropertyId(), 43);
groupsDataManager.setGroupPropertyValue(groupId, groupPropertyDefinitionInitialization2.getPropertyId(), 57);

groupsDataManager.addGroupType(groupPropertyDefinitionInitialization3.getGroupTypeId());
groupsDataManager.defineGroupProperty(groupPropertyDefinitionInitialization3);
GroupConstructionInfo groupConstructionInfo2 = GroupConstructionInfo.builder()
.setGroupTypeId(groupPropertyDefinitionInitialization3.getGroupTypeId())
.setGroupPropertyValue(TestGroupPropertyId.GROUP_PROPERTY_2_3_DOUBLE_MUTABLE_TRACK, 15.9)
.build();
GroupId groupId2 = groupsDataManager.addGroup(groupConstructionInfo2);
expectedGroupIds.add(groupId2);
groupsDataManager.setGroupPropertyValue(groupId2, groupPropertyDefinitionInitialization3.getPropertyId(), 15.9);
groupsDataManager.setGroupPropertyValue(groupId2, groupPropertyDefinitionInitialization3.getPropertyId(), 34.2);
}));

testPluginData = pluginBuilder.build();
seed = randomGenerator.nextLong();
factory = GroupsTestPluginFactory.factory(30, 1, 10, seed, testPluginData)
.setGroupsPluginData(groupsPluginData);
testOutputConsumer = TestSimulation.builder().addPlugins(factory.getPlugins())
.setSimulationHaltTime(2)
.setProduceSimulationStateOnHalt(true)
.build()
.execute();
outputItems = testOutputConsumer.getOutputItems(GroupsPluginData.class);
assertEquals(1, outputItems.size());
actualPluginData = outputItems.keySet().iterator().next();
expectedPluginData = GroupsPluginData.builder()
.defineGroupProperty(groupPropertyDefinitionInitialization2.getGroupTypeId(), groupPropertyDefinitionInitialization2.getPropertyId(), groupPropertyDefinitionInitialization2.getPropertyDefinition())
.defineGroupProperty(groupPropertyDefinitionInitialization3.getGroupTypeId(), groupPropertyDefinitionInitialization3.getPropertyId(), groupPropertyDefinitionInitialization3.getPropertyDefinition())
.addGroupTypeId(groupPropertyDefinitionInitialization2.getGroupTypeId())
.addGroupTypeId(groupPropertyDefinitionInitialization3.getGroupTypeId())
.addGroup(expectedGroupIds.get(0), groupPropertyDefinitionInitialization2.getGroupTypeId())
.addGroup(expectedGroupIds.get(1), groupPropertyDefinitionInitialization3.getGroupTypeId())
.setGroupPropertyValue(expectedGroupIds.get(0), groupPropertyDefinitionInitialization2.getPropertyId(), 57)
.setGroupPropertyValue(expectedGroupIds.get(1), groupPropertyDefinitionInitialization3.getPropertyId(), 34.2)
.build();
assertEquals(expectedPluginData, actualPluginData);
}

@Test
@UnitTestMethod(target = GroupsDataManager.class, name = "removeGroup", args = { GroupId.class })
public void testRemoveGroup() {
Expand Down