mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1396821 - [geckodriver] Switch geckodriver crate from rustc_serialize to serde. r=ato 

The patch switches the serialization and deserialization of data
structures from the rustc_serialize crate to serde. By doing that
all the custom code for serialization and deserialization can be
removed in favor of serde's automatically derived serializers and
deserializers.

MozReview-Commit-ID: B8H3bZQKkJ7

--HG--
extra : rebase_source : 9f6a18d1f3be15237133ce7e9b0bd7f0d8126429
This commit is contained in:
Henrik Skupin 2018-08-22 10:27:35 +02:00
Родитель f06c122d06
Коммит dbe7ef467d
6 изменённых файлов: 1130 добавлений и 941 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
testing/geckodriver/Cargo.toml
Просмотреть файл

@ -9,6 +9,7 @@ license = "MPL-2.0"
publish = false
[dependencies]
base64 = "0.6"
chrono = "^0.2"
clap = { version = "^2.19", default-features = false, features = ["suggestions", "wrap_help"] }
hyper = "0.10"
@ -18,7 +19,9 @@ mozprofile = { path = "../mozbase/rust/mozprofile" }
mozrunner = { path = "../mozbase/rust/mozrunner" }
mozversion = { path = "../mozbase/rust/mozversion" }
regex = "1.0"
rustc-serialize = "0.3"
serde = "1.0"
serde_json = "1.0"
serde_derive = "1.0"
uuid = { version = "0.5", features = ["v4"] }
webdriver = { path = "../webdriver" }
zip = "0.3"

11
testing/geckodriver/src/build.rs
Просмотреть файл

@ -1,7 +1,6 @@
use serde_json::Value;
use std::fmt;
use rustc_serialize::json::{Json};
include!(concat!(env!("OUT_DIR"), "/build-info.rs"));
pub struct BuildInfo;
@ -32,10 +31,10 @@ impl fmt::Display for BuildInfo {
}
}
// TODO(Henrik): Change into From
//std::convert::From<&str>` is not implemented for `rustc_serialize::json::Json
impl Into<Json> for BuildInfo {
fn into(self) -> Json {
Json::String(BuildInfo::version().to_string())
impl Into<Value> for BuildInfo {
fn into(self) -> Value {
Value::String(BuildInfo::version().to_string())
}
}

59
testing/geckodriver/src/capabilities.rs
Просмотреть файл

@ -1,3 +1,4 @@
use base64;
use logging::Level;
use marionette::LogOptions;
use mozprofile::preferences::Pref;
@ -5,8 +6,7 @@ use mozprofile::profile::Profile;
use mozrunner::runner::platform::firefox_default_path;
use mozversion::{self, firefox_version, Version};
use regex::bytes::Regex;
use rustc_serialize::base64::FromBase64;
use rustc_serialize::json::Json;
use serde_json::{Map, Value};
use std::collections::BTreeMap;
use std::default::Default;
use std::error::Error;
@ -44,11 +44,11 @@ impl<'a> FirefoxCapabilities<'a> {
}
}
fn set_binary(&mut self, capabilities: &BTreeMap<String, Json>) {
fn set_binary(&mut self, capabilities: &Map<String, Value>) {
self.chosen_binary = capabilities
.get("moz:firefoxOptions")
.and_then(|x| x.find("binary"))
.and_then(|x| x.as_string())
.and_then(|x| x.get("binary"))
.and_then(|x| x.as_str())
.map(|x| PathBuf::from(x))
.or_else(|| self.fallback_binary.map(|x| x.clone()))
.or_else(|| firefox_default_path())
@ -158,7 +158,7 @@ impl<'a> BrowserCapabilities for FirefoxCapabilities<'a> {
Ok(true)
}
fn validate_custom(&self, name: &str, value: &Json) -> WebDriverResult<()> {
fn validate_custom(&self, name: &str, value: &Value) -> WebDriverResult<()> {
if !name.starts_with("moz:") {
return Ok(())
}
@ -201,7 +201,7 @@ impl<'a> BrowserCapabilities for FirefoxCapabilities<'a> {
for (log_key, log_value) in log_data.iter() {
match &**log_key {
"level" => {
let level = try_opt!(log_value.as_string(),
let level = try_opt!(log_value.as_str(),
ErrorStatus::InvalidArgument,
"log level is not a string");
if Level::from_str(level).is_err() {
@ -253,7 +253,7 @@ impl<'a> BrowserCapabilities for FirefoxCapabilities<'a> {
Ok(())
}
fn accept_custom(&mut self, _: &str, _: &Json, _: &Capabilities) -> WebDriverResult<bool> {
fn accept_custom(&mut self, _: &str, _: &Value, _: &Capabilities) -> WebDriverResult<bool> {
Ok(true)
}
}
@ -264,7 +264,7 @@ impl<'a> BrowserCapabilities for FirefoxCapabilities<'a> {
/// the encoded profile, the binary arguments, log settings, and additional
/// preferences to be checked and unmarshaled from the `moz:firefoxOptions`
/// JSON Object into a Rust representation.
#[derive(Default)]
#[derive(Default, Debug)]
pub struct FirefoxOptions {
pub binary: Option<PathBuf>,
pub profile: Option<Profile>,
@ -303,10 +303,10 @@ impl FirefoxOptions {
if let Some(profile_json) = options.get("profile") {
let profile_base64 =
try!(profile_json
.as_string()
.as_str()
.ok_or(WebDriverError::new(ErrorStatus::UnknownError,
"Profile is not a string")));
let profile_zip = &*try!(profile_base64.from_base64());
let profile_zip = &*try!(base64::decode(profile_base64));
// Create an emtpy profile directory
let profile = try!(Profile::new(None));
@ -332,7 +332,7 @@ impl FirefoxOptions {
array")));
let args = try!(args_array
.iter()
.map(|x| x.as_string().map(|x| x.to_owned()))
.map(|x| x.as_str().map(|x| x.to_owned()))
.collect::<Option<Vec<String>>>()
.ok_or(WebDriverError::new(ErrorStatus::UnknownError,
"Arguments entries were not all \
@ -352,7 +352,7 @@ impl FirefoxOptions {
let level = match log.get("level") {
Some(json) => {
let s = json.as_string().ok_or(WebDriverError::new(
let s = json.as_str().ok_or(WebDriverError::new(
ErrorStatus::InvalidArgument,
"Log level is not a string",
))?;
@ -387,12 +387,11 @@ impl FirefoxOptions {
}
}
fn pref_from_json(value: &Json) -> WebDriverResult<Pref> {
fn pref_from_json(value: &Value) -> WebDriverResult<Pref> {
match value {
&Json::String(ref x) => Ok(Pref::new(x.clone())),
&Json::I64(x) => Ok(Pref::new(x)),
&Json::U64(x) => Ok(Pref::new(x as i64)),
&Json::Boolean(x) => Ok(Pref::new(x)),
&Value::String(ref x) => Ok(Pref::new(x.clone())),
&Value::Number(ref x) => Ok(Pref::new(x.as_i64().unwrap())),
&Value::Bool(x) => Ok(Pref::new(x)),
_ => Err(WebDriverError::new(ErrorStatus::UnknownError,
"Could not convert pref value to string, boolean, or integer"))
}
@ -451,36 +450,26 @@ fn unzip_buffer(buf: &[u8], dest_dir: &Path) -> WebDriverResult<()> {
#[cfg(test)]
mod tests {
extern crate mozprofile;
extern crate rustc_serialize;
use self::mozprofile::preferences::Pref;
use self::rustc_serialize::base64::{CharacterSet, Config, Newline, ToBase64};
use self::rustc_serialize::json::Json;
use super::FirefoxOptions;
use super::*;
use marionette::MarionetteHandler;
use std::collections::BTreeMap;
use std::default::Default;
use std::fs::File;
use std::io::Read;
use webdriver::capabilities::Capabilities;
fn example_profile() -> Json {
fn example_profile() -> Value {
let mut profile_data = Vec::with_capacity(1024);
let mut profile = File::open("src/tests/profile.zip").unwrap();
profile.read_to_end(&mut profile_data).unwrap();
let base64_config = Config {
char_set: CharacterSet::Standard,
newline: Newline::LF,
pad: true,
line_length: None,
};
Json::String(profile_data.to_base64(base64_config))
Value::String(base64::encode(&profile_data))
}
fn make_options(firefox_opts: Capabilities) -> FirefoxOptions {
let mut caps = Capabilities::new();
caps.insert("moz:firefoxOptions".into(), Json::Object(firefox_opts));
caps.insert("moz:firefoxOptions".into(), Value::Object(firefox_opts));
let binary = None;
FirefoxOptions::from_capabilities(binary, &mut caps).unwrap()
}
@ -504,15 +493,15 @@ mod tests {
#[test]
fn test_prefs() {
let encoded_profile = example_profile();
let mut prefs: BTreeMap<String, Json> = BTreeMap::new();
let mut prefs: Map<String, Value> = Map::new();
prefs.insert(
"browser.display.background_color".into(),
Json::String("#00ff00".into()),
Value::String("#00ff00".into()),
);
let mut firefox_opts = Capabilities::new();
firefox_opts.insert("profile".into(), encoded_profile);
firefox_opts.insert("prefs".into(), Json::Object(prefs));
firefox_opts.insert("prefs".into(), Value::Object(prefs));
let opts = make_options(firefox_opts);
let mut profile = opts.profile.unwrap();

9
testing/geckodriver/src/main.rs
Просмотреть файл

@ -1,3 +1,4 @@
extern crate base64;
extern crate chrono;
#[macro_use]
extern crate clap;
@ -8,7 +9,10 @@ extern crate mozprofile;
extern crate mozrunner;
extern crate mozversion;
extern crate regex;
extern crate rustc_serialize;
extern crate serde;
#[macro_use]
extern crate serde_derive;
extern crate serde_json;
extern crate uuid;
extern crate zip;
extern crate webdriver;
@ -38,6 +42,9 @@ mod prefs;
mod marionette;
mod capabilities;
#[cfg(test)]
pub mod test;
use build::BuildInfo;
use marionette::{MarionetteHandler, MarionetteSettings, extension_routes};

1968
testing/geckodriver/src/marionette.rs
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

19
testing/geckodriver/src/test.rs Normal file
Просмотреть файл

@ -0,0 +1,19 @@
use regex::Regex;
use serde;
use serde_json;
use std;
lazy_static! {
static ref MIN_REGEX: Regex = Regex::new(r"[\n\t]|\s{4}").unwrap();
}
pub fn check_deserialize<T>(json: &str, data: &T)
where
T: std::fmt::Debug,
T: std::cmp::PartialEq,
T: serde::de::DeserializeOwned,
{
let min_json = MIN_REGEX.replace_all(json, "");
assert_eq!(serde_json::from_str::<T>(&min_json).unwrap(), *data);
}