Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to serde_test and drop dependency on serde_json #60

Merged
merged 2 commits into from
Jun 29, 2016
Merged

Switch to serde_test and drop dependency on serde_json #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cc4a2b
Switch to serde_test and drop dependency on serde_json
dtolnay Jun 29, 2016
8e7389a
Change serde test to use char instead of String
dtolnay Jun 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ readme = "README.md"

[features]
nightly = []
serde_impl = ["serde", "serde_json"]
serde_impl = ["serde", "serde_test"]

[dependencies]
clippy = { version = "0.*", optional = true }
serde = { version = "^0.7", optional = true }
serde_json = { version = "^0.7", optional = true }
serde_test = { version = "^0.7", optional = true }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to make this a dev-dependency?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cargo does not support optional dev-dependencies. So I can make it a dev dependency but it would mean that serde and serde_test are compiled even when running cargo test without --features serde_impl. We had decided on this approach in #48.

57 changes: 27 additions & 30 deletions tests/serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,41 @@
#![cfg(feature = "serde_impl")]

extern crate linked_hash_map;
extern crate serde;
extern crate serde_json;

use linked_hash_map::LinkedHashMap;

extern crate serde_test;
use serde_test::{Token, assert_tokens};

#[test]
fn test_ser_empty() {
let map = LinkedHashMap::<String, u32>::new();
let j = serde_json::to_string(&map).unwrap();
let expected = "{}";
assert_eq!(j, expected);
fn test_ser_de_empty() {
let map = LinkedHashMap::<char, u32>::new();

assert_tokens(&map, &[
Token::MapStart(Some(0)),
Token::MapEnd,
]);
}

#[test]
fn test_ser() {
fn test_ser_de() {
let mut map = LinkedHashMap::new();
map.insert("b", 20);
map.insert("a", 10);
map.insert("c", 30);
map.insert('b', 20);
map.insert('a', 10);
map.insert('c', 30);

let j = serde_json::to_string(&map).unwrap();
let expected = r#"{"b":20,"a":10,"c":30}"#;
assert_eq!(j, expected);
}
assert_tokens(&map, &[
Token::MapStart(Some(3)),
Token::MapSep,
Token::Char('b'),
Token::I32(20),

#[test]
fn test_de_empty() {
let j = "{}";
let map: LinkedHashMap<String, u32> = serde_json::from_str(j).unwrap();
assert_eq!(map.len(), 0);
}
Token::MapSep,
Token::Char('a'),
Token::I32(10),

#[test]
fn test_de() {
let j = r#"{"b":20,"a":10,"c":30}"#;
let map: LinkedHashMap<String, u32> = serde_json::from_str(j).unwrap();
let items: Vec<_> = map.iter().map(|(k, v)| (k.clone(), *v)).collect();
assert_eq!(items, [("b".to_owned(), 20),
("a".to_owned(), 10),
("c".to_owned(), 30)]);
Token::MapSep,
Token::Char('c'),
Token::I32(30),
Token::MapEnd,
]);
}