Move entry, content and header into store
This commit is contained in:
Marcel Müller
parent
ba2e52788b
commit
50413101c4
|
|
@ -1,4 +0,0 @@
|
|||
/**
|
||||
* EntryContent type
|
||||
*/
|
||||
pub type EntryContent = String;
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
use header::EntryHeader;
|
||||
use content::EntryContent;
|
||||
use storeid::StoreId;
|
||||
|
||||
/**
|
||||
* An Entry of the store
|
||||
*
|
||||
* Contains location, header and content part.
|
||||
*/
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Entry {
|
||||
location: StoreId,
|
||||
header: EntryHeader,
|
||||
content: EntryContent,
|
||||
}
|
||||
|
||||
impl Entry {
|
||||
|
||||
fn new(loc: StoreId) -> Entry {
|
||||
Entry {
|
||||
location: loc,
|
||||
header: EntryHeader::new_current(),
|
||||
content: EntryContent::new()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_location(&self) -> &StoreId {
|
||||
&self.location
|
||||
}
|
||||
|
||||
pub fn get_header(&self) -> &EntryHeader {
|
||||
&self.header
|
||||
}
|
||||
|
||||
pub fn get_header_mut(&mut self) -> &mut EntryHeader {
|
||||
&mut self.header
|
||||
}
|
||||
|
||||
pub fn get_content(&self) -> &EntryContent {
|
||||
&self.content
|
||||
}
|
||||
|
||||
pub fn get_content_mut(&mut self) -> &mut EntryContent {
|
||||
&mut self.content
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
use std::error::Error;
|
||||
use std::fmt::Display;
|
||||
use std::fmt::Formatter;
|
||||
use std::fmt::Error as FmtError;
|
||||
use std::clone::Clone;
|
||||
use std::fmt::{Debug, Display, Formatter};
|
||||
use std::fmt;
|
||||
use toml;
|
||||
|
||||
/**
|
||||
* Kind of store error
|
||||
|
|
@ -19,7 +20,7 @@ pub enum StoreErrorKind {
|
|||
StorePathCreate,
|
||||
LockPoisoned,
|
||||
EntryAlreadyBorrowed
|
||||
// maybe more
|
||||
// maybe more
|
||||
}
|
||||
|
||||
fn store_error_type_as_str(e: &StoreErrorKind) -> &'static str {
|
||||
|
|
@ -34,7 +35,7 @@ fn store_error_type_as_str(e: &StoreErrorKind) -> &'static str {
|
|||
&StoreErrorKind::StorePathCreate => "Store path create",
|
||||
&StoreErrorKind::LockPoisoned
|
||||
=> "The internal Store Lock has been poisoned",
|
||||
&StoreErrorKind::EntryAlreadyBorrowed => "Entry is already borrowed",
|
||||
&StoreErrorKind::EntryAlreadyBorrowed => "Entry is already borrowed",
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -63,12 +64,12 @@ impl StoreError {
|
|||
*/
|
||||
pub fn new(errtype: StoreErrorKind, cause: Option<Box<Error>>)
|
||||
-> StoreError
|
||||
{
|
||||
StoreError {
|
||||
err_type: errtype,
|
||||
cause: cause,
|
||||
{
|
||||
StoreError {
|
||||
err_type: errtype,
|
||||
cause: cause,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the error type of this StoreError
|
||||
|
|
@ -100,3 +101,61 @@ impl Error for StoreError {
|
|||
|
||||
}
|
||||
|
||||
|
||||
#[derive(Clone)]
|
||||
pub enum ParserErrorKind {
|
||||
TOMLParserErrors,
|
||||
MissingMainSection,
|
||||
MissingVersionInfo,
|
||||
}
|
||||
|
||||
pub struct ParserError {
|
||||
kind: ParserErrorKind,
|
||||
cause: Option<Box<Error>>,
|
||||
}
|
||||
|
||||
impl ParserError {
|
||||
|
||||
pub fn new(k: ParserErrorKind, cause: Option<Box<Error>>) -> ParserError {
|
||||
ParserError {
|
||||
kind: k,
|
||||
cause: cause,
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl Debug for ParserError {
|
||||
|
||||
fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
|
||||
try!(write!(f, "{:?}", self.description()));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl Display for ParserError {
|
||||
|
||||
fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
|
||||
try!(write!(f, "{}", self.description()));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl Error for ParserError {
|
||||
|
||||
fn description(&self) -> &str {
|
||||
match self.kind {
|
||||
ParserErrorKind::TOMLParserErrors => "Several TOML-Parser-Errors",
|
||||
ParserErrorKind::MissingMainSection => "Missing main section",
|
||||
ParserErrorKind::MissingVersionInfo => "Missing version information in main section",
|
||||
}
|
||||
}
|
||||
|
||||
fn cause(&self) -> Option<&Error> {
|
||||
self.cause.as_ref().map(|e| &**e)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,325 +0,0 @@
|
|||
use std::collections::BTreeMap;
|
||||
use std::error::Error;
|
||||
use std::result::Result as RResult;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use toml::{Array, Table, Value};
|
||||
use version;
|
||||
|
||||
use self::error::ParserErrorKind;
|
||||
use self::error::ParserError;
|
||||
|
||||
pub mod error {
|
||||
use std::fmt::{Debug, Display, Formatter};
|
||||
use std::fmt;
|
||||
use std::error::Error;
|
||||
use toml;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub enum ParserErrorKind {
|
||||
TOMLParserErrors,
|
||||
MissingMainSection,
|
||||
MissingVersionInfo,
|
||||
}
|
||||
|
||||
pub struct ParserError {
|
||||
kind: ParserErrorKind,
|
||||
cause: Option<Box<Error>>,
|
||||
}
|
||||
|
||||
impl ParserError {
|
||||
|
||||
pub fn new(k: ParserErrorKind, cause: Option<Box<Error>>) -> ParserError {
|
||||
ParserError {
|
||||
kind: k,
|
||||
cause: cause,
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl Debug for ParserError {
|
||||
|
||||
fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
|
||||
try!(write!(f, "{:?}", self.description()));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl Display for ParserError {
|
||||
|
||||
fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
|
||||
try!(write!(f, "{}", self.description()));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl Error for ParserError {
|
||||
|
||||
fn description(&self) -> &str {
|
||||
match self.kind {
|
||||
ParserErrorKind::TOMLParserErrors => "Several TOML-Parser-Errors",
|
||||
ParserErrorKind::MissingMainSection => "Missing main section",
|
||||
ParserErrorKind::MissingVersionInfo => "Missing version information in main section",
|
||||
}
|
||||
}
|
||||
|
||||
fn cause(&self) -> Option<&Error> {
|
||||
self.cause.as_ref().map(|e| &**e)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* EntryHeader
|
||||
*
|
||||
* This is basically a wrapper around toml::Table which provides convenience to the user of the
|
||||
* librray.
|
||||
*/
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct EntryHeader {
|
||||
toml: Table,
|
||||
}
|
||||
|
||||
pub type Result<V> = RResult<V, error::ParserError>;
|
||||
|
||||
/**
|
||||
* Wrapper type around file header (TOML) object
|
||||
*/
|
||||
impl EntryHeader {
|
||||
|
||||
/**
|
||||
* Get a new header object with a already-filled toml table
|
||||
*
|
||||
* Default header values are inserted into the header object by default.
|
||||
*/
|
||||
pub fn new() -> EntryHeader {
|
||||
EntryHeader {
|
||||
toml: build_default_header(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_current() -> EntryHeader {
|
||||
EntryHeader {
|
||||
toml: {
|
||||
let mut header = BTreeMap::new();
|
||||
let sub = {
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::String(version!()));
|
||||
|
||||
Value::Table(sub)
|
||||
};
|
||||
|
||||
header.insert("imag".into(), sub);
|
||||
header
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the table which lives in the background
|
||||
*/
|
||||
pub fn toml(&self) -> &Table {
|
||||
&self.toml
|
||||
}
|
||||
|
||||
pub fn parse(s: &str) -> Result<EntryHeader> {
|
||||
use toml::Parser;
|
||||
|
||||
let mut parser = Parser::new(s);
|
||||
parser.parse()
|
||||
.ok_or(ParserError::new(ParserErrorKind::TOMLParserErrors, None))
|
||||
.and_then(|t| verify_header_consistency(t))
|
||||
.map(|t| {
|
||||
EntryHeader {
|
||||
toml: t
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
fn verify_header_consistency(t: Table) -> Result<Table> {
|
||||
if !has_main_section(&t) {
|
||||
Err(ParserError::new(ParserErrorKind::MissingMainSection, None))
|
||||
} else if !has_imag_version_in_main_section(&t) {
|
||||
Err(ParserError::new(ParserErrorKind::MissingVersionInfo, None))
|
||||
} else {
|
||||
Ok(t)
|
||||
}
|
||||
}
|
||||
|
||||
fn has_main_section(t: &Table) -> bool {
|
||||
t.contains_key("imag") &&
|
||||
match t.get("imag") {
|
||||
Some(&Value::Table(_)) => true,
|
||||
Some(_) => false,
|
||||
None => false,
|
||||
}
|
||||
}
|
||||
|
||||
fn has_imag_version_in_main_section(t: &Table) -> bool {
|
||||
use semver::Version;
|
||||
|
||||
match t.get("imag").unwrap() {
|
||||
&Value::Table(ref sec) => {
|
||||
sec.get("version")
|
||||
.and_then(|v| {
|
||||
match v {
|
||||
&Value::String(ref s) => {
|
||||
Some(Version::parse(&s[..]).is_ok())
|
||||
},
|
||||
_ => Some(false),
|
||||
}
|
||||
})
|
||||
.unwrap_or(false)
|
||||
}
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use toml::Value;
|
||||
|
||||
#[test]
|
||||
fn test_imag_section() {
|
||||
use super::has_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
map.insert("imag".into(), Value::Table(BTreeMap::new()));
|
||||
|
||||
assert!(has_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_imag_invalid_section_type() {
|
||||
use super::has_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
map.insert("imag".into(), Value::Boolean(false));
|
||||
|
||||
assert!(!has_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_imag_abscent_main_section() {
|
||||
use super::has_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
map.insert("not_imag".into(), Value::Boolean(false));
|
||||
|
||||
assert!(!has_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_main_section_without_version() {
|
||||
use super::has_imag_version_in_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
map.insert("imag".into(), Value::Table(BTreeMap::new()));
|
||||
|
||||
assert!(!has_imag_version_in_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_main_section_with_version() {
|
||||
use super::has_imag_version_in_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::String("0.0.0".into()));
|
||||
map.insert("imag".into(), Value::Table(sub));
|
||||
|
||||
assert!(has_imag_version_in_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_main_section_with_version_in_wrong_type() {
|
||||
use super::has_imag_version_in_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::Boolean(false));
|
||||
map.insert("imag".into(), Value::Table(sub));
|
||||
|
||||
assert!(!has_imag_version_in_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verification_good() {
|
||||
use super::verify_header_consistency;
|
||||
|
||||
let mut header = BTreeMap::new();
|
||||
let sub = {
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::String(String::from("0.0.0")));
|
||||
|
||||
Value::Table(sub)
|
||||
};
|
||||
|
||||
header.insert("imag".into(), sub);
|
||||
|
||||
assert!(verify_header_consistency(header).is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verification_invalid_versionstring() {
|
||||
use super::verify_header_consistency;
|
||||
|
||||
let mut header = BTreeMap::new();
|
||||
let sub = {
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::String(String::from("000")));
|
||||
|
||||
Value::Table(sub)
|
||||
};
|
||||
|
||||
header.insert("imag".into(), sub);
|
||||
|
||||
assert!(!verify_header_consistency(header).is_ok());
|
||||
}
|
||||
|
||||
|
||||
#[test]
|
||||
fn test_verification_current_version() {
|
||||
use version;
|
||||
|
||||
use super::verify_header_consistency;
|
||||
|
||||
let mut header = BTreeMap::new();
|
||||
let sub = {
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::String(version!()));
|
||||
|
||||
Value::Table(sub)
|
||||
};
|
||||
|
||||
header.insert("imag".into(), sub);
|
||||
|
||||
assert!(verify_header_consistency(header).is_ok());
|
||||
}
|
||||
}
|
||||
|
||||
fn build_default_header() -> BTreeMap<String, Value> {
|
||||
let mut m = BTreeMap::new();
|
||||
|
||||
m.insert(String::from("imag"), {
|
||||
let mut imag_map = BTreeMap::<String, Value>::new();
|
||||
|
||||
imag_map.insert(String::from("version"), Value::String(version!()));
|
||||
imag_map.insert(String::from("links"), Value::Array(vec![]));
|
||||
|
||||
Value::Table(imag_map)
|
||||
});
|
||||
|
||||
m
|
||||
}
|
||||
|
||||
|
|
@ -6,10 +6,7 @@ extern crate toml;
|
|||
extern crate semver;
|
||||
|
||||
pub mod storeid;
|
||||
pub mod content;
|
||||
pub mod entry;
|
||||
pub mod error;
|
||||
pub mod header;
|
||||
pub mod store;
|
||||
mod lazyfile;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,10 +5,14 @@ use std::path::PathBuf;
|
|||
use std::result::Result as RResult;
|
||||
use std::sync::Arc;
|
||||
use std::sync::RwLock;
|
||||
use std::error::Error;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
|
||||
use fs2::FileExt;
|
||||
use toml::{Table, Value};
|
||||
|
||||
use entry::Entry;
|
||||
use error::{ParserErrorKind, ParserError};
|
||||
use error::{StoreError, StoreErrorKind};
|
||||
use storeid::StoreId;
|
||||
use lazyfile::LazyFile;
|
||||
|
|
@ -198,3 +202,287 @@ impl<'a> Drop for FileLockEntry<'a> {
|
|||
self.store._update(self).unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* EntryContent type
|
||||
*/
|
||||
pub type EntryContent = String;
|
||||
|
||||
/**
|
||||
* EntryHeader
|
||||
*
|
||||
* This is basically a wrapper around toml::Table which provides convenience to the user of the
|
||||
* librray.
|
||||
*/
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct EntryHeader {
|
||||
toml: Table,
|
||||
}
|
||||
|
||||
pub type EntryResult<V> = RResult<V, ParserError>;
|
||||
|
||||
/**
|
||||
* Wrapper type around file header (TOML) object
|
||||
*/
|
||||
impl EntryHeader {
|
||||
|
||||
/**
|
||||
* Get a new header object with a already-filled toml table
|
||||
*/
|
||||
pub fn new(toml: Table) -> EntryHeader {
|
||||
EntryHeader {
|
||||
toml: toml,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_current() -> EntryHeader {
|
||||
EntryHeader {
|
||||
toml: build_default_header()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the table which lives in the background
|
||||
*/
|
||||
pub fn toml(&self) -> &Table {
|
||||
&self.toml
|
||||
}
|
||||
|
||||
pub fn parse(s: &str) -> EntryResult<EntryHeader> {
|
||||
use toml::Parser;
|
||||
|
||||
let mut parser = Parser::new(s);
|
||||
parser.parse()
|
||||
.ok_or(ParserError::new(ParserErrorKind::TOMLParserErrors, None))
|
||||
.and_then(|t| verify_header_consistency(t))
|
||||
.map(|t| EntryHeader::new(t))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
fn build_default_header() -> BTreeMap<String, Value> {
|
||||
let mut m = BTreeMap::new();
|
||||
|
||||
m.insert(String::from("imag"), {
|
||||
let mut imag_map = BTreeMap::<String, Value>::new();
|
||||
|
||||
imag_map.insert(String::from("version"), Value::String(version!()));
|
||||
imag_map.insert(String::from("links"), Value::Array(vec![]));
|
||||
|
||||
Value::Table(imag_map)
|
||||
});
|
||||
|
||||
m
|
||||
}
|
||||
|
||||
fn verify_header_consistency(t: Table) -> EntryResult<Table> {
|
||||
if !has_main_section(&t) {
|
||||
Err(ParserError::new(ParserErrorKind::MissingMainSection, None))
|
||||
} else if !has_imag_version_in_main_section(&t) {
|
||||
Err(ParserError::new(ParserErrorKind::MissingVersionInfo, None))
|
||||
} else {
|
||||
Ok(t)
|
||||
}
|
||||
}
|
||||
|
||||
fn has_main_section(t: &Table) -> bool {
|
||||
t.contains_key("imag") &&
|
||||
match t.get("imag") {
|
||||
Some(&Value::Table(_)) => true,
|
||||
Some(_) => false,
|
||||
None => false,
|
||||
}
|
||||
}
|
||||
|
||||
fn has_imag_version_in_main_section(t: &Table) -> bool {
|
||||
use semver::Version;
|
||||
|
||||
match t.get("imag").unwrap() {
|
||||
&Value::Table(ref sec) => {
|
||||
sec.get("version")
|
||||
.and_then(|v| {
|
||||
match v {
|
||||
&Value::String(ref s) => {
|
||||
Some(Version::parse(&s[..]).is_ok())
|
||||
},
|
||||
_ => Some(false),
|
||||
}
|
||||
})
|
||||
.unwrap_or(false)
|
||||
}
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* An Entry of the store
|
||||
*
|
||||
* Contains location, header and content part.
|
||||
*/
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Entry {
|
||||
location: StoreId,
|
||||
header: EntryHeader,
|
||||
content: EntryContent,
|
||||
}
|
||||
|
||||
impl Entry {
|
||||
|
||||
fn new(loc: StoreId) -> Entry {
|
||||
Entry {
|
||||
location: loc,
|
||||
header: EntryHeader::new_current(),
|
||||
content: EntryContent::new()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_location(&self) -> &StoreId {
|
||||
&self.location
|
||||
}
|
||||
|
||||
pub fn get_header(&self) -> &EntryHeader {
|
||||
&self.header
|
||||
}
|
||||
|
||||
pub fn get_header_mut(&mut self) -> &mut EntryHeader {
|
||||
&mut self.header
|
||||
}
|
||||
|
||||
pub fn get_content(&self) -> &EntryContent {
|
||||
&self.content
|
||||
}
|
||||
|
||||
pub fn get_content_mut(&mut self) -> &mut EntryContent {
|
||||
&mut self.content
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use toml::Value;
|
||||
|
||||
#[test]
|
||||
fn test_imag_section() {
|
||||
use super::has_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
map.insert("imag".into(), Value::Table(BTreeMap::new()));
|
||||
|
||||
assert!(has_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_imag_invalid_section_type() {
|
||||
use super::has_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
map.insert("imag".into(), Value::Boolean(false));
|
||||
|
||||
assert!(!has_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_imag_abscent_main_section() {
|
||||
use super::has_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
map.insert("not_imag".into(), Value::Boolean(false));
|
||||
|
||||
assert!(!has_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_main_section_without_version() {
|
||||
use super::has_imag_version_in_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
map.insert("imag".into(), Value::Table(BTreeMap::new()));
|
||||
|
||||
assert!(!has_imag_version_in_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_main_section_with_version() {
|
||||
use super::has_imag_version_in_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::String("0.0.0".into()));
|
||||
map.insert("imag".into(), Value::Table(sub));
|
||||
|
||||
assert!(has_imag_version_in_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_main_section_with_version_in_wrong_type() {
|
||||
use super::has_imag_version_in_main_section;
|
||||
|
||||
let mut map = BTreeMap::new();
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::Boolean(false));
|
||||
map.insert("imag".into(), Value::Table(sub));
|
||||
|
||||
assert!(!has_imag_version_in_main_section(&map));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verification_good() {
|
||||
use super::verify_header_consistency;
|
||||
|
||||
let mut header = BTreeMap::new();
|
||||
let sub = {
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::String(String::from("0.0.0")));
|
||||
|
||||
Value::Table(sub)
|
||||
};
|
||||
|
||||
header.insert("imag".into(), sub);
|
||||
|
||||
assert!(verify_header_consistency(header).is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verification_invalid_versionstring() {
|
||||
use super::verify_header_consistency;
|
||||
|
||||
let mut header = BTreeMap::new();
|
||||
let sub = {
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::String(String::from("000")));
|
||||
|
||||
Value::Table(sub)
|
||||
};
|
||||
|
||||
header.insert("imag".into(), sub);
|
||||
|
||||
assert!(!verify_header_consistency(header).is_ok());
|
||||
}
|
||||
|
||||
|
||||
#[test]
|
||||
fn test_verification_current_version() {
|
||||
use version;
|
||||
|
||||
use super::verify_header_consistency;
|
||||
|
||||
let mut header = BTreeMap::new();
|
||||
let sub = {
|
||||
let mut sub = BTreeMap::new();
|
||||
sub.insert("version".into(), Value::String(version!()));
|
||||
|
||||
Value::Table(sub)
|
||||
};
|
||||
|
||||
header.insert("imag".into(), sub);
|
||||
|
||||
assert!(verify_header_consistency(header).is_ok());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue