summaryrefslogtreecommitdiff
path: root/test/rs
diff options
context:
space:
mode:
authorAllen George <allengeorge@apache.org>2021-03-01 14:47:04 -0500
committerGitHub <noreply@github.com>2021-03-01 14:47:04 -0500
commit2e90ef569c1b38f6e0f1279e3f25d2a7f6b5ff99 (patch)
tree21744c04e50cf73a19ce2e9b858d65409d5501af /test/rs
parent4f6439b30953865fd1ec23729cbf17292c0ad17d (diff)
downloadthrift-2e90ef569c1b38f6e0f1279e3f25d2a7f6b5ff99.tar.gz
[THRIFT-5314][THRIFT-4101] Generate enums that don't error on unexpected values (#2337)
Client: rs
Diffstat (limited to 'test/rs')
-rw-r--r--test/rs/src/bin/test_client.rs14
-rw-r--r--test/rs/src/bin/test_server.rs6
2 files changed, 10 insertions, 10 deletions
diff --git a/test/rs/src/bin/test_client.rs b/test/rs/src/bin/test_client.rs
index 3e20999ed..476f9eb25 100644
--- a/test/rs/src/bin/test_client.rs
+++ b/test/rs/src/bin/test_client.rs
@@ -206,7 +206,7 @@ fn make_thrift_calls(
info!("testEnum");
{
- verify_expected_result(thrift_test_client.test_enum(Numberz::Two), Numberz::Two)?;
+ verify_expected_result(thrift_test_client.test_enum(Numberz::TWO), Numberz::TWO)?;
}
info!("testBinary");
@@ -381,7 +381,7 @@ fn make_thrift_calls(
};
verify_expected_result(
- thrift_test_client.test_multi(1, -123_948, -19_234_123_981, m_snd, Numberz::Eight, 81),
+ thrift_test_client.test_multi(1, -123_948, -19_234_123_981, m_snd, Numberz::EIGHT, 81),
s_cmp,
)?;
}
@@ -395,8 +395,8 @@ fn make_thrift_calls(
// }
{
let mut arg_map_usermap: BTreeMap<Numberz, i64> = BTreeMap::new();
- arg_map_usermap.insert(Numberz::One, 4289);
- arg_map_usermap.insert(Numberz::Eight, 19);
+ arg_map_usermap.insert(Numberz::ONE, 4289);
+ arg_map_usermap.insert(Numberz::EIGHT, 19);
let mut arg_vec_xtructs: Vec<Xtruct> = Vec::new();
arg_vec_xtructs.push(
@@ -429,15 +429,15 @@ fn make_thrift_calls(
user_map: Some(arg_map_usermap),
xtructs: Some(arg_vec_xtructs),
};
- s_cmp_nested_1.insert(Numberz::Two, insanity.clone());
- s_cmp_nested_1.insert(Numberz::Three, insanity.clone());
+ s_cmp_nested_1.insert(Numberz::TWO, insanity.clone());
+ s_cmp_nested_1.insert(Numberz::THREE, insanity.clone());
let mut s_cmp_nested_2: BTreeMap<Numberz, Insanity> = BTreeMap::new();
let empty_insanity = Insanity {
user_map: Some(BTreeMap::new()),
xtructs: Some(Vec::new()),
};
- s_cmp_nested_2.insert(Numberz::Six, empty_insanity);
+ s_cmp_nested_2.insert(Numberz::SIX, empty_insanity);
let mut s_cmp: BTreeMap<UserId, BTreeMap<Numberz, Insanity>> = BTreeMap::new();
s_cmp.insert(1 as UserId, s_cmp_nested_1);
diff --git a/test/rs/src/bin/test_server.rs b/test/rs/src/bin/test_server.rs
index 74be12d48..c1f31758a 100644
--- a/test/rs/src/bin/test_server.rs
+++ b/test/rs/src/bin/test_server.rs
@@ -268,15 +268,15 @@ impl ThriftTestSyncHandler for ThriftTestSyncHandlerImpl {
) -> thrift::Result<BTreeMap<UserId, BTreeMap<Numberz, Insanity>>> {
info!("testInsanity({:?})", argument);
let mut map_0: BTreeMap<Numberz, Insanity> = BTreeMap::new();
- map_0.insert(Numberz::Two, argument.clone());
- map_0.insert(Numberz::Three, argument);
+ map_0.insert(Numberz::TWO, argument.clone());
+ map_0.insert(Numberz::THREE, argument);
let mut map_1: BTreeMap<Numberz, Insanity> = BTreeMap::new();
let insanity = Insanity {
user_map: None,
xtructs: None,
};
- map_1.insert(Numberz::Six, insanity);
+ map_1.insert(Numberz::SIX, insanity);
let mut ret: BTreeMap<UserId, BTreeMap<Numberz, Insanity>> = BTreeMap::new();
ret.insert(1, map_0);