Merge pull request #1 from Artemkaaas/feature/fix-wallet-tests

Fixed tests related to Not Found Wallet

Author: dkulic

libindy/src/services/wallet/mod.rs

@@ -233,7 +233,11 @@ impl WalletService {
 
         let mut descriptor_json = String::new();
         let descriptor: WalletDescriptor = WalletDescriptor::from_json({
-            let mut file = File::open(_wallet_descriptor_path(name))?; // FIXME: Better error!
+            let wallet_descriptor_path = _wallet_descriptor_path(name);
+            if !wallet_descriptor_path.exists() {
+                return Err(WalletError::NotFound("Wallet descriptor path does not exist.".to_string()));
+            }
+            let mut file = File::open(wallet_descriptor_path)?;
             file.read_to_string(&mut descriptor_json)?;
             descriptor_json.as_str()
         })?;

libindy/tests/wallet.rs

@@ -386,7 +386,7 @@ mod medium_cases {
             TestUtils::cleanup_storage();
 
             let res = WalletUtils::delete_wallet(WALLET);
-            assert_eq!(res.unwrap_err(), ErrorCode::CommonIOError);
+            assert_eq!(res.unwrap_err(), ErrorCode::WalletNotFoundError);
 
             TestUtils::cleanup_storage();
         }
@@ -398,7 +398,7 @@ mod medium_cases {
             WalletUtils::create_wallet(POOL, WALLET, None, None, None).unwrap();
             WalletUtils::delete_wallet(WALLET).unwrap();
             let res = WalletUtils::delete_wallet(WALLET);
-            assert_eq!(res.unwrap_err(), ErrorCode::CommonIOError);
+            assert_eq!(res.unwrap_err(), ErrorCode::WalletNotFoundError);
 
             TestUtils::cleanup_storage();
         }
@@ -412,7 +412,7 @@ mod medium_cases {
             TestUtils::cleanup_storage();
 
             let res = WalletUtils::open_wallet(WALLET, None, None);
-            assert_eq!(res.unwrap_err(), ErrorCode::CommonIOError);
+            assert_eq!(res.unwrap_err(), ErrorCode::WalletNotFoundError);
 
             TestUtils::cleanup_storage();
         }

wrappers/ios/libindy-pod/Indy-demoTests/Case Tests/Wallet/WalletHighCases.m

@@ -148,7 +148,7 @@ - (void)testDeleteWalletWorksForClosed {
 
 - (void)testDeleteWalletWorksForUnknown {
     NSError *ret = [[WalletUtils sharedInstance] deleteWalletWithName:@"testDeleteWalletWorksForUnknown"];
-    XCTAssertEqual(ret.code, CommonIOError, @"WalletUtils:deleteWalletWithName() returned wrong error");
+    XCTAssertEqual(ret.code, WalletNotFoundError, @"WalletUtils:deleteWalletWithName() returned wrong error");
 }
 
 // MARK: - Open wallet
@@ -200,7 +200,7 @@ - (void)testOpenWalletWorksForNotCreatedWallet {
     NSError *ret = [[WalletUtils sharedInstance] openWalletWithName:[TestUtils wallet]
                                                              config:nil
                                                           outHandle:nil];
-    XCTAssertEqual(ret.code, CommonIOError, @"WalletUtils:openWalletWithName() failed");
+    XCTAssertEqual(ret.code, WalletNotFoundError, @"WalletUtils:openWalletWithName() failed");
 }
 
 // MARK: - Close wallet

wrappers/java/src/test/java/org/hyperledger/indy/sdk/wallet/DeleteWalletTest.java

@@ -51,7 +51,7 @@ public void testDeleteWalletWorksForOpened() throws Exception {
 	@Test
 	public void testDeleteWalletWorksForTwice() throws Exception {
 		thrown.expect(ExecutionException.class);
-		thrown.expectCause(isA(IOException.class));
+		thrown.expectCause(isA(WalletNotFoundException.class));
 
 		Wallet.createWallet(POOL, WALLET, null, null, CREDENTIALS).get();
 
@@ -74,7 +74,7 @@ public void testDeleteWalletWorksForPlugged() throws Exception {
 	@Test
 	public void testDeleteWalletWorksForNotCreated() throws Exception {
 		thrown.expect(ExecutionException.class);
-		thrown.expectCause(isA(IOException.class));
+		thrown.expectCause(isA(WalletNotFoundException.class));
 
 		Wallet.deleteWallet(WALLET, CREDENTIALS).get();
 	}

wrappers/java/src/test/java/org/hyperledger/indy/sdk/wallet/OpenWalletTest.java

@@ -66,7 +66,7 @@ public void testOpenWalletWorksForPlugged() throws Exception {
 	@Test
 	public void testOpenWalletWorksForNotCreatedWallet() throws Exception {
 		thrown.expect(ExecutionException.class);
-		thrown.expectCause(isA(IOException.class));
+		thrown.expectCause(isA(WalletNotFoundException.class));
 
 		Wallet.openWallet("openWalletWorksForNotCreatedWallet", null, CREDENTIALS).get();
 	}

wrappers/python/tests/wallet/test_delete_wallet.py

@@ -37,7 +37,7 @@ async def test_delete_wallet_works_for_twice(wallet_name, xwallet, credentials):
     with pytest.raises(IndyError) as e:
         await wallet.delete_wallet(wallet_name, credentials)
 
-    assert ErrorCode.CommonIOError == e.value.error_code
+    assert ErrorCode.WalletNotFoundError == e.value.error_code
 
 
 # noinspection PyUnusedLocal
@@ -46,4 +46,4 @@ async def test_delete_wallet_works_for_not_created(wallet_name, path_home, crede
     with pytest.raises(IndyError) as e:
         await wallet.delete_wallet(wallet_name, credentials)
 
-    assert ErrorCode.CommonIOError == e.value.error_code
+    assert ErrorCode.WalletNotFoundError == e.value.error_code

wrappers/python/tests/wallet/test_open_wallet.py

@@ -15,7 +15,7 @@ async def test_open_wallet_works(wallet_config, wallet_handle):
 async def test_open_wallet_works_for_not_created_wallet(credentials):
     with pytest.raises(IndyError) as e:
         await wallet.open_wallet('wallet_not_created', None, credentials)
-    assert ErrorCode.CommonIOError == e.value.error_code
+    assert ErrorCode.WalletNotFoundError == e.value.error_code
 
 
 @pytest.mark.asyncio