Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history 
Signed-off-by: massifben <[email protected]>
  • Loading branch information
@massifben
massifben committed Jan 21, 2025
1 parent fed4623 commit 5f44b9a
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 579 deletions.
88 changes: 0 additions & 88 deletions sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LNodeStatusService.java
View file

This file was deleted.

4 changes: 0 additions & 4 deletions sct-commons/src/main/java/org/lfenergy/compas/sct/commons/domain/DoLinkedToDaFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ public DoLinkedToDaFilter(String doName, List<String> sdoNames, String daName, L
this.bdaNames = bdaNames == null ? Collections.emptyList() : List.copyOf(bdaNames);
}

public DoLinkedToDaFilter() {
this(null, null, null, null);
}

public static DoLinkedToDaFilter from(String doNames, String daNames) {
String doName = null;
List<String> sdoNames = null;
Expand Down
50 changes: 24 additions & 26 deletions sct-commons/src/test/java/org/lfenergy/compas/sct/commons/DataTypeTemplatesServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

package org.lfenergy.compas.sct.commons;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.lfenergy.compas.scl2007b4.model.*;
import org.lfenergy.compas.sct.commons.domain.DataAttribute;
Expand All @@ -23,12 +24,18 @@
class DataTypeTemplatesServiceTest {


private DataTypeTemplatesService dataTypeTemplatesService;

@BeforeEach
void setUp() {
dataTypeTemplatesService = new DataTypeTemplatesService();
}

@Test
void isDoModAndDaStValExist_when_LNodeType_not_exist_should_return_false() {
//Given
TDataTypeTemplates dtt = new TDataTypeTemplates();
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId");
//Then
assertThat(result).isFalse();
Expand All @@ -43,7 +50,6 @@ void isDoModAndDaStValExist_when_Do_not_exist_should_return_false() {
tlNodeType.setId("lnodeTypeId");
dtt.getLNodeType().add(tlNodeType);
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId");
//Then
assertThat(result).isFalse();
Expand All @@ -61,7 +67,6 @@ void isDoModAndDaStValExist_when_DoType_not_exist_should_return_false() {
tlNodeType.getDO().add(tdo);
dtt.getLNodeType().add(tlNodeType);
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId");
//Then
assertThat(result).isFalse();
Expand All @@ -83,7 +88,6 @@ void isDoModAndDaStValExist_when_Da_Mod_not_exist_should_return_false() {
tdoType.setId("doTypeId");
dtt.getDOType().add(tdoType);
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId");
//Then
assertThat(result).isFalse();
Expand All @@ -108,7 +112,6 @@ void isDoModAndDaStValExist_when_Da_stVal_not_found_should_return_false() {
tdoType.getSDOOrDA().add(tda);
dtt.getDOType().add(tdoType);
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId");
//Then
assertThat(result).isFalse();
Expand All @@ -133,7 +136,6 @@ void isDoModAndDaStValExist_when_DO_Mod_And_DA_stVal_exist_return_true() {
tdoType.getSDOOrDA().add(tda);
dtt.getDOType().add(tdoType);
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId");
//Then
assertThat(result).isTrue();
Expand All @@ -145,10 +147,9 @@ void getFilteredDoLinkedToDa_should_return_expected_items() {
TDataTypeTemplates dtt = initDttFromFile("/dtt-test-schema-conf/scd_dtt_do_sdo_da_bda_test.xml");
String lNodeTypeId = "LNodeType0";

DoLinkedToDaFilter doLinkedToDaFilter = new DoLinkedToDaFilter();
DoLinkedToDaFilter doLinkedToDaFilter = new DoLinkedToDaFilter(null, null, null, null);

//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getFilteredDoLinkedToDa(dtt, lNodeTypeId, doLinkedToDaFilter).toList();
//Then
assertThat(result).hasSize(9)
Expand Down Expand Up @@ -189,7 +190,6 @@ void getFilteredDOAndDA_when_given_DoName_should_return_expected_dataReference()
DoLinkedToDaFilter doLinkedToDaFilter = DoLinkedToDaFilter.from("SecondDoName", "");

//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getFilteredDoLinkedToDa(dtt, lNodeTypeId, doLinkedToDaFilter).toList();
//Then
assertThat(result).hasSize(1).extracting(doLinkedToDa1 -> doLinkedToDa1.dataObject().getDoName(),
Expand All @@ -210,7 +210,6 @@ void getFilteredDOAndDA_when_given_DO_with_one_structName_should_return_expected

DoLinkedToDaFilter doLinkedToDaFilter = DoLinkedToDaFilter.from("FirstDoName.sdoName1", "");
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getFilteredDoLinkedToDa(dtt, lNodeTypeId, doLinkedToDaFilter).toList();
//Then
assertThat(result).hasSize(3).extracting(doLinkedToDa1 -> doLinkedToDa1.dataObject().getDoName(),
Expand All @@ -232,7 +231,6 @@ void getFilteredDOAndDA_when_given_DO_with_many_structName_should_return_expecte

DoLinkedToDaFilter doLinkedToDaFilter = DoLinkedToDaFilter.from("FirstDoName.sdoName1.sdoName21", "");
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getFilteredDoLinkedToDa(dtt, lNodeTypeId, doLinkedToDaFilter).toList();
//Then
assertThat(result).hasSize(2).extracting(doLinkedToDa1 -> doLinkedToDa1.dataObject().getDoName(),
Expand All @@ -254,7 +252,6 @@ void getFilteredDOAndDA_when_given_DO_and_DA_with_structNames_should_return_expe
DoLinkedToDaFilter doLinkedToDaFilter = DoLinkedToDaFilter.from("FirstDoName.sdoName2", "structDaName1.structBdaName1.enumBdaName22");

//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getFilteredDoLinkedToDa(dtt, lNodeTypeId, doLinkedToDaFilter).toList();
//Then
assertThat(result).hasSize(1).extracting(doLinkedToDa1 -> doLinkedToDa1.dataObject().getDoName(),
Expand Down Expand Up @@ -286,7 +283,6 @@ void findDoLinkedToDa_should_find_DO_SDO_DA_and_all_BDA() {
DoLinkedToDa doLinkedToDa = new DoLinkedToDa(dataObject, dataAttribute);
DoLinkedToDaFilter doLinkedToDaFilter = new DoLinkedToDaFilter("Do", List.of("sdo1", "d"), "antRef", List.of("bda1", "bda2", "bda3"));
// When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
Optional<DoLinkedToDa> result = dataTypeTemplatesService.findDoLinkedToDa(dtt, "LNO1", doLinkedToDaFilter);
// Then
assertThat(result).get().usingRecursiveComparison().isEqualTo(doLinkedToDa);
Expand All @@ -308,7 +304,6 @@ void findDoLinkedToDa_should_find_DO_SDO_DA_and_partial_BDA_list() {
dataAttribute.setType("EnumType1");
DoLinkedToDa doLinkedToDa = new DoLinkedToDa(dataObject, dataAttribute);
// When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
Optional<DoLinkedToDa> result = dataTypeTemplatesService.findDoLinkedToDa(dtt, "LN1", new DoLinkedToDaFilter("Do1", List.of("sdo1", "sdo2"), "da2", List.of("bda1", "bda2")));
// Then
assertThat(result).get().usingRecursiveComparison().isEqualTo(doLinkedToDa);
Expand All @@ -327,7 +322,6 @@ void findDoLinkedToDa_should_find_DO_DA() {
dataAttribute.setFc(TFCEnum.ST);
DoLinkedToDa doLinkedToDa = new DoLinkedToDa(dataObject, dataAttribute);
// When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
Optional<DoLinkedToDa> result = dataTypeTemplatesService.findDoLinkedToDa(dtt, "LN1", new DoLinkedToDaFilter("Do1", List.of(), "da1", List.of()));
// Then
assertThat(result).get().usingRecursiveComparison().isEqualTo(doLinkedToDa);
Expand All @@ -338,7 +332,6 @@ void getAllDOAndDA_when_LNodeType_not_exist_should_return_empty_list() {
//Given
TDataTypeTemplates dtt = new TDataTypeTemplates();
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
//Then
assertThat(result).isEmpty();
Expand All @@ -352,8 +345,7 @@ void getAllDOAndDA_when_DO_not_exist_should_return_empty_list() {
tlNodeType.setId("lnodeTypeId");
dtt.getLNodeType().add(tlNodeType);
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
//Then
assertThat(result).isEmpty();
}
Expand All @@ -370,8 +362,7 @@ void getAllDOAndDA_when_DoType_not_exist_should_return_empty_list() {
tlNodeType.getDO().add(tdo);
dtt.getLNodeType().add(tlNodeType);
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
//Then
assertThat(result).isEmpty();
}
Expand All @@ -393,8 +384,7 @@ void getAllDOAndDA_when_DA_not_exist_should_return_empty_list() {
dtt.getDOType().add(tdoType);
scl.setDataTypeTemplates(dtt);
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
//Then
assertThat(result).isEmpty();
}
Expand All @@ -419,8 +409,7 @@ void getAllDOAndDA_when_1DO_linked_to_1DA_should_return_expectedItems() {
dtt.getDOType().add(tdoType);
scl.setDataTypeTemplates(dtt);
//When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
//Then
assertThat(result).hasSize(1);
assertThat(result.getFirst())
Expand All @@ -437,8 +426,7 @@ void getAllDOAndDA_should_return_all_dataReference() {
// File contain all combinations that can be made
TDataTypeTemplates dtt = initDttFromFile("/dtt-test-schema-conf/scd_dtt_do_sdo_da_bda_tests.xml");
// When
DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
List<DoLinkedToDa> result = dataTypeTemplatesService.getAllDoLinkedToDa(dtt).toList();
// Then
assertThat(result).hasSize(34)
.extracting(doLinkedToDa1 -> doLinkedToDa1.dataObject().getDoName(),
Expand Down Expand Up @@ -538,4 +526,14 @@ void getAllDOAndDA_should_return_all_dataReference() {
);
}

@Test
void getEnumValues_should_succeed() {
// Given
TDataTypeTemplates dtt = initDttFromFile("/dtt-test-schema-conf/scd_dtt_do_sdo_da_bda_tests.xml");
// When
List<String> enumValues = dataTypeTemplatesService.getEnumValues(dtt, "LN1", DoLinkedToDaFilter.from("Do11", "sampleDa11")).toList();
// Then
assertThat(enumValues).containsExactly("REB", "RVB", "RVL", "RVB+L");
}

}
Loading

0 comments on commit 5f44b9a

Please sign in to comment.