Skip to content

Commit 3e4d13f

Browse files
rpanackalrpanackal
committed
Update test organization
1 parent 96f2cba commit 3e4d13f

File tree

2 files changed

+49
-63
lines changed

2 files changed

+49
-63
lines changed

‎orchestration/src/test/java/com/sap/ai/sdk/orchestration/ConfigToRequestTransformerTest.java‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package com.sap.ai.sdk.orchestration;
22

3-
import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.GPT_4O;
43
import static com.sap.ai.sdk.orchestration.OrchestrationUnitTest.CUSTOM_GPT_35;
54
import static org.assertj.core.api.Assertions.assertThat;
65
import static org.assertj.core.api.Assertions.assertThatThrownBy;
76

87
import com.sap.ai.sdk.orchestration.client.model.ChatMessage;
9-
import com.sap.ai.sdk.orchestration.client.model.DPIConfig;
10-
import com.sap.ai.sdk.orchestration.client.model.DPIEntities;
118
import com.sap.ai.sdk.orchestration.client.model.Template;
129
import java.util.List;
1310
import java.util.Map;
@@ -78,50 +75,4 @@ void testMessagesHistory() {
7875

7976
assertThat(actual.getMessagesHistory()).containsExactly(systemMessage);
8077
}
81-
82-
@Test
83-
void testDpiMaskingConfig() {
84-
var maskingConfig = DpiMasking.anonymization().withEntities(DPIEntities.ADDRESS);
85-
var config =
86-
new OrchestrationModuleConfig()
87-
.withLlmConfig(CUSTOM_GPT_35)
88-
.withMaskingConfig(maskingConfig);
89-
90-
var actual = ConfigToRequestTransformer.toModuleConfigs(config);
91-
92-
assertThat(actual.getMaskingModuleConfig()).isNotNull();
93-
assertThat(actual.getMaskingModuleConfig().getMaskingProviders()).hasSize(1);
94-
DPIConfig dpiConfig = (DPIConfig) actual.getMaskingModuleConfig().getMaskingProviders().get(0);
95-
assertThat(dpiConfig.getMethod()).isEqualTo(DPIConfig.MethodEnum.ANONYMIZATION);
96-
assertThat(dpiConfig.getEntities()).hasSize(1);
97-
assertThat(dpiConfig.getEntities().get(0).getType()).isEqualTo(DPIEntities.ADDRESS);
98-
99-
var configModified = config.withMaskingConfig(maskingConfig);
100-
assertThat(configModified.getMaskingConfig()).isNotNull();
101-
assertThat(configModified.getMaskingConfig().getMaskingProviders())
102-
.withFailMessage("withMaskingConfig() should overwrite the existing config and not append")
103-
.hasSize(1);
104-
}
105-
106-
@Test
107-
void testLLMConfig() {
108-
Map<String, Object> params = Map.of("foo", "bar");
109-
String version = "2024-05-13";
110-
OrchestrationAiModel aiModel = GPT_4O.withModelParams(params).withModelVersion(version);
111-
var config = new OrchestrationModuleConfig().withLlmConfig(aiModel);
112-
113-
var actual = ConfigToRequestTransformer.toModuleConfigs(config);
114-
115-
assertThat(actual.getLlmModuleConfig()).isNotNull();
116-
assertThat(actual.getLlmModuleConfig().getModelName()).isEqualTo(GPT_4O.getModelName());
117-
assertThat(actual.getLlmModuleConfig().getModelParams()).isEqualTo(params);
118-
assertThat(actual.getLlmModuleConfig().getModelVersion()).isEqualTo(version);
119-
120-
assertThat(GPT_4O.getModelParams())
121-
.withFailMessage("Static models should be unchanged")
122-
.isEmpty();
123-
assertThat(GPT_4O.getModelVersion())
124-
.withFailMessage("Static models should be unchanged")
125-
.isEqualTo("latest");
126-
}
12778
}

‎orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationModuleConfigTest.java‎

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
package com.sap.ai.sdk.orchestration;
22

33
import static com.sap.ai.sdk.orchestration.AzureModerationPolicy.ALLOW_SAFE_LOW_MEDIUM;
4+
import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.GPT_4O;
45
import static org.assertj.core.api.Assertions.assertThat;
56
import static org.assertj.core.api.Assertions.assertThatThrownBy;
67

7-
import com.sap.ai.sdk.orchestration.client.model.LLMModuleConfig;
8+
import com.sap.ai.sdk.orchestration.client.model.DPIConfig;
9+
import com.sap.ai.sdk.orchestration.client.model.DPIEntities;
810
import java.util.Map;
9-
import org.junit.jupiter.api.BeforeEach;
1011
import org.junit.jupiter.api.Test;
1112

1213
class OrchestrationModuleConfigTest {
1314

14-
private OrchestrationModuleConfig config;
15-
16-
@BeforeEach
17-
void setUp() {
18-
final var llmModuleConfig =
19-
new LLMModuleConfig().modelName("gpt-35-turbo").modelParams(Map.of());
20-
config = new OrchestrationModuleConfig().withLlmConfig(llmModuleConfig);
21-
}
22-
2315
@Test
2416
void testStackingInputAndOutputFilter() {
17+
final var config = new OrchestrationModuleConfig().withLlmConfig(GPT_4O);
18+
2519
final var filter =
2620
new AzureContentFilter()
2721
.hate(ALLOW_SAFE_LOW_MEDIUM)
@@ -40,13 +34,54 @@ void testStackingInputAndOutputFilter() {
4034

4135
@Test
4236
void testThrowOnEmptyFilterConfig() {
43-
final var filter = new AzureContentFilter();
4437

45-
assertThatThrownBy(() -> config.withInputFiltering(filter))
38+
final var config = new OrchestrationModuleConfig().withLlmConfig(GPT_4O);
39+
40+
assertThatThrownBy(() -> config.withInputFiltering(new AzureContentFilter()))
4641
.isInstanceOf(IllegalArgumentException.class)
4742
.hasMessage("At least one filter moderation policy must be set");
48-
assertThatThrownBy(() -> config.withOutputFiltering(filter))
43+
assertThatThrownBy(() -> config.withOutputFiltering(new AzureContentFilter()))
4944
.isInstanceOf(IllegalArgumentException.class)
5045
.hasMessage("At least one filter moderation policy must be set");
5146
}
47+
48+
@Test
49+
void testDpiMaskingConfig() {
50+
var maskingConfig = DpiMasking.anonymization().withEntities(DPIEntities.ADDRESS);
51+
var config =
52+
new OrchestrationModuleConfig().withLlmConfig(GPT_4O).withMaskingConfig(maskingConfig);
53+
54+
assertThat(config.getMaskingConfig()).isNotNull();
55+
assertThat(config.getMaskingConfig().getMaskingProviders()).hasSize(1);
56+
DPIConfig dpiConfig = (DPIConfig) config.getMaskingConfig().getMaskingProviders().get(0);
57+
assertThat(dpiConfig.getMethod()).isEqualTo(DPIConfig.MethodEnum.ANONYMIZATION);
58+
assertThat(dpiConfig.getEntities()).hasSize(1);
59+
assertThat(dpiConfig.getEntities().get(0).getType()).isEqualTo(DPIEntities.ADDRESS);
60+
61+
var configModified = config.withMaskingConfig(maskingConfig);
62+
assertThat(configModified.getMaskingConfig()).isNotNull();
63+
assertThat(configModified.getMaskingConfig().getMaskingProviders())
64+
.withFailMessage("withMaskingConfig() should overwrite the existing config and not append")
65+
.hasSize(1);
66+
}
67+
68+
@Test
69+
void testLLMConfig() {
70+
Map<String, Object> params = Map.of("foo", "bar");
71+
String version = "2024-05-13";
72+
OrchestrationAiModel aiModel = GPT_4O.withModelParams(params).withModelVersion(version);
73+
var config = new OrchestrationModuleConfig().withLlmConfig(aiModel);
74+
75+
assertThat(config.getLlmConfig()).isNotNull();
76+
assertThat(config.getLlmConfig().getModelName()).isEqualTo(GPT_4O.getModelName());
77+
assertThat(config.getLlmConfig().getModelParams()).isEqualTo(params);
78+
assertThat(config.getLlmConfig().getModelVersion()).isEqualTo(version);
79+
80+
assertThat(GPT_4O.getModelParams())
81+
.withFailMessage("Static models should be unchanged")
82+
.isEmpty();
83+
assertThat(GPT_4O.getModelVersion())
84+
.withFailMessage("Static models should be unchanged")
85+
.isEqualTo("latest");
86+
}
5287
}

0 commit comments

Comments
 (0)