Skip to content

Commit 2f5c1fe

Browse files
eviltestereviltester
committed
refactoring to remove method created for tests
1 parent d673020 commit 2f5c1fe

File tree

35 files changed

+196
-219
lines changed

35 files changed

+196
-219
lines changed

‎challenger/src/test/java/uk/co/compendiumdev/challenger/http/completechallenges/ChallengeCompleteTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ public void canPostTodosUpdatePass() {
487487
ensureAtMostXTodoAvailable(10);
488488

489489
final EntityInstanceCollection todos = ChallengeMain.getChallenger().getThingifier().getThingInstancesNamed("todo", challenger.getXChallenger());
490-
final EntityInstance todo = todos.createManagedInstance();
490+
final EntityInstance todo = todos.addInstance( new EntityInstance(todos.definition()));
491491

492492
Map<String, String> x_challenger_header = getXChallengerHeader(challenger.getXChallenger());
493493

@@ -634,7 +634,7 @@ public void canDeleteTodosPass() {
634634
ensureAtMostXTodoAvailable(10);
635635

636636
final EntityInstanceCollection todos = ChallengeMain.getChallenger().getThingifier().getThingInstancesNamed("todo", challenger.getXChallenger());
637-
final EntityInstance todo = todos.createManagedInstance();
637+
final EntityInstance todo = todos.addInstance( new EntityInstance(todos.definition()));
638638

639639
Map<String, String> x_challenger_header = getXChallengerHeader(challenger.getXChallenger());
640640

@@ -653,7 +653,7 @@ public void canDeleteTodosPass() {
653653
public void canGetSpecificTodoPass() {
654654

655655
final EntityInstanceCollection todos = ChallengeMain.getChallenger().getThingifier().getThingInstancesNamed("todo", challenger.getXChallenger());
656-
final EntityInstance todo = todos.createManagedInstance();
656+
final EntityInstance todo = todos.addInstance(new EntityInstance(todos.definition()));
657657

658658
Map<String, String> x_challenger_header = getXChallengerHeader(challenger.getXChallenger());
659659

@@ -769,8 +769,8 @@ public void canFilterTodoPass() {
769769

770770
final EntityInstanceCollection todos = ChallengeMain.getChallenger().getThingifier().getThingInstancesNamed("todo", challenger.getXChallenger());
771771

772-
todos.createManagedInstance().setValue("doneStatus", "true");
773-
todos.createManagedInstance().setValue("doneStatus", "false");
772+
todos.addInstance(new EntityInstance(todos.definition())).setValue("doneStatus", "true");
773+
todos.addInstance(new EntityInstance(todos.definition())).setValue("doneStatus", "false");
774774

775775
final HttpResponseDetails response =
776776
http.send("/todos?doneStatus=true", "GET", x_challenger_header, "");
@@ -1121,10 +1121,10 @@ public void canDeleteAllTodos() {
11211121

11221122
// add some todos in case this is not the last test
11231123

1124-
todos.createManagedInstance();
1125-
todos.createManagedInstance();
1126-
todos.createManagedInstance();
1127-
todos.createManagedInstance();
1124+
todos.addInstance(new EntityInstance(todos.definition()));
1125+
todos.addInstance(new EntityInstance(todos.definition()));
1126+
todos.addInstance(new EntityInstance(todos.definition()));
1127+
todos.addInstance(new EntityInstance(todos.definition()));
11281128

11291129
}
11301130

‎ercoremodel/src/main/java/uk/co/compendiumdev/thingifier/core/domain/instances/EntityInstanceCollection.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,6 @@ public EntityInstance addInstance(EntityInstance instance) {
137137
return instance;
138138
}
139139

140-
/* create and add */
141-
// TODO: this looks like it was added to support testing, consider removing and adding to a test helper
142-
public EntityInstance createManagedInstance() {
143-
return addInstance( new EntityInstance(definition));
144-
}
145-
146140
public int countInstances() {
147141
return instances.size();
148142
}

‎ercoremodel/src/test/java/uk/co/compendiumdev/thingifier/core/EntityRelModelTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void canFindAThingInAModel() {
8181

8282
EntityInstanceCollection thing = erm.getInstanceData().getInstanceCollectionForEntityNamed("thing");
8383

84-
final EntityInstance instance = thing.createManagedInstance();
84+
final EntityInstance instance = thing.addInstance(new EntityInstance(thing.definition()));
8585

8686
final String thingGUID1 = instance.getPrimaryKeyValue();
8787
Assertions.assertNotNull(
@@ -98,7 +98,7 @@ public void canDeleteAThingInAModel() {
9898
erm.createEntityDefinition("thing", "things");
9999
EntityInstanceCollection thing = erm.getInstanceData().getInstanceCollectionForEntityNamed("thing");
100100

101-
final EntityInstance instance = thing.createManagedInstance();
101+
final EntityInstance instance = thing.addInstance(new EntityInstance(thing.definition()));
102102
erm.getInstanceData().deleteEntityInstance(instance);
103103

104104
final String thingGUID = instance.getPrimaryKeyValue();
@@ -118,11 +118,11 @@ public void canClearAllDataInAModel() {
118118
erm.createEntityDefinition("thing2", "thing2");
119119
EntityInstanceCollection thing2 = erm.getInstanceData().getInstanceCollectionForEntityNamed("thing2");
120120

121-
thing.createManagedInstance();
122-
thing.createManagedInstance();
123-
thing2.createManagedInstance();
124-
thing2.createManagedInstance();
125-
thing2.createManagedInstance();
121+
thing.addInstance(new EntityInstance(thing.definition()));
122+
thing.addInstance(new EntityInstance(thing.definition()));
123+
thing2.addInstance(new EntityInstance(thing2.definition()));
124+
thing2.addInstance(new EntityInstance(thing2.definition()));
125+
thing2.addInstance(new EntityInstance(thing2.definition()));
126126

127127
Assertions.assertEquals(2, erm.getInstanceData().getAllInstanceCollections().size());
128128
Assertions.assertEquals(2,
@@ -195,13 +195,13 @@ public void canDeleteAThingWithRelationships() {
195195
getReversedRelationship().
196196
setOptionality(Optionality.MANDATORY_RELATIONSHIP);
197197

198-
final EntityInstance mainThing = thing.createManagedInstance();
198+
final EntityInstance mainThing = thing.addInstance(new EntityInstance(thing.definition()));
199199
mainThing.getRelationships().connect("things",
200-
dependent.createManagedInstance());
200+
dependent.addInstance(new EntityInstance(dependent.definition())));
201201
mainThing.getRelationships().connect("things",
202-
dependent.createManagedInstance());
202+
dependent.addInstance(new EntityInstance(dependent.definition())));
203203
mainThing.getRelationships().connect("things",
204-
dependent.createManagedInstance());
204+
dependent.addInstance(new EntityInstance(dependent.definition())));
205205

206206
Assertions.assertEquals(2, erm.getInstanceData().getAllInstanceCollections().size());
207207
Assertions.assertEquals(3, mainThing.getRelationships().

‎ercoremodel/src/test/java/uk/co/compendiumdev/thingifier/core/ThingTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ public void thingUsageExample(){
2424
person.definition().
2525
addFields(Field.is("name", STRING), Field.is("age", INTEGER));
2626

27-
EntityInstance bob = person.createManagedInstance().
27+
EntityInstance bob = person.addInstance(new EntityInstance(person.definition())).
2828
setValue("name","Bob");
2929

3030
bob.setValue("age", "56");
3131

32-
EntityInstance eris = person.createManagedInstance().
32+
EntityInstance eris = person.addInstance(new EntityInstance(person.definition())).
3333
setValue("name","Eris").setValue("age", "1000");
3434

3535
Assertions.assertEquals(2, person.countInstances());
@@ -52,12 +52,12 @@ public void moreThingUsageExamples(){
5252
Assertions.assertTrue(url.definition().hasFieldNameDefined("visited"));
5353

5454

55-
url.createManagedInstance().
55+
url.addInstance(new EntityInstance(url.definition())).
5656
setValue("name","EvilTester.com").
5757
setValue("url", "http://eviltester.com");
5858

5959

60-
url.createManagedInstance().
60+
url.addInstance(new EntityInstance(url.definition())).
6161
setValue("name","JavaForTesters.com").
6262
setValue("url", "http://javaForTesters.com");
6363

‎ercoremodel/src/test/java/uk/co/compendiumdev/thingifier/core/domain/instances/RelationshipInstanceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ void canCreateARelationshipInstance(){
1919
);
2020
RelationshipDefinition defn = RelationshipDefinition.create(vector);
2121

22-
final EntityInstance fromInstance = thingfrom.createManagedInstance();
23-
final EntityInstance toInstance = thingfrom.createManagedInstance();
22+
final EntityInstance fromInstance = thingfrom.addInstance(new EntityInstance(thingfrom.definition()));
23+
final EntityInstance toInstance = thingfrom.addInstance(new EntityInstance(thingfrom.definition()));
2424
RelationshipVectorInstance rel = new RelationshipVectorInstance(
2525
vector, fromInstance, toInstance);
2626

@@ -32,7 +32,7 @@ void canCreateARelationshipInstance(){
3232

3333
Assertions.assertTrue(rel.involves(fromInstance));
3434
Assertions.assertTrue(rel.involves(toInstance));
35-
Assertions.assertFalse(rel.involves(thingfrom.createManagedInstance()));
35+
Assertions.assertFalse(rel.involves(thingfrom.addInstance(new EntityInstance(thingfrom.definition()))));
3636

3737
Assertions.assertEquals(toInstance, rel.getOtherThingInstance(fromInstance));
3838
Assertions.assertEquals(fromInstance, rel.getOtherThingInstance(toInstance));

‎ercoremodel/src/test/java/uk/co/compendiumdev/thingifier/core/domain/instances/RelationshipsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ void baseData(){
3131

3232
defn = RelationshipDefinition.create(vector);
3333

34-
fromInstance = thingfrom.createManagedInstance();
35-
toInstance = thingto.createManagedInstance();
34+
fromInstance = thingfrom.addInstance(new EntityInstance(thingfrom.definition()));
35+
toInstance = thingto.addInstance(new EntityInstance(thingto.definition()));
3636
}
3737

3838
@Test
@@ -97,7 +97,7 @@ void cannotConnectToThingWhenRelationshipIsNotForTypePassedIn(){
9797

9898
final EntityInstanceRelationships relationships = new EntityInstanceRelationships(fromInstance);
9999

100-
final EntityInstance instance = thingfrom.createManagedInstance();
100+
final EntityInstance instance = thingfrom.addInstance(new EntityInstance(thingfrom.definition()));
101101

102102
final IllegalArgumentException e = Assertions.assertThrows(IllegalArgumentException.class,
103103
() -> relationships.connect(

‎ercoremodel/src/test/java/uk/co/compendiumdev/thingifier/core/query/QueryFiltersBooleanTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@
33

44
import org.junit.jupiter.api.Assertions;
55
import org.junit.jupiter.api.BeforeEach;
6-
import org.junit.jupiter.api.Disabled;
76
import org.junit.jupiter.api.Test;
87
import uk.co.compendiumdev.thingifier.core.EntityRelModel;
98
import uk.co.compendiumdev.thingifier.core.domain.instances.EntityInstanceCollection;
109
import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.FieldType;
1110
import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.Field;
1211
import uk.co.compendiumdev.thingifier.core.domain.instances.EntityInstance;
1312

14-
import java.util.HashMap;
1513
import java.util.List;
16-
import java.util.Map;
1714

1815
public class QueryFiltersBooleanTest {
1916

@@ -35,10 +32,10 @@ public void setupCollectionTestData(){
3532

3633
EntityInstanceCollection thing = erModel.getInstanceData().getInstanceCollectionForEntityNamed("thing");
3734

38-
thing.createManagedInstance().setValue("truefalse", "true");
39-
thing.createManagedInstance().setValue("truefalse", "true");
40-
thing.createManagedInstance().setValue("truefalse", "true");
41-
thing.createManagedInstance().setValue("truefalse", "false");
35+
thing.addInstance( new EntityInstance(thing.definition())).setValue("truefalse", "true");
36+
thing.addInstance( new EntityInstance(thing.definition())).setValue("truefalse", "true");
37+
thing.addInstance( new EntityInstance(thing.definition())).setValue("truefalse", "true");
38+
thing.addInstance(new EntityInstance(thing.definition())).setValue("truefalse", "false");
4239

4340
}
4441

‎ercoremodel/src/test/java/uk/co/compendiumdev/thingifier/core/query/QueryFiltersFloatTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@
33

44
import org.junit.jupiter.api.Assertions;
55
import org.junit.jupiter.api.BeforeEach;
6-
import org.junit.jupiter.api.Disabled;
76
import org.junit.jupiter.api.Test;
87
import uk.co.compendiumdev.thingifier.core.EntityRelModel;
98
import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.Field;
109
import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.FieldType;
1110
import uk.co.compendiumdev.thingifier.core.domain.instances.EntityInstance;
1211
import uk.co.compendiumdev.thingifier.core.domain.instances.EntityInstanceCollection;
1312

14-
import java.util.HashMap;
1513
import java.util.List;
16-
import java.util.Map;
1714

1815
public class QueryFiltersFloatTest {
1916

@@ -29,10 +26,10 @@ public void setupCollectionTestData(){
2926

3027
EntityInstanceCollection thing = erModel.getInstanceData().getInstanceCollectionForEntityNamed("thing");
3128

32-
thing.createManagedInstance().setValue("float", "4.4");
33-
thing.createManagedInstance().setValue("float", "1.1");
34-
thing.createManagedInstance().setValue("float", "3.3");
35-
thing.createManagedInstance().setValue("float", "2.2");
29+
thing.addInstance(new EntityInstance(thing.definition())).setValue("float", "4.4");
30+
thing.addInstance(new EntityInstance(thing.definition())).setValue("float", "1.1");
31+
thing.addInstance(new EntityInstance(thing.definition())).setValue("float", "3.3");
32+
thing.addInstance(new EntityInstance(thing.definition())).setValue("float", "2.2");
3633

3734
}
3835

‎ercoremodel/src/test/java/uk/co/compendiumdev/thingifier/core/query/QueryFiltersIdTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public void setupCollectionTestData(){
2727
EntityInstanceCollection thing = erModel.getInstanceData().getInstanceCollectionForEntityNamed("thing");
2828

2929
// fakeid is a proxy for the actual id which always starts at 1 and auto increments
30-
thing.createManagedInstance().setValue("fakeid", "1");
31-
thing.createManagedInstance().setValue("fakeid", "2");
32-
thing.createManagedInstance().setValue("fakeid", "3");
33-
thing.createManagedInstance().setValue("fakeid", "4");
30+
thing.addInstance(new EntityInstance(thing.definition())).setValue("fakeid", "1");
31+
thing.addInstance(new EntityInstance(thing.definition())).setValue("fakeid", "2");
32+
thing.addInstance(new EntityInstance(thing.definition())).setValue("fakeid", "3");
33+
thing.addInstance(new EntityInstance(thing.definition())).setValue("fakeid", "4");
3434

3535
}
3636

‎ercoremodel/src/test/java/uk/co/compendiumdev/thingifier/core/query/QueryFiltersIntegerTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@
33

44
import org.junit.jupiter.api.Assertions;
55
import org.junit.jupiter.api.BeforeEach;
6-
import org.junit.jupiter.api.Disabled;
76
import org.junit.jupiter.api.Test;
87
import uk.co.compendiumdev.thingifier.core.EntityRelModel;
98
import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.Field;
109
import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.FieldType;
1110
import uk.co.compendiumdev.thingifier.core.domain.instances.EntityInstance;
1211
import uk.co.compendiumdev.thingifier.core.domain.instances.EntityInstanceCollection;
1312

14-
import java.util.HashMap;
1513
import java.util.List;
16-
import java.util.Map;
1714

1815
public class QueryFiltersIntegerTest {
1916

@@ -33,10 +30,10 @@ public void setupCollectionTestData(){
3330

3431
EntityInstanceCollection thing = erModel.getInstanceData().getInstanceCollectionForEntityNamed("thing");
3532

36-
thing.createManagedInstance().setValue("int", "3");
37-
thing.createManagedInstance().setValue("int", "1");
38-
thing.createManagedInstance().setValue("int", "4");
39-
thing.createManagedInstance().setValue("int", "2");
33+
thing.addInstance(new EntityInstance(thing.definition())).setValue("int", "3");
34+
thing.addInstance(new EntityInstance(thing.definition())).setValue("int", "1");
35+
thing.addInstance(new EntityInstance(thing.definition())).setValue("int", "4");
36+
thing.addInstance(new EntityInstance(thing.definition())).setValue("int", "2");
4037

4138
}
4239

0 commit comments

Comments
 (0)