Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: enhance error checking #394

Merged
merged 9 commits into from
May 10, 2021
Merged

feat: enhance error checking #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4f4bc5e
feat: add NfcError module
whitedogg13 Apr 27, 2021
8256c4a
chore: update index.d.ts for NfcError
whitedogg13 Apr 29, 2021
129fb87
draft: enhance NfcError
whitedogg13 May 3, 2021
68e4a0a
fix: export correct NfcErrorIOS, and fix bug in cancelTechnology
whitedogg13 May 3, 2021
7a3749f
feat: wrap all callNative with handleNativeException
whitedogg13 May 3, 2021
7bdb351
fix(android): use buildNfcExceptionAndroid rather than
whitedogg13 May 10, 2021
a41fb85
feat: enhance Android's native error message
whitedogg13 May 10, 2021
2dd09a8
feat: enhance index.d.ts
whitedogg13 May 10, 2021
a24a4e5
fix: export NfcError namespace
whitedogg13 May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion __tests__/NfcManager.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ import {
NfcManagerEmitter,
callNative,
} from '../src/NativeNfcManager';
import * as NfcError from '../src/NfcError';

describe('NfcManager (ios)', () => {
Platform.setOS('ios');
const NfcManagerModule = require('../src/index.js');
const NfcManager = NfcManagerModule.default;
const {NfcEvents, NfcErrorIOS} = NfcManagerModule;
const {NfcEvents, NfcErrorIOS, NfcTech} = NfcManagerModule;
const lastNativeCall = () =>
callNative.mock.calls[callNative.mock.calls.length - 1];

Expand Down Expand Up @@ -129,4 +130,20 @@ describe('NfcManager (ios)', () => {
NfcErrorIOS.errCodes.userCancel,
);
});

test('NfcError', async () => {
try {
NativeNfcManager.setNextError('NFCError:200');
await NfcManager.requestTechnology(NfcTech.Ndef);
} catch (ex) {
if (!(ex instanceof NfcError.UserCancel)) {
expect(true).toBe(false);
}

// for backward capatible
if (NfcErrorIOS.parse(ex) !== NfcErrorIOS.errCodes.userCancel) {
expect(true).toBe(false);
}
}
});
});
14 changes: 14 additions & 0 deletions __tests__/NfcManagerAndroid.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
jest.mock('../src/NativeNfcManager');

import {Platform} from 'react-native';
import {NativeNfcManager} from '../src/NativeNfcManager';
import * as NfcError from '../src/NfcError';

describe('NfcManager (android)', () => {
Platform.setOS('android');
const NfcManagerModule = require('../src/index.js');
const NfcManager = NfcManagerModule.default;
const {NfcTech} = NfcManagerModule;

test('constructor', () => {
expect(Platform.OS).toBe('android');
Expand Down Expand Up @@ -56,4 +59,15 @@ describe('NfcManager (android)', () => {
await NfcManager.setAlertMessage();
expect(true).toBe(true);
});

test('NfcError', async () => {
try {
NativeNfcManager.setNextError('cancelled');
await NfcManager.requestTechnology(NfcTech.Ndef);
} catch (ex) {
if (!(ex instanceof NfcError.UserCancel)) {
expect(true).toBe(false);
}
}
});
});
Loading