summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2021-03-14 09:59:36 +0100
committerMatthias Beyer <mail@beyermatthias.de>2021-03-14 09:59:36 +0100
commitdef3702fac13605af303b8319af15943cc7ff8e5 (patch)
tree8d745347c365c6e21a44843be88d72cabd3b07dc /tests
parent48db2a16e892c3a21ada014fb8e163b33bcb483b (diff)
parentc26a941541ccd7733f7533372da71f0a5be36ed5 (diff)
Merge branch 'config-rs-issue-173'HEADmaster
Diffstat (limited to 'tests')
-rw-r--r--tests/defaults.rs6
-rw-r--r--tests/empty.rs4
-rw-r--r--tests/errors.rs10
-rw-r--r--tests/file_hjson.rs2
-rw-r--r--tests/file_ini.rs2
-rw-r--r--tests/file_json.rs2
-rw-r--r--tests/file_toml.rs2
-rw-r--r--tests/file_yaml.rs2
-rw-r--r--tests/get.rs12
9 files changed, 22 insertions, 20 deletions
diff --git a/tests/defaults.rs b/tests/defaults.rs
index c50dd65..779dfdd 100644
--- a/tests/defaults.rs
+++ b/tests/defaults.rs
@@ -22,14 +22,14 @@ impl Default for Settings {
#[test]
fn set_defaults() {
let c = Config::new();
- let s: Settings = c.try_into().expect("Deserialization failed");
+ let s: Settings = c.try_deserialize().expect("Deserialization failed");
assert_eq!(s.db_host, "default");
}
#[test]
fn try_from_defaults() {
- let c = Config::try_from(&Settings::default()).expect("Serialization failed");
- let s: Settings = c.try_into().expect("Deserialization failed");
+ let c = Config::try_serialize(&Settings::default()).expect("Serialization failed");
+ let s: Settings = c.try_deserialize().expect("Deserialization failed");
assert_eq!(s.db_host, "default");
}
diff --git a/tests/empty.rs b/tests/empty.rs
index 92d3384..57a592e 100644
--- a/tests/empty.rs
+++ b/tests/empty.rs
@@ -15,7 +15,9 @@ struct Settings {
#[test]
fn empty_deserializes() {
- let s: Settings = Config::new().try_into().expect("Deserialization failed");
+ let s: Settings = Config::new()
+ .try_deserialize()
+ .expect("Deserialization failed");
assert_eq!(s.foo, 0);
assert_eq!(s.bar, 0);
}
diff --git a/tests/errors.rs b/tests/errors.rs
index ec96c98..04f11fe 100644
--- a/tests/errors.rs
+++ b/tests/errors.rs
@@ -56,7 +56,7 @@ fn test_error_type_detached() {
let c = make();
let value = c.get::<Value>("boolean_s_parse").unwrap();
- let res = value.try_into::<bool>();
+ let res = value.try_deserialize::<bool>();
assert!(res.is_err());
assert_eq!(
@@ -76,14 +76,14 @@ fn test_error_enum_de() {
}
let on_v: Value = "on".into();
- let on_d = on_v.try_into::<Diode>();
+ let on_d = on_v.try_deserialize::<Diode>();
assert_eq!(
on_d.unwrap_err().to_string(),
"enum Diode does not have variant constructor on".to_string()
);
let array_v: Value = vec![100, 100].into();
- let array_d = array_v.try_into::<Diode>();
+ let array_d = array_v.try_deserialize::<Diode>();
assert_eq!(
array_d.unwrap_err().to_string(),
"value of enum Diode should be represented by either string or table with exactly one key"
@@ -97,7 +97,7 @@ fn test_error_enum_de() {
.cloned()
.collect::<std::collections::HashMap<String, Value>>()
.into();
- let confused_d = confused_v.try_into::<Diode>();
+ let confused_d = confused_v.try_deserialize::<Diode>();
assert_eq!(
confused_d.unwrap_err().to_string(),
"value of enum Diode should be represented by either string or table with exactly one key"
@@ -122,7 +122,7 @@ inner:
let mut cfg = Config::new();
cfg.merge(File::from_str(CFG, FileFormat::Yaml)).unwrap();
- let e = cfg.try_into::<Outer>().unwrap_err();
+ let e = cfg.try_deserialize::<Outer>().unwrap_err();
if let ConfigError::Type {
key: Some(path), ..
} = e
diff --git a/tests/file_hjson.rs b/tests/file_hjson.rs
index b866dd6..c5e07fb 100644
--- a/tests/file_hjson.rs
+++ b/tests/file_hjson.rs
@@ -46,7 +46,7 @@ fn test_file() {
let c = make();
// Deserialize the entire file as single struct
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert!(s.debug.approx_eq_ulps(&1.0, 2));
assert_eq!(s.production, Some("false".to_string()));
diff --git a/tests/file_ini.rs b/tests/file_ini.rs
index e473158..7df9d38 100644
--- a/tests/file_ini.rs
+++ b/tests/file_ini.rs
@@ -36,7 +36,7 @@ fn make() -> Config {
#[test]
fn test_file() {
let c = make();
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert_eq!(
s,
Settings {
diff --git a/tests/file_json.rs b/tests/file_json.rs
index 0dfeffe..d5e9be2 100644
--- a/tests/file_json.rs
+++ b/tests/file_json.rs
@@ -46,7 +46,7 @@ fn test_file() {
let c = make();
// Deserialize the entire file as single struct
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert!(s.debug.approx_eq_ulps(&1.0, 2));
assert_eq!(s.production, Some("false".to_string()));
diff --git a/tests/file_toml.rs b/tests/file_toml.rs
index 7591c20..9b4ef65 100644
--- a/tests/file_toml.rs
+++ b/tests/file_toml.rs
@@ -54,7 +54,7 @@ fn test_file() {
let c = make();
// Deserialize the entire file as single struct
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert!(s.debug.approx_eq_ulps(&1.0, 2));
assert_eq!(s.production, Some("false".to_string()));
diff --git a/tests/file_yaml.rs b/tests/file_yaml.rs
index 41b495c..8709019 100644
--- a/tests/file_yaml.rs
+++ b/tests/file_yaml.rs
@@ -46,7 +46,7 @@ fn test_file() {
let c = make();
// Deserialize the entire file as single struct
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert!(s.debug.approx_eq_ulps(&1.0, 2));
assert_eq!(s.production, Some("false".to_string()));
diff --git a/tests/get.rs b/tests/get.rs
index 135d3b0..a8a97d2 100644
--- a/tests/get.rs
+++ b/tests/get.rs
@@ -134,7 +134,7 @@ fn test_map_struct() {
}
let c = make();
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert_eq!(s.place.len(), 8);
assert_eq!(
@@ -149,7 +149,7 @@ fn test_file_struct() {
let c = make();
// Deserialize the entire file as single struct
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert!(s.debug.approx_eq_ulps(&1.0, 2));
assert_eq!(s.production, Some("false".to_string()));
@@ -197,7 +197,7 @@ fn test_struct_array() {
}
let c = make();
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert_eq!(s.elements.len(), 10);
assert_eq!(s.elements[3], "4".to_string());
@@ -219,7 +219,7 @@ fn test_enum() {
}
let c = make();
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert_eq!(s.diodes["green"], Diode::Off);
assert_eq!(s.diodes["red"], Diode::Brightness(100));
@@ -254,7 +254,7 @@ fn test_enum_key() {
}
let c = make();
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert_eq!(s.proton[&Quark::Up], 2);
assert_eq!(s.quarks.len(), 6);
@@ -268,7 +268,7 @@ fn test_int_key() {
}
let c = make();
- let s: Settings = c.try_into().unwrap();
+ let s: Settings = c.try_deserialize().unwrap();
assert_eq!(s.divisors[&4], 3);
assert_eq!(s.divisors.len(), 4);
}