浏览代码

Fix tests again

Isaac Woods 4 年之前
父节点
当前提交
816e420a64
共有 6 个文件被更改,包括 13 次插入13 次删除
  1. 3 3
      aml/src/name_object.rs
  2. 3 3
      aml/src/opcode.rs
  3. 2 2
      aml/src/parser.rs
  4. 3 3
      aml/src/pkg_length.rs
  5. 1 1
      aml/src/term_object.rs
  6. 1 1
      aml_tester/src/main.rs

+ 3 - 3
aml/src/name_object.rs

@@ -232,7 +232,7 @@ mod tests {
 
     #[test]
     fn test_name_seg() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
 
         check_ok!(
             name_seg().parse(&[b'A', b'F', b'3', b'Z'], &mut context),
@@ -254,7 +254,7 @@ mod tests {
 
     #[test]
     fn test_name_path() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
 
         check_err!(name_path().parse(&[], &mut context), AmlError::UnexpectedEndOfStream, &[]);
         check_ok!(name_path().parse(&[0x00], &mut context), alloc::vec![], &[]);
@@ -272,7 +272,7 @@ mod tests {
 
     #[test]
     fn test_prefix_path() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
 
         check_ok!(
             name_string().parse(&[b'^', b'A', b'B', b'C', b'D'], &mut context),

+ 3 - 3
aml/src/opcode.rs

@@ -92,14 +92,14 @@ mod tests {
 
     #[test]
     fn empty() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
         check_err!(opcode(NULL_NAME).parse(&[], &mut context), AmlError::UnexpectedEndOfStream, &[]);
         check_err!(ext_opcode(EXT_DEF_FIELD_OP).parse(&[], &mut context), AmlError::UnexpectedEndOfStream, &[]);
     }
 
     #[test]
     fn simple_opcodes() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
         check_ok!(opcode(DEF_SCOPE_OP).parse(&[DEF_SCOPE_OP], &mut context), (), &[]);
         check_ok!(
             opcode(DEF_NAME_OP).parse(&[DEF_NAME_OP, 0x31, 0x55, 0xf3], &mut context),
@@ -110,7 +110,7 @@ mod tests {
 
     #[test]
     fn extended_opcodes() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
         check_err!(
             ext_opcode(EXT_DEF_FIELD_OP).parse(&[EXT_DEF_FIELD_OP, EXT_DEF_FIELD_OP], &mut context),
             AmlError::WrongParser,

+ 2 - 2
aml/src/parser.rs

@@ -476,7 +476,7 @@ mod tests {
 
     #[test]
     fn test_take_n() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
         check_err!(take_n(1).parse(&[], &mut context), AmlError::UnexpectedEndOfStream, &[]);
         check_err!(take_n(2).parse(&[0xf5], &mut context), AmlError::UnexpectedEndOfStream, &[0xf5]);
 
@@ -487,7 +487,7 @@ mod tests {
 
     #[test]
     fn test_take_ux() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
         check_err!(take_u16().parse(&[0x34], &mut context), AmlError::UnexpectedEndOfStream, &[0x34]);
         check_ok!(take_u16().parse(&[0x34, 0x12], &mut context), 0x1234, &[]);
 

+ 3 - 3
aml/src/pkg_length.rs

@@ -94,7 +94,7 @@ mod tests {
     use crate::{test_utils::*, AmlError, DebugVerbosity};
 
     fn test_correct_pkglength(stream: &[u8], expected_raw_length: u32, expected_leftover: &[u8]) {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
         check_ok!(
             pkg_length().parse(stream, &mut context),
             PkgLength::from_raw_length(stream, expected_raw_length),
@@ -104,7 +104,7 @@ mod tests {
 
     #[test]
     fn test_raw_pkg_length() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
         check_ok!(raw_pkg_length().parse(&[0b01000101, 0x14], &mut context), 325, &[]);
         check_ok!(raw_pkg_length().parse(&[0b01000111, 0x14, 0x46], &mut context), 327, &[0x46]);
         check_ok!(raw_pkg_length().parse(&[0b10000111, 0x14, 0x46], &mut context), 287047, &[]);
@@ -112,7 +112,7 @@ mod tests {
 
     #[test]
     fn test_pkg_length() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
         check_err!(pkg_length().parse(&[], &mut context), AmlError::UnexpectedEndOfStream, &[]);
         test_correct_pkglength(&[0x00], 0, &[]);
         test_correct_pkglength(&[0x05, 0xf5, 0x7f, 0x3e, 0x54, 0x03], 5, &[0xf5, 0x7f, 0x3e, 0x54, 0x03]);

+ 1 - 1
aml/src/term_object.rs

@@ -591,7 +591,7 @@ mod test {
 
     #[test]
     fn test_computational_data() {
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
         check_ok!(
             computational_data().parse(&[0x00, 0x34, 0x12], &mut context),
             AmlValue::Integer(0),

+ 1 - 1
aml_tester/src/main.rs

@@ -56,7 +56,7 @@ fn main() -> std::io::Result<()> {
         file.read_to_end(&mut contents).unwrap();
 
         const AML_TABLE_HEADER_LENGTH: usize = 36;
-        let mut context = AmlContext::new(DebugVerbosity::None);
+        let mut context = AmlContext::new(false, DebugVerbosity::None);
 
         match context.parse_table(&contents[AML_TABLE_HEADER_LENGTH..]) {
             Ok(()) => {