add more unit test

Author: colmazia

packages/vm/src/cache.rs

@@ -116,7 +116,7 @@ mod test {
     }
 
     #[test]
-    fn test_catch() {
+    fn test_cache_catch() {
         let mut cache = Cache::new(CacheOptions { cache_size: 10000 });
         let wasm = wat2wasm(
             r#"(module
@@ -142,6 +142,12 @@ mod test {
         let (_, is_hit) = get_instance_without_err(&mut cache, &wasm2);
         assert_eq!(false, is_hit);
 
+        let (_, is_hit) = get_instance_without_err(&mut cache, &wasm);
+        assert_eq!(true, is_hit);
+
+        let (_, is_hit) = get_instance_without_err(&mut cache, &wasm2);
+        assert_eq!(true, is_hit);
+
         let ser1 = match instance1.module().serialize() {
             Ok(r) => r,
             Err(_) => panic!("Fail to serialize module"),
@@ -156,7 +162,7 @@ mod test {
     }
 
     #[test]
-    fn test_lru_catch() {
+    fn test_cache_size() {
         let mut cache = Cache::new(CacheOptions { cache_size: 2 });
         let wasm1 = wat2wasm(
             r#"(module
@@ -209,5 +215,13 @@ mod test {
         // miss [2 1] => [3 2]
         let (_, is_hit) = get_instance_without_err(&mut cache, &wasm3);
         assert_eq!(false, is_hit);
+
+        cache = Cache::new(CacheOptions { cache_size: 0 });
+
+        let (_, is_hit) = get_instance_without_err(&mut cache, &wasm1);
+        assert_eq!(false, is_hit);
+
+        let (_, is_hit) = get_instance_without_err(&mut cache, &wasm1);
+        assert_eq!(false, is_hit);
     }
 }

packages/vm/src/calls.rs

@@ -211,7 +211,7 @@ mod test {
         let code = compile(&wasm).unwrap();
         let mut cache = Cache::new(CacheOptions { cache_size: 10000 });
         let querier = MockQuerier {};
-        let out_of_gas_err = run(&mut cache, &code, 0, true, querier).unwrap_err();
+        let out_of_gas_err = run(&mut cache, &code, 10, true, querier).unwrap_err();
         assert_eq!(out_of_gas_err, Error::OutOfGasError);
     }
 }

packages/vm/src/imports.rs

@@ -373,11 +373,22 @@ mod test {
 
     #[test]
     fn test_wrapper_fn() {
+        let querier = MockQuerier {};
+        let owasm_env = Environment::new(querier);
         assert_eq!(Ok(()), require_mem_range(2, 1));
         assert_eq!(Err(Error::MemoryOutOfBoundError), require_mem_range(1, 2));
         assert_eq!(Ok(()), require_mem_range(usize::MAX, usize::MAX));
         assert_eq!(Ok(usize::MAX), safe_convert(usize::MAX as u64));
+        assert_eq!(Err(Error::ConvertTypeOutOfBound), safe_convert::<_, usize>(-1));
         assert_eq!(Err(Error::ConvertTypeOutOfBound), safe_convert::<_, usize>(i64::MIN));
+        assert_eq!(Err(Error::ConvertTypeOutOfBound), safe_convert::<_, i64>(usize::MAX));
+        assert_eq!(Ok(10), safe_add(4, 6));
+        assert_eq!(Ok(i64::MAX as usize + 1), safe_add(i64::MAX, 1));
+        assert_eq!(Err(Error::ConvertTypeOutOfBound), safe_add(-1, 6));
+        assert_eq!(Err(Error::ConvertTypeOutOfBound), safe_add(5, -10));
+        assert_eq!(Err(Error::ConvertTypeOutOfBound), safe_add(usize::MAX as i64, 1));
+        assert_eq!(Err(Error::MemoryOutOfBoundError), read_memory(&owasm_env, -1, 1));
+        assert_eq!(Err(Error::MemoryOutOfBoundError), write_memory(&owasm_env, -1, vec! {}))
     }
 
     #[test]

packages/vm/src/vm.rs

@@ -231,7 +231,6 @@ mod test {
 
     #[test]
     fn test_env_querier() {
-        println!("{}", Error::OutOfGasError);
         let env = Environment::new(MockQuerier {});
         assert_eq!(300, env.with_querier_from_context(|querier| querier.get_span_size()));
     }