@@ -105,15 +105,15 @@ void create_WhenCalledWithOutCompasExtension_ThenRepositoryIsCalledAndUUIDIsRetu
105
105
106
106
assertNotNull (uuid );
107
107
assertCompasExtenions (scl , name , type );
108
- assertHistoryItem (scl , initialVersion );
108
+ assertHistoryItem (scl , initialVersion , comment );
109
109
verify (compasSclDataRepository , times (1 )).create (eq (type ), any (UUID .class ), eq (scl ), eq (initialVersion ));
110
110
}
111
111
112
112
@ Test
113
113
void create_WhenCalledWithCompasExtension_ThenRepositoryIsCalledAndUUIDIsReturned () {
114
114
var type = SclType .SCD ;
115
115
var name = "JUSTSOMENAME" ;
116
- var comment = "Some comments " ;
116
+ var comment = "" ;
117
117
var who = "User A" ;
118
118
119
119
var scl = readSCL ();
@@ -125,7 +125,7 @@ void create_WhenCalledWithCompasExtension_ThenRepositoryIsCalledAndUUIDIsReturne
125
125
126
126
assertNotNull (uuid );
127
127
assertCompasExtenions (scl , name , type );
128
- assertHistoryItem (scl , initialVersion );
128
+ assertHistoryItem (scl , initialVersion , comment );
129
129
verify (compasSclDataRepository , times (1 )).create (eq (type ), any (UUID .class ), eq (scl ), eq (initialVersion ));
130
130
}
131
131
@@ -135,7 +135,6 @@ void update_WhenCalledWithCompasElements_ThenRepositoryIsCalled() {
135
135
var name = "JUSTSOMENAME" ;
136
136
var uuid = UUID .randomUUID ();
137
137
var changeSet = ChangeSetType .MAJOR ;
138
- var comment = "Some comments" ;
139
138
var who = "User A" ;
140
139
var nextVersion = initialVersion .getNextVersion (changeSet );
141
140
@@ -147,10 +146,10 @@ void update_WhenCalledWithCompasElements_ThenRepositoryIsCalled() {
147
146
when (compasSclDataRepository .findByUUID (type , uuid )).thenReturn (previousScl );
148
147
doNothing ().when (compasSclDataRepository ).create (type , uuid , scl , nextVersion );
149
148
150
- compasSclDataService .update (type , uuid , changeSet , who , comment , scl );
149
+ compasSclDataService .update (type , uuid , changeSet , who , null , scl );
151
150
152
151
assertCompasExtenions (scl , name , type );
153
- assertHistoryItem (scl , nextVersion );
152
+ assertHistoryItem (scl , nextVersion , null );
154
153
verify (compasSclDataRepository , times (1 )).create (type , uuid , scl , nextVersion );
155
154
verify (compasSclDataRepository , times (1 )).findByUUID (type , uuid );
156
155
}
@@ -213,7 +212,7 @@ private void assertCompasExtenions(Element scl, String name, SclType type) {
213
212
assertEquals (type .toString (), typeElement .get ().getTextContent ());
214
213
}
215
214
216
- private void assertHistoryItem (Element scl , Version version ) {
215
+ private void assertHistoryItem (Element scl , Version version , String comment ) {
217
216
var header = processor .getSclHeader (scl );
218
217
assertTrue (header .isPresent ());
219
218
@@ -225,6 +224,9 @@ private void assertHistoryItem(Element scl, Version version) {
225
224
// The last item should be the one added.
226
225
var item = items .get (items .size () - 1 );
227
226
assertEquals (version .toString (), item .getAttribute (SCL_VERSION_ATTR ));
227
+ if (comment != null && !comment .isEmpty ()) {
228
+ assertTrue (item .getAttribute (SCL_WHAT_ATTR ).contains (comment ));
229
+ }
228
230
}
229
231
230
232
private Element readSCL () {
0 commit comments