Skip to content

Commit 27e5dc3

Browse files
halajohnhalajohn
authored
refactor: update test cases to use new extension addon paths and remove obsolete manifest JSON file (#1013)
1 parent 79fc0ac commit 27e5dc3

File tree

6 files changed

+272
-195
lines changed

6 files changed

+272
-195
lines changed

‎core/src/ten_manager/tests/test_case/designer/extensions/schema/mod.rs‎

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ mod tests {
5050
(
5151
format!(
5252
"{}{}",
53-
TEST_DIR, "/ten_packages/extension/extension_1"
53+
TEST_DIR, "/ten_packages/extension/extension_addon_1"
5454
),
5555
include_str!(
5656
"../../../../test_data/extension_addon_1_manifest.json"
@@ -105,45 +105,15 @@ mod tests {
105105
// If the extension has schema, it will be included in the response.
106106
assert!(api_response.data.schema.is_some());
107107

108-
let expected_schema = serde_json::json!({
109-
"property": {
110-
"test_property": {
111-
"type": "int8"
112-
}
113-
},
114-
"cmd_out": [
115-
{
116-
"name": "test_cmd",
117-
"property": {
118-
"test_property": {
119-
"type": "int8"
120-
}
121-
}
122-
},
123-
{
124-
"name": "has_required",
125-
"property": {
126-
"foo": {
127-
"type": "string"
128-
}
129-
},
130-
"required": [
131-
"foo"
132-
]
133-
},
134-
{
135-
"name": "has_required_mismatch",
136-
"property": {
137-
"foo": {
138-
"type": "string"
139-
}
140-
},
141-
"required": [
142-
"foo"
143-
]
144-
}
145-
]
146-
});
108+
let expected_schema_str = include_str!(
109+
"../../../../test_data/extension_addon_1_manifest.json"
110+
);
111+
let expected_schema_json: serde_json::Value =
112+
serde_json::from_str(expected_schema_str).unwrap();
113+
let expected_schema: serde_json::Value = serde_json::from_str(
114+
expected_schema_json["api"].to_string().as_str(),
115+
)
116+
.unwrap();
147117

148118
assert_eq!(
149119
serde_json::to_value(api_response.data.schema.unwrap()).unwrap(),

‎core/src/ten_manager/tests/test_case/graph/connection/add.rs‎

Lines changed: 75 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,14 @@ mod tests {
123123
.to_string(),
124124
),
125125
(
126-
format!("{}{}", TEST_DIR, "/ten_packages/extension/addon1"),
127-
include_str!("test_data_embed/ext_1_manifest.json").to_string(),
126+
format!(
127+
"{}{}",
128+
TEST_DIR, "/ten_packages/extension/extension_addon_1"
129+
),
130+
include_str!(
131+
"../../../test_data/extension_addon_1_manifest.json"
132+
)
133+
.to_string(),
128134
"{}".to_string(),
129135
),
130136
(
@@ -156,7 +162,7 @@ mod tests {
156162
nodes: vec![
157163
create_test_node(
158164
"ext1",
159-
"addon1",
165+
"extension_addon_1",
160166
Some("http://example.com:8000"),
161167
),
162168
create_test_node(
@@ -216,8 +222,14 @@ mod tests {
216222
.to_string(),
217223
),
218224
(
219-
format!("{}{}", TEST_DIR, "/ten_packages/extension/addon1"),
220-
include_str!("test_data_embed/ext_1_manifest.json").to_string(),
225+
format!(
226+
"{}{}",
227+
TEST_DIR, "/ten_packages/extension/extension_addon_1"
228+
),
229+
include_str!(
230+
"../../../test_data/extension_addon_1_manifest.json"
231+
)
232+
.to_string(),
221233
"{}".to_string(),
222234
),
223235
(
@@ -280,8 +292,14 @@ mod tests {
280292
.to_string(),
281293
),
282294
(
283-
format!("{}{}", TEST_DIR, "/ten_packages/extension/addon1"),
284-
include_str!("test_data_embed/ext_1_manifest.json").to_string(),
295+
format!(
296+
"{}{}",
297+
TEST_DIR, "/ten_packages/extension/extension_addon_1"
298+
),
299+
include_str!(
300+
"../../../test_data/extension_addon_1_manifest.json"
301+
)
302+
.to_string(),
285303
"{}".to_string(),
286304
),
287305
(
@@ -310,7 +328,11 @@ mod tests {
310328

311329
// Create a graph with only one node.
312330
let mut graph = Graph {
313-
nodes: vec![create_test_node("ext1", "addon1", Some("app1"))],
331+
nodes: vec![create_test_node(
332+
"ext1",
333+
"extension_addon_1",
334+
Some("app1"),
335+
)],
314336
connections: None,
315337
};
316338

@@ -344,8 +366,14 @@ mod tests {
344366
.to_string(),
345367
),
346368
(
347-
format!("{}{}", TEST_DIR, "/ten_packages/extension/addon1"),
348-
include_str!("test_data_embed/ext_1_manifest.json").to_string(),
369+
format!(
370+
"{}{}",
371+
TEST_DIR, "/ten_packages/extension/extension_addon_1"
372+
),
373+
include_str!(
374+
"../../../test_data/extension_addon_1_manifest.json"
375+
)
376+
.to_string(),
349377
"{}".to_string(),
350378
),
351379
(
@@ -377,7 +405,7 @@ mod tests {
377405
nodes: vec![
378406
create_test_node(
379407
"ext1",
380-
"addon1",
408+
"extension_addon_1",
381409
Some("http://example.com:8000"),
382410
),
383411
create_test_node(
@@ -456,8 +484,14 @@ mod tests {
456484
.to_string(),
457485
),
458486
(
459-
format!("{}{}", TEST_DIR, "/ten_packages/extension/addon1"),
460-
include_str!("test_data_embed/ext_1_manifest.json").to_string(),
487+
format!(
488+
"{}{}",
489+
TEST_DIR, "/ten_packages/extension/extension_addon_1"
490+
),
491+
include_str!(
492+
"../../../test_data/extension_addon_1_manifest.json"
493+
)
494+
.to_string(),
461495
"{}".to_string(),
462496
),
463497
(
@@ -489,7 +523,7 @@ mod tests {
489523
nodes: vec![
490524
create_test_node(
491525
"ext1",
492-
"addon1",
526+
"extension_addon_1",
493527
Some("http://example.com:8000"),
494528
),
495529
create_test_node(
@@ -587,8 +621,14 @@ mod tests {
587621
.to_string(),
588622
),
589623
(
590-
format!("{}{}", TEST_DIR, "/ten_packages/extension/addon1"),
591-
include_str!("test_data_embed/ext_1_manifest.json").to_string(),
624+
format!(
625+
"{}{}",
626+
TEST_DIR, "/ten_packages/extension/extension_addon_1"
627+
),
628+
include_str!(
629+
"../../../test_data/extension_addon_1_manifest.json"
630+
)
631+
.to_string(),
592632
"{}".to_string(),
593633
),
594634
(
@@ -620,7 +660,7 @@ mod tests {
620660
nodes: vec![
621661
create_test_node(
622662
"ext1",
623-
"addon1",
663+
"extension_addon_1",
624664
Some("http://example.com:8000"),
625665
),
626666
create_test_node(
@@ -693,8 +733,14 @@ mod tests {
693733
.to_string(),
694734
),
695735
(
696-
format!("{}{}", TEST_DIR, "/ten_packages/extension/addon1"),
697-
include_str!("test_data_embed/ext_1_manifest.json").to_string(),
736+
format!(
737+
"{}{}",
738+
TEST_DIR, "/ten_packages/extension/extension_addon_1"
739+
),
740+
include_str!(
741+
"../../../test_data/extension_addon_1_manifest.json"
742+
)
743+
.to_string(),
698744
"{}".to_string(),
699745
),
700746
(
@@ -708,8 +754,14 @@ mod tests {
708754
"{}".to_string(),
709755
),
710756
(
711-
format!("{}{}", TEST_DIR, "/ten_packages/extension/addon4"),
712-
include_str!("test_data_embed/ext_4_manifest.json").to_string(),
757+
format!(
758+
"{}{}",
759+
TEST_DIR, "/ten_packages/extension/extension_addon_4"
760+
),
761+
include_str!(
762+
"../../../test_data/extension_addon_4_manifest.json"
763+
)
764+
.to_string(),
713765
"{}".to_string(),
714766
),
715767
];
@@ -731,7 +783,7 @@ mod tests {
731783
nodes: vec![
732784
create_test_node(
733785
"ext1",
734-
"addon1",
786+
"extension_addon_1",
735787
Some("http://example.com:8000"),
736788
),
737789
create_test_node(
@@ -746,7 +798,7 @@ mod tests {
746798
),
747799
create_test_node(
748800
"ext4",
749-
"addon4",
801+
"extension_addon_4",
750802
Some("http://example.com:8000"),
751803
),
752804
],

0 commit comments

Comments
 (0)