Skip to content

Commit 19548bc

Browse files
igorostrowskiqigorostrowskiq
committed
testing: Update test_scenarios_rust to v0.3.0
1 parent d015915 commit 19548bc

File tree

8 files changed

+36
-53
lines changed

8 files changed

+36
-53
lines changed

‎Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/rust_test_scenarios/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tracing = "0.1.41"
1111
tracing-subscriber = { version = "0.3.19", features = ["json"] }
1212
serde = { version = "1.0.219", features = ["derive"] }
1313
serde_json = "1.0.140"
14-
test_scenarios_rust = { git = "https://github.com/qorix-group/testing_tools.git", tag = "v0.2.0" }
14+
test_scenarios_rust = { git = "https://github.com/eclipse-score/testing_tools.git", tag = "v0.3.0" }
1515

1616

1717
[lints]

‎tests/rust_test_scenarios/src/cit/default_values.rs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ impl Scenario for DefaultValues {
1313
"default_values"
1414
}
1515

16-
fn run(&self, input: Option<String>) -> Result<(), String> {
16+
fn run(&self, input: &str) -> Result<(), String> {
1717
// Key used for tests.
1818
let key = "test_number";
1919

2020
// Create KVS instance with provided params.
21-
let input_string = input.as_ref().expect("Test input is expected");
22-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
21+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
2322
{
2423
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");
2524

@@ -61,13 +60,12 @@ impl Scenario for RemoveKey {
6160
"remove_key"
6261
}
6362

64-
fn run(&self, input: Option<String>) -> Result<(), String> {
63+
fn run(&self, input: &str) -> Result<(), String> {
6564
// Key used for tests.
6665
let key = "test_number";
6766

6867
// Create KVS instance with provided params.
69-
let input_string = input.as_ref().expect("Test input is expected");
70-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
68+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
7169
{
7270
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");
7371

@@ -109,12 +107,11 @@ impl Scenario for ResetAllKeys {
109107
"reset_all_keys"
110108
}
111109

112-
fn run(&self, input: Option<String>) -> Result<(), String> {
110+
fn run(&self, input: &str) -> Result<(), String> {
113111
let num_values = 5;
114112

115113
// Create KVS instance with provided params.
116-
let input_string = input.as_ref().expect("Test input is expected");
117-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
114+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
118115
{
119116
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");
120117

@@ -175,13 +172,12 @@ impl Scenario for ResetSingleKey {
175172
"reset_single_key"
176173
}
177174

178-
fn run(&self, input: Option<String>) -> Result<(), String> {
175+
fn run(&self, input: &str) -> Result<(), String> {
179176
let num_values = 5;
180177
let reset_index = 2;
181178

182179
// Create KVS instance with provided params.
183-
let input_string = input.as_ref().expect("Test input is expected");
184-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
180+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
185181
{
186182
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");
187183

@@ -243,10 +239,9 @@ impl Scenario for Checksum {
243239
"checksum"
244240
}
245241

246-
fn run(&self, input: Option<String>) -> Result<(), String> {
242+
fn run(&self, input: &str) -> Result<(), String> {
247243
// Create KVS instance with provided params.
248-
let input_string = input.as_ref().expect("Test input is expected");
249-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
244+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
250245
let kvs_path;
251246
let hash_path;
252247
{

‎tests/rust_test_scenarios/src/cit/multiple_kvs.rs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ impl Scenario for MultipleInstanceIds {
1111
"multiple_instance_ids"
1212
}
1313

14-
fn run(&self, input: Option<String>) -> Result<(), String> {
14+
fn run(&self, input: &str) -> Result<(), String> {
1515
// Values.
1616
let keyname = "number".to_string();
1717
let value1 = 111.1;
1818
let value2 = 222.2;
1919

2020
// Parameters.
21-
let input_string = input.as_ref().expect("Test input is expected");
22-
let v: Value = serde_json::from_str(input_string).expect("Failed to parse input string");
21+
let v: Value = serde_json::from_str(input).expect("Failed to parse input string");
2322
let params1 =
2423
KvsParameters::from_value(&v["kvs_parameters_1"]).expect("Failed to parse parameters");
2524
let params2 =
@@ -68,14 +67,13 @@ impl Scenario for SameInstanceIdSameValue {
6867
"same_instance_id_same_value"
6968
}
7069

71-
fn run(&self, input: Option<String>) -> Result<(), String> {
70+
fn run(&self, input: &str) -> Result<(), String> {
7271
// Values.
7372
let keyname = "number".to_string();
7473
let value = 111.1;
7574

7675
// Parameters.
77-
let input_string = input.as_ref().expect("Test input is expected");
78-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
76+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
7977
{
8078
// Create first KVS instance.
8179
let kvs1 = kvs_instance(params.clone()).expect("Failed to create KVS instance");
@@ -120,15 +118,14 @@ impl Scenario for SameInstanceIdDifferentValue {
120118
"same_instance_id_diff_value"
121119
}
122120

123-
fn run(&self, input: Option<String>) -> Result<(), String> {
121+
fn run(&self, input: &str) -> Result<(), String> {
124122
// Values.
125123
let keyname = "number".to_string();
126124
let value1 = 111.1;
127125
let value2 = 222.2;
128126

129127
// Parameters.
130-
let input_string = input.as_ref().expect("Test input is expected");
131-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
128+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
132129
{
133130
// Create first KVS instance.
134131
let kvs1 = kvs_instance(params.clone()).expect("Failed to create KVS instance");

‎tests/rust_test_scenarios/src/cit/persistency.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ impl Scenario for ExplicitFlush {
1212
"explicit_flush"
1313
}
1414

15-
fn run(&self, input: Option<String>) -> Result<(), String> {
15+
fn run(&self, input: &str) -> Result<(), String> {
1616
// List of keys and corresponding values.
1717
let num_values = 5;
1818
let mut key_values = Vec::new();
@@ -23,8 +23,7 @@ impl Scenario for ExplicitFlush {
2323
}
2424

2525
// Check parameters.
26-
let input_string = input.as_ref().expect("Test input is expected");
27-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
26+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
2827
{
2928
// First KVS instance object - used for setting and flushing data.
3029
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");

‎tests/rust_test_scenarios/src/cit/snapshots.rs‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ impl Scenario for SnapshotCount {
1111
"count"
1212
}
1313

14-
fn run(&self, input: Option<String>) -> Result<(), String> {
15-
let input_string = input.as_ref().expect("Test input is expected");
16-
let v: Value = serde_json::from_str(input_string).expect("Failed to parse input string");
14+
fn run(&self, input: &str) -> Result<(), String> {
15+
let v: Value = serde_json::from_str(input).expect("Failed to parse input string");
1716
let count =
1817
serde_json::from_value(v["count"].clone()).expect("Failed to parse \"count\" field");
1918
let params = KvsParameters::from_value(&v).expect("Failed to parse parameters");
@@ -44,9 +43,8 @@ impl Scenario for SnapshotMaxCount {
4443
"max_count"
4544
}
4645

47-
fn run(&self, input: Option<String>) -> Result<(), String> {
48-
let input_string = input.as_ref().expect("Test input is expected");
49-
let v: Value = serde_json::from_str(input_string).expect("Failed to parse input string");
46+
fn run(&self, input: &str) -> Result<(), String> {
47+
let v: Value = serde_json::from_str(input).expect("Failed to parse input string");
5048
let params = KvsParameters::from_value(&v).expect("Failed to parse parameters");
5149

5250
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");
@@ -62,9 +60,8 @@ impl Scenario for SnapshotRestore {
6260
"restore"
6361
}
6462

65-
fn run(&self, input: Option<String>) -> Result<(), String> {
66-
let input_string = input.as_ref().expect("Test input is expected");
67-
let v: Value = serde_json::from_str(input_string).expect("Failed to parse input string");
63+
fn run(&self, input: &str) -> Result<(), String> {
64+
let v: Value = serde_json::from_str(input).expect("Failed to parse input string");
6865
let count =
6966
serde_json::from_value(v["count"].clone()).expect("Failed to parse \"count\" field");
7067
let snapshot_id = serde_json::from_value(v["snapshot_id"].clone())
@@ -104,9 +101,8 @@ impl Scenario for SnapshotPaths {
104101
"paths"
105102
}
106103

107-
fn run(&self, input: Option<String>) -> Result<(), String> {
108-
let input_string = input.as_ref().expect("Test input is expected");
109-
let v: Value = serde_json::from_str(input_string).expect("Failed to parse input string");
104+
fn run(&self, input: &str) -> Result<(), String> {
105+
let v: Value = serde_json::from_str(input).expect("Failed to parse input string");
110106
let count =
111107
serde_json::from_value(v["count"].clone()).expect("Failed to parse \"count\" field");
112108
let snapshot_id = serde_json::from_value(v["snapshot_id"].clone())

‎tests/rust_test_scenarios/src/cit/supported_datatypes.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ impl Scenario for SupportedDatatypesKeys {
1313
"keys"
1414
}
1515

16-
fn run(&self, input: Option<String>) -> Result<(), String> {
17-
let input_string = input.as_ref().expect("Test input is expected");
18-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
16+
fn run(&self, input: &str) -> Result<(), String> {
17+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
1918
let kvs = kvs_instance(params).expect("Failed to create KVS instance");
2019

2120
// Set key-value pairs. Unit type is used for value - only key is used later on.
@@ -59,9 +58,8 @@ impl Scenario for SupportedDatatypesValues {
5958
}
6059
}
6160

62-
fn run(&self, input: Option<String>) -> Result<(), String> {
63-
let input_string = input.as_ref().expect("Test input is expected");
64-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
61+
fn run(&self, input: &str) -> Result<(), String> {
62+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
6563
let kvs = kvs_instance(params).expect("Failed to create KVS instance");
6664

6765
kvs.set_value(self.name(), self.value.clone())

‎tests/rust_test_scenarios/src/test_basic.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ impl Scenario for BasicScenario {
1515
"basic"
1616
}
1717

18-
fn run(&self, input: Option<String>) -> Result<(), String> {
18+
fn run(&self, input: &str) -> Result<(), String> {
1919
// Print and parse parameters.
20-
let input_string = input.as_ref().expect("Test input is expected");
21-
eprintln!("{input_string}");
22-
23-
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
20+
eprintln!("{input}");
21+
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
2422

2523
// Set builder parameters.
2624
let mut builder = KvsBuilder::new(params.instance_id);

0 commit comments

Comments
 (0)