Skip to content

Commit b8bfabb

Browse files
thomasturrellthomasturrell
committed
more reverts
1 parent 86ac22e commit b8bfabb

13 files changed

Lines changed: 187 additions & 180 deletions

‎xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidatorTests.java‎

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,10 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasCorrectResponsesPatternThen
7171
}
7272

7373
@Test
74-
void
75-
whenIsValidIsCalledWithActivityDefinitionThatHasCorrectResponsesPatternAndInteractionTypeThenResultIsTrue() {
74+
void whenIsValidIsCalledWithActivityDefinitionThatHasCorrectResponsesPatternAndInteractionTypeThenResultIsTrue() {
7675

77-
final var value =
78-
ActivityDefinition.builder()
79-
.correctResponsesPattern(new ArrayList<>())
80-
.interactionType(InteractionType.CHOICE)
81-
.build();
76+
final var value = ActivityDefinition.builder().correctResponsesPattern(new ArrayList<>())
77+
.interactionType(InteractionType.CHOICE).build();
8278

8379
// When IsValid Is Called With Activity Definition That Has Correct Responses Pattern And
8480
// InteractionType
@@ -103,11 +99,8 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasChoicesThenResultIsFalse()
10399
@Test
104100
void whenIsValidIsCalledWithActivityDefinitionThatHasChoicesAndInteractionTypeThenResultIsTrue() {
105101

106-
final var value =
107-
ActivityDefinition.builder()
108-
.choices(new ArrayList<>())
109-
.interactionType(InteractionType.CHOICE)
110-
.build();
102+
final var value = ActivityDefinition.builder().choices(new ArrayList<>())
103+
.interactionType(InteractionType.CHOICE).build();
111104

112105
// When IsValid Is Called With Activity Definition That Has Choices And InteractionType
113106
final var result = validator.isValid(value, null);
@@ -131,11 +124,8 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasScaleThenResultIsFalse() {
131124
@Test
132125
void whenIsValidIsCalledWithActivityDefinitionThatHasScaleAndInteractionTypeThenResultIsTrue() {
133126

134-
final var value =
135-
ActivityDefinition.builder()
136-
.scale(new ArrayList<>())
137-
.interactionType(InteractionType.LIKERT)
138-
.build();
127+
final var value = ActivityDefinition.builder().scale(new ArrayList<>())
128+
.interactionType(InteractionType.LIKERT).build();
139129

140130
// When IsValid Is Called With Activity Definition That Has Scale And InteractionType
141131
final var result = validator.isValid(value, null);
@@ -159,11 +149,8 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasSourceThenResultIsFalse() {
159149
@Test
160150
void whenIsValidIsCalledWithActivityDefinitionAndInteractionTypeThatHasSourceThenResultIsTrue() {
161151

162-
final var value =
163-
ActivityDefinition.builder()
164-
.source(new ArrayList<>())
165-
.interactionType(InteractionType.MATCHING)
166-
.build();
152+
final var value = ActivityDefinition.builder().source(new ArrayList<>())
153+
.interactionType(InteractionType.MATCHING).build();
167154

168155
// When IsValid Is Called With Activity Definition That Has Source And InteractionType
169156
final var result = validator.isValid(value, null);
@@ -188,18 +175,16 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasTargetThenResultIsFalse() {
188175
void whenIsValidIsCalledWithActivityDefinitionThatHasTargetAndInteractionTypeThenResultIsTrue() {
189176

190177
// When IsValid Is Called With Activity Definition That Has Target And InteractionType
191-
final var value =
192-
ActivityDefinition.builder()
193-
.target(new ArrayList<>())
194-
.interactionType(InteractionType.MATCHING)
195-
.build();
178+
final var value = ActivityDefinition.builder().target(new ArrayList<>())
179+
.interactionType(InteractionType.MATCHING).build();
196180

197181
final var result = validator.isValid(value, null);
198182

199183
// Then Result Is True
200184
assertTrue(result);
201185
}
202186

187+
203188
@Test
204189
void whenIsValidIsCalledWithActivityDefinitionThatHasStepsThenResultIsFalse() {
205190

@@ -215,16 +200,15 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasStepsThenResultIsFalse() {
215200
@Test
216201
void whenIsValidIsCalledWithActivityDefinitionThatHasStepsAndInteractionTypeThenResultIsTrue() {
217202

218-
final var value =
219-
ActivityDefinition.builder()
220-
.steps(new ArrayList<>())
221-
.interactionType(InteractionType.PERFORMANCE)
222-
.build();
203+
final var value = ActivityDefinition.builder().steps(new ArrayList<>())
204+
.interactionType(InteractionType.PERFORMANCE).build();
223205

224206
// When IsValid Is Called With Activity Definition That Has Steps And InteractionType
225207
final var result = validator.isValid(value, null);
226208

227209
// Then Result Is True
228210
assertTrue(result);
229211
}
212+
213+
230214
}

‎xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActorValidatorTests.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,8 @@ void whenAgentValueHasOnlyOpenIdThenResultIsTrue() {
126126
void whenAgentValueHasOnlyAccountThenResultIsTrue() {
127127

128128
// When Agent Value Has Only Account
129-
final var value =
130-
Agent.builder()
131-
.account(a -> a.homePage(URI.create("http://example.com")).name("fred"))
132-
.build();
129+
final var value = Agent.builder()
130+
.account(a -> a.homePage(URI.create("http://example.com")).name("fred")).build();
133131

134132
final var result = validator.isValid(value, null);
135133

@@ -141,11 +139,8 @@ void whenAgentValueHasOnlyAccountThenResultIsTrue() {
141139
void whenAgentValueHasMoreThanOneIdentifierThenResultIsFalse() {
142140

143141
// When Agent Value Has More Than One Identifier
144-
final var value =
145-
Agent.builder()
146-
.mbox("mailto:fred@example.com")
147-
.mboxSha1sum("121212121212121212121212")
148-
.build();
142+
final var value = Agent.builder().mbox("mailto:fred@example.com")
143+
.mboxSha1sum("121212121212121212121212").build();
149144

150145
final var result = validator.isValid(value, null);
151146

@@ -230,10 +225,8 @@ void whenGroupValueHasOnlyOpenIdThenResultIsTrue() {
230225
void whenGroupValueHasOnlyAccountThenResultIsTrue() {
231226

232227
// When Group Value Has Only Account
233-
final var value =
234-
Group.builder()
235-
.account(a -> a.homePage(URI.create("http://example.com")).name("fred"))
236-
.build();
228+
final var value = Group.builder()
229+
.account(a -> a.homePage(URI.create("http://example.com")).name("fred")).build();
237230

238231
final var result = validator.isValid(value, null);
239232

@@ -245,15 +238,13 @@ void whenGroupValueHasOnlyAccountThenResultIsTrue() {
245238
void whenGroupValueHasMoreThanOneIdentifierThenResultIsFalse() {
246239

247240
// When Group Value Has More Than One Identifier
248-
final var value =
249-
Group.builder()
250-
.mbox("mailto:fred@example.com")
251-
.mboxSha1sum("121212121212121212121212")
252-
.build();
241+
final var value = Group.builder().mbox("mailto:fred@example.com")
242+
.mboxSha1sum("121212121212121212121212").build();
253243

254244
final var result = validator.isValid(value, null);
255245

256246
// Then Result Is False
257247
assertFalse(result);
258248
}
249+
259250
}

‎xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidatorTests.java‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,8 @@ void whenCallingIsValidWithIdentifiedGroupThenResultIsFalse() {
5454
@Test
5555
void whenCallingIsValidWithIdentifiedGroupWithMembersThenResultIsFalse() {
5656

57-
final Group group =
58-
Group.builder()
59-
.name("A N Other")
60-
.mbox("mailto:another@example.com")
61-
.addMember(m -> m.name("A N Other").mbox("mailto:another@example.com"))
62-
.build();
57+
final Group group = Group.builder().name("A N Other").mbox("mailto:another@example.com")
58+
.addMember(m -> m.name("A N Other").mbox("mailto:another@example.com")).build();
6359

6460
// When Calling Is Valid With Identified Group
6561
final var result = constraintValidator.isValid(group, null);
@@ -71,10 +67,8 @@ void whenCallingIsValidWithIdentifiedGroupWithMembersThenResultIsFalse() {
7167
@Test
7268
void whenCallingIsValidWithGroupWithOneMemberThenResultIsFalse() {
7369

74-
final Group group =
75-
Group.builder()
76-
.addMember(m -> m.name("A N Other").mbox("mailto:another@example.com"))
77-
.build();
70+
final Group group = Group.builder()
71+
.addMember(m -> m.name("A N Other").mbox("mailto:another@example.com")).build();
7872

7973
// When Calling Is Valid With Group With One Member
8074
final var result = constraintValidator.isValid(group, null);
@@ -87,15 +81,15 @@ void whenCallingIsValidWithGroupWithOneMemberThenResultIsFalse() {
8781
void whenCallingIsValidWithGroupWithTwoMembersThenResultIsTrue() {
8882

8983
final Group group =
90-
Group.builder()
91-
.addMember(m -> m.name("A N Other").mbox("mailto:another@example.com"))
92-
.addMember(m -> m.name("A N Other").mbox("mailto:another@example.com"))
93-
.build();
84+
Group.builder().addMember(m -> m.name("A N Other").mbox("mailto:another@example.com"))
85+
.addMember(m -> m.name("A N Other").mbox("mailto:another@example.com")).build();
9486

9587
// When Calling IsValid With Group With Two Members
9688
final var result = constraintValidator.isValid(group, null);
9789

9890
// Then Result Is True
9991
assertThat(result, is(true));
92+
10093
}
94+
10195
}

‎xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUriTests.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@ void whenCallingIsValidWithURIWithSchemeThenResultIsTrue() {
3535
// Then Result Is True
3636
assertThat(result, is(true));
3737
}
38+
3839
}

‎xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTests.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,28 @@ class MboxValidatorTests {
2828

2929
@BeforeAll
3030
static void init() {
31-
validator.initialize(
32-
new Mbox() {
33-
34-
@Override
35-
public Class<? extends Annotation> annotationType() {
36-
return null;
37-
}
38-
39-
@Override
40-
public Class<? extends Payload>[] payload() {
41-
return null;
42-
}
43-
44-
@Override
45-
public String message() {
46-
return null;
47-
}
48-
49-
@Override
50-
public Class<?>[] groups() {
51-
return null;
52-
}
53-
});
31+
validator.initialize(new Mbox() {
32+
33+
@Override
34+
public Class<? extends Annotation> annotationType() {
35+
return null;
36+
}
37+
38+
@Override
39+
public Class<? extends Payload>[] payload() {
40+
return null;
41+
}
42+
43+
@Override
44+
public String message() {
45+
return null;
46+
}
47+
48+
@Override
49+
public Class<?>[] groups() {
50+
return null;
51+
}
52+
});
5453
}
5554

5655
@Test
@@ -83,4 +82,5 @@ void whenValueIsInvalidThenResultIsFalse(String value) {
8382
// Then Result Is False
8483
assertFalse(result);
8584
}
85+
8686
}

‎xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidatorTests.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,5 @@ void whenValueIsNotUndeterminedLocaleThenResultIsTrue() {
5050
// Then Result Is True
5151
assertTrue(result);
5252
}
53+
5354
}

‎xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidatorTests.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,5 @@ void whenValueIsNanThenResultIsFalse() {
8989
// Then Result Is False
9090
assertFalse(result);
9191
}
92+
9293
}

‎xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScoreValidatorTests.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,7 @@ void whenCallingIsValidWithAScoreWithMaxNullThenResultIsTrue() {
8282
// Then Result Is True
8383
assertTrue(result);
8484
}
85+
86+
87+
8588
}

‎xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidatorTest.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ void whenValueHasContextPlatformButNoObjectThenResultIsFalse() {
7474
void whenValueHasContextPlatformAndInvalidObjectThenResultIsFalse() {
7575

7676
// When Value has Context Platform And Invalid Object
77-
final var value =
78-
Statement.builder()
79-
.context(c -> c.platform("platform"))
80-
.statementReferenceObject(sr -> sr.id(UUID.randomUUID()))
81-
.build();
77+
final var value = Statement.builder().context(c -> c.platform("platform"))
78+
79+
.statementReferenceObject(sr -> sr.id(UUID.randomUUID()))
80+
81+
.build();
8282

8383
final var result = validator.isValid(value, null);
8484

@@ -90,15 +90,16 @@ void whenValueHasContextPlatformAndInvalidObjectThenResultIsFalse() {
9090
void whenValueHasContextPlatformAndValidObjectThenResultIsTrue() {
9191

9292
// When Value has Context Platform And Valid Object
93-
final var value =
94-
Statement.builder()
95-
.context(c -> c.platform("platform"))
96-
.activityObject(a -> a.id(URI.create("http://example.com/activity")))
97-
.build();
93+
final var value = Statement.builder().context(c -> c.platform("platform"))
94+
95+
.activityObject(a -> a.id(URI.create("http://example.com/activity")))
96+
97+
.build();
9898

9999
final var result = validator.isValid(value, null);
100100

101101
// Then Result Is True
102102
assertTrue(result);
103103
}
104+
104105
}

‎xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidatorTest.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package dev.learning.xapi.model.validation.internal.validators;
66

7+
78
import static org.junit.jupiter.api.Assertions.assertFalse;
89
import static org.junit.jupiter.api.Assertions.assertTrue;
910

@@ -74,11 +75,11 @@ void whenValueHasContextRevisionButNoObjectThenResultIsFalse() {
7475
void whenValueHasContextRevisionAndInvalidObjectThenResultIsFalse() {
7576

7677
// When Value has Context Revision And Invalid Object
77-
final var value =
78-
Statement.builder()
79-
.context(c -> c.revision("revision"))
80-
.statementReferenceObject(sr -> sr.id(UUID.randomUUID()))
81-
.build();
78+
final var value = Statement.builder().context(c -> c.revision("revision"))
79+
80+
.statementReferenceObject(sr -> sr.id(UUID.randomUUID()))
81+
82+
.build();
8283

8384
final var result = validator.isValid(value, null);
8485

@@ -90,15 +91,16 @@ void whenValueHasContextRevisionAndInvalidObjectThenResultIsFalse() {
9091
void whenValueHasContextRevisionAndValidObjectThenResultIsTrue() {
9192

9293
// When Value has Context Revision And Valid Object
93-
final var value =
94-
Statement.builder()
95-
.context(c -> c.revision("revision"))
96-
.activityObject(a -> a.id(URI.create("http://example.com/activity")))
97-
.build();
94+
final var value = Statement.builder().context(c -> c.revision("revision"))
95+
96+
.activityObject(a -> a.id(URI.create("http://example.com/activity")))
97+
98+
.build();
9899

99100
final var result = validator.isValid(value, null);
100101

101102
// Then Result Is True
102103
assertTrue(result);
103104
}
105+
104106
}

0 commit comments

Comments
 (0)