Skip to content

Commit f22f880

Browse files
author
Dennis Labordus
committed
Renamed method and add enum.
Signed-off-by: Dennis Labordus <[email protected]>
1 parent db16185 commit f22f880

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

‎scl-extension/src/test/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsFieldTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import org.junit.jupiter.api.Test;
77

88
import static org.junit.jupiter.api.Assertions.assertEquals;
9-
import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsField.SCL_FILE_TYPE;
10-
import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsField.SCL_NAME;
9+
import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsField.*;
1110

1211
class CompasExtensionsFieldTest {
1312
@Test
1413
void enum_WhenRetrievingTheFieldName_ThenTheCorrectStringIsReturned() {
1514
assertEquals("SclName", SCL_NAME.getFieldName());
1615
assertEquals("SclFileType", SCL_FILE_TYPE.getFieldName());
16+
assertEquals("Labels", LABELS.getFieldName());
1717
}
1818
}

‎scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/CompasExtensionsManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public Optional<TPrivate> getCompasPrivate(SCL scl) {
2727
return Optional.empty();
2828
}
2929

30-
public Optional<TCompasLabels> getLabels(TPrivate compasPrivate) {
30+
public Optional<TCompasLabels> getCompasLabels(TPrivate compasPrivate) {
3131
return getCompasValue(compasPrivate, LABELS, TCompasLabels.class);
3232
}
3333

‎scl2003/src/test/java/org/lfenergy/compas/scl2003/commons/CompasExtensionsManagerTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,32 +164,32 @@ void getCompasSclFileType_WhenCalledWithoutType_ThenNoTypeReturned() {
164164
}
165165

166166
@Test
167-
void getLabels_WhenCalledNullPassed_ThenNoLabelsReturned() {
168-
var value = manager.getLabels(null);
167+
void getCompasLabels_WhenCalledNullPassed_ThenNoLabelsReturned() {
168+
var value = manager.getCompasLabels(null);
169169

170170
assertFalse(value.isPresent());
171171
}
172172

173173
@Test
174-
void getLabels_WhenCalledWithLabels_ThenLabelsReturned() {
174+
void getCompasLabels_WhenCalledWithLabels_ThenLabelsReturned() {
175175
var scl = readSCL("scl_with_compas_private.scd");
176176
var compasPrivate = manager.getCompasPrivate(scl);
177177

178178
compasPrivate.ifPresentOrElse(tPrivate -> {
179-
var labels = manager.getLabels(tPrivate);
179+
var labels = manager.getCompasLabels(tPrivate);
180180

181181
assertTrue(labels.isPresent());
182182
assertEquals("Label1", labels.get().getLabel().get(0));
183183
}, () -> fail(COMPAS_PRIVATE_NOT_FOUND));
184184
}
185185

186186
@Test
187-
void getLabels_WhenCalledWithoutLabels_ThenNoLabelsReturned() {
187+
void getCompasLabels_WhenCalledWithoutLabels_ThenNoLabelsReturned() {
188188
var scl = readSCL("scl_without_labels_compas_private.scd");
189189

190190
var compasPrivate = manager.getCompasPrivate(scl);
191191
compasPrivate.ifPresentOrElse(tPrivate -> {
192-
var labels = manager.getLabels(tPrivate);
192+
var labels = manager.getCompasLabels(tPrivate);
193193

194194
assertFalse(labels.isPresent());
195195
}, () -> fail(COMPAS_PRIVATE_NOT_FOUND));

‎scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/CompasExtensionsManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public Optional<String> getCompasSclName(TPrivate compasPrivate) {
4242
return getCompasValue(compasPrivate, SCL_NAME, String.class);
4343
}
4444

45-
public Optional<TCompasLabels> getLabels(TPrivate compasPrivate) {
45+
public Optional<TCompasLabels> getCompasLabels(TPrivate compasPrivate) {
4646
return getCompasValue(compasPrivate, LABELS, TCompasLabels.class);
4747
}
4848

‎scl2007b/src/test/java/org/lfenergy/compas/scl2007b/commons/CompasExtensionsManagerTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,32 +164,32 @@ void getCompasSclFileType_WhenCalledWithoutType_ThenNoTypeReturned() {
164164
}
165165

166166
@Test
167-
void getLabels_WhenCalledNullPassed_ThenNoLabelsReturned() {
168-
var value = manager.getLabels(null);
167+
void getCompasLabels_WhenCalledNullPassed_ThenNoLabelsReturned() {
168+
var value = manager.getCompasLabels(null);
169169

170170
assertFalse(value.isPresent());
171171
}
172172

173173
@Test
174-
void getLabels_WhenCalledWithLabels_ThenLabelsReturned() {
174+
void getCompasLabels_WhenCalledWithLabels_ThenLabelsReturned() {
175175
var scl = readSCL("scl_with_compas_private.scd");
176176
var compasPrivate = manager.getCompasPrivate(scl);
177177

178178
compasPrivate.ifPresentOrElse(tPrivate -> {
179-
var labels = manager.getLabels(tPrivate);
179+
var labels = manager.getCompasLabels(tPrivate);
180180

181181
assertTrue(labels.isPresent());
182182
assertEquals("Label1", labels.get().getLabel().get(0));
183183
}, () -> fail(COMPAS_PRIVATE_NOT_FOUND));
184184
}
185185

186186
@Test
187-
void getLabels_WhenCalledWithoutLabels_ThenNoLabelsReturned() {
187+
void getCompasLabels_WhenCalledWithoutLabels_ThenNoLabelsReturned() {
188188
var scl = readSCL("scl_without_labels_compas_private.scd");
189189

190190
var compasPrivate = manager.getCompasPrivate(scl);
191191
compasPrivate.ifPresentOrElse(tPrivate -> {
192-
var labels = manager.getLabels(tPrivate);
192+
var labels = manager.getCompasLabels(tPrivate);
193193

194194
assertFalse(labels.isPresent());
195195
}, () -> fail(COMPAS_PRIVATE_NOT_FOUND));

‎scl2007b4/src/main/java/org/lfenergy/compas/scl2007b4/commons/CompasExtensionsManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public Optional<SclFileType> getCompasSclFileType(TPrivate compasPrivate) {
3535
return getCompasValue(compasPrivate, SCL_FILE_TYPE, SclFileType.class);
3636
}
3737

38-
public Optional<TCompasLabels> getLabels(TPrivate compasPrivate) {
38+
public Optional<TCompasLabels> getCompasLabels(TPrivate compasPrivate) {
3939
return getCompasValue(compasPrivate, LABELS, TCompasLabels.class);
4040
}
4141

‎scl2007b4/src/test/java/org/lfenergy/compas/scl2007b4/commons/CompasExtensionsManagerTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,32 +164,32 @@ void getCompasSclFileType_WhenCalledWithoutType_ThenNoTypeReturned() {
164164
}
165165

166166
@Test
167-
void getLabels_WhenCalledNullPassed_ThenNoLabelsReturned() {
168-
var value = manager.getLabels(null);
167+
void getCompasLabels_WhenCalledNullPassed_ThenNoLabelsReturned() {
168+
var value = manager.getCompasLabels(null);
169169

170170
assertFalse(value.isPresent());
171171
}
172172

173173
@Test
174-
void getLabels_WhenCalledWithLabels_ThenLabelsReturned() {
174+
void getCompasLabels_WhenCalledWithLabels_ThenLabelsReturned() {
175175
var scl = readSCL("scl_with_compas_private.scd");
176176
var compasPrivate = manager.getCompasPrivate(scl);
177177

178178
compasPrivate.ifPresentOrElse(tPrivate -> {
179-
var labels = manager.getLabels(tPrivate);
179+
var labels = manager.getCompasLabels(tPrivate);
180180

181181
assertTrue(labels.isPresent());
182182
assertEquals("Label1", labels.get().getLabel().get(0));
183183
}, () -> fail(COMPAS_PRIVATE_NOT_FOUND));
184184
}
185185

186186
@Test
187-
void getLabels_WhenCalledWithoutLabels_ThenNoLabelsReturned() {
187+
void getCompasLabels_WhenCalledWithoutLabels_ThenNoLabelsReturned() {
188188
var scl = readSCL("scl_without_labels_compas_private.scd");
189189

190190
var compasPrivate = manager.getCompasPrivate(scl);
191191
compasPrivate.ifPresentOrElse(tPrivate -> {
192-
var labels = manager.getLabels(tPrivate);
192+
var labels = manager.getCompasLabels(tPrivate);
193193

194194
assertFalse(labels.isPresent());
195195
}, () -> fail(COMPAS_PRIVATE_NOT_FOUND));

0 commit comments

Comments
 (0)