From 629908077bac27e8495c716d5785164eccf96b4f Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Wed, 24 Aug 2022 16:27:03 +0200
Subject: [PATCH 1/4] test: simplify all the tests

---
 example/App.tsx                               |  73 ++---
 example/e2e/asyncstorage.e2e.js               | 276 ++----------------
 example/examples/Basic.tsx                    |   9 +-
 example/examples/Functional.tsx               | 137 +++++++++
 example/examples/GetSetClear.tsx              |  11 +-
 example/examples/MergeItem.tsx                |  11 +-
 example/examples/tests.ts                     |  46 +++
 .../AsyncStorageDevSupport.m                  |  16 +-
 package.json                                  |   2 +
 yarn.lock                                     |   5 +
 10 files changed, 268 insertions(+), 318 deletions(-)
 create mode 100644 example/examples/Functional.tsx
 create mode 100644 example/examples/tests.ts

diff --git a/example/App.tsx b/example/App.tsx
index 6ea3b65a..70c65496 100644
--- a/example/App.tsx
+++ b/example/App.tsx
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import {
   Button,
   Keyboard,
@@ -15,52 +15,42 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native';
-import BasicExample from './examples/Basic';
+import Basic from './examples/Basic';
+import Functional from './examples/Functional';
 import GetSetClear from './examples/GetSetClear';
 import MergeItem from './examples/MergeItem';
 
-const TESTS = {
-  GetSetClear: {
-    title: 'Simple Get/Set value',
-    testId: 'get-set-clear',
-    description: 'Store and retrieve persisted data',
-    render() {
-      return <GetSetClear />;
-    },
-  },
-  MergeItem: {
-    title: 'Merge item',
-    testId: 'merge-item',
-    description: 'Merge object with already stored data',
-    render() {
-      return <MergeItem />;
-    },
-  },
-  Basic: {
-    title: 'Basic',
-    testId: 'basic',
-    description: 'Basic functionality test',
-    render() {
-      return <BasicExample />;
-    },
-  },
+const SCREENS = {
+  Functional,
+  GetSetClear,
+  MergeItem,
+  Basic,
 };
 
 export default function App(): JSX.Element {
   const [iteration, setIteration] = useState(0);
-  const [currentTest, setCurrentTest] = useState(TESTS.GetSetClear);
+  const [currentTest, setCurrentTest] = useState(SCREENS.Functional);
 
-  const dismissKeyboard = useCallback(() => Keyboard.dismiss(), []);
+  const dismissKeyboard = useCallback(Keyboard.dismiss, []);
   const simulateRestart = useCallback(
     () => setIteration(iteration + 1),
     [iteration]
   );
-  const testBasic = useCallback(() => setCurrentTest(TESTS.Basic), []);
-  const testGetSetClear = useCallback(
-    () => setCurrentTest(TESTS.GetSetClear),
+  const navigationBar = useMemo(
+    () =>
+      Object.values(SCREENS).map((t) => {
+        const { testId, title } = t;
+        return (
+          <Button
+            key={testId}
+            testID={testId}
+            title={title}
+            onPress={() => setCurrentTest(t)}
+          />
+        );
+      }),
     []
   );
-  const testMergeItem = useCallback(() => setCurrentTest(TESTS.MergeItem), []);
 
   return (
     <SafeAreaView style={styles.container}>
@@ -69,7 +59,6 @@ export default function App(): JSX.Element {
         onPress={dismissKeyboard}
         testID="closeKeyboard"
       />
-
       <TouchableOpacity
         testID="restart_button"
         onPress={simulateRestart}
@@ -79,22 +68,10 @@ export default function App(): JSX.Element {
         <Text>Simulate Restart</Text>
       </TouchableOpacity>
 
-      <View style={styles.testPickerContainer}>
-        <Button
-          testID="testType_getSetClear"
-          title="Get/Set/Clear"
-          onPress={testGetSetClear}
-        />
-        <Button
-          testID="testType_mergeItem"
-          title="Merge Item"
-          onPress={testMergeItem}
-        />
-        <Button title={TESTS.Basic.title} onPress={testBasic} />
-      </View>
+      <View style={styles.testPickerContainer}>{navigationBar}</View>
 
       <View
-        testID={`example-${currentTest.testId}`}
+        testID={`${currentTest.testId}-view`}
         key={currentTest.title + iteration}
         style={styles.exampleContainer}
       >
diff --git a/example/e2e/asyncstorage.e2e.js b/example/e2e/asyncstorage.e2e.js
index 92e2652a..506feb47 100644
--- a/example/e2e/asyncstorage.e2e.js
+++ b/example/e2e/asyncstorage.e2e.js
@@ -7,268 +7,36 @@
  * @format
  */
 
-describe('Async Storage', () => {
-  let restartButton;
-  let closeKeyboard;
-  let test_getSetClear;
-  let test_mergeItem;
-
-  async function dismissKeyboard() {
-    if (device.getPlatform() === 'android') {
-      return device.pressBack();
-    }
-    return closeKeyboard.tap();
-  }
+import tests from '../examples/tests';
 
+describe('Async Storage', () => {
   beforeAll(async () => {
     await device.reloadReactNative();
-    restartButton = await element(by.id('restart_button'));
-    closeKeyboard = await element(by.id('closeKeyboard'));
-    test_getSetClear = await element(by.id('testType_getSetClear'));
-    test_mergeItem = await element(by.id('testType_mergeItem'));
-  });
-
-  it('should load default screen', async () => {
-    await expect(restartButton).toExist();
-    await expect(closeKeyboard).toExist();
-    await expect(test_getSetClear).toExist();
-    await expect(test_mergeItem).toExist();
-  });
-
-  describe('get / set / clear item test', () => {
-    beforeAll(async () => {
-      await test_getSetClear.tap();
-    });
-
-    it('should be visible', async () => {
-      await expect(element(by.id('clear_button'))).toExist();
-      await expect(element(by.id('increaseByTen_button'))).toExist();
-      await expect(element(by.id('storedNumber_text'))).toExist();
-    });
-
-    it('should store value in async storage', async () => {
-      const storedNumberText = await element(by.id('storedNumber_text'));
-      const increaseByTenButton = await element(by.id('increaseByTen_button'));
-
-      await expect(storedNumberText).toHaveText('');
-
-      const tapTimes = Math.round(Math.random() * 9) + 1;
-
-      for (let i = 0; i < tapTimes; i++) {
-        await increaseByTenButton.tap();
-      }
-
-      await expect(storedNumberText).toHaveText(`${tapTimes * 10}`);
-      await restartButton.tap();
-      await expect(storedNumberText).toHaveText(`${tapTimes * 10}`);
-    });
-
-    it('should clear item', async () => {
-      const storedNumberText = await element(by.id('storedNumber_text'));
-      const increaseByTenButton = await element(by.id('increaseByTen_button'));
-      const clearButton = await element(by.id('clear_button'));
-
-      await increaseByTenButton.tap();
-      await clearButton.tap();
-      await restartButton.tap();
-      await expect(storedNumberText).toHaveText('');
-    });
   });
 
-  describe('merge item test', () => {
-    beforeAll(async () => {
-      await test_mergeItem.tap();
-    });
-
+  describe('functional tests', () => {
     it('should be visible', async () => {
-      await expect(element(by.id('saveItem_button'))).toExist();
-      await expect(element(by.id('mergeItem_button'))).toExist();
-      await expect(element(by.id('restoreItem_button'))).toExist();
-      await expect(element(by.id('testInput-name'))).toExist();
-      await expect(element(by.id('testInput-age'))).toExist();
-      await expect(element(by.id('testInput-eyes'))).toExist();
-      await expect(element(by.id('testInput-shoe'))).toExist();
+      await expect(element(by.id('functional-view'))).toExist();
     });
 
-    it('should merge items in async storage', async () => {
-      const buttonSaveItem = await element(by.id('saveItem_button'));
-      const buttonMergeItem = await element(by.id('mergeItem_button'));
-      const buttonRestoreItem = await element(by.id('restoreItem_button'));
-
-      const nameInput = await element(by.id('testInput-name'));
-      const ageInput = await element(by.id('testInput-age'));
-      const eyesInput = await element(by.id('testInput-eyes'));
-      const shoeInput = await element(by.id('testInput-shoe'));
-      const storyText = await element(by.id('storyTextView'));
-
-      let i = 0;
-      async function performInput() {
-        const name = i === 0 ? 'Jerry' : 'Sarah';
-        const age = i === 0 ? '21' : '23';
-        const eyesColor = i === 0 ? 'blue' : 'green';
-        const shoeSize = i === 0 ? '9' : '10';
-        i += 1;
-
-        await nameInput.clearText();
-        await nameInput.typeText(name);
-        await dismissKeyboard();
-
-        await ageInput.clearText();
-        await ageInput.typeText(age);
-        await dismissKeyboard();
-
-        await eyesInput.clearText();
-        await eyesInput.typeText(eyesColor);
-        await dismissKeyboard();
-
-        await shoeInput.clearText();
-        await shoeInput.typeText(shoeSize);
-        await dismissKeyboard();
-
-        return `${name} is ${age}, has ${eyesColor} eyes and shoe size of ${shoeSize}.`;
-      }
-
-      const story = await performInput();
-      await buttonSaveItem.tap();
-      await restartButton.tap();
-      await buttonRestoreItem.tap();
-      await expect(storyText).toHaveText(story);
-      await restartButton.tap();
-
-      // merging here
-
-      const newStory = await performInput();
-
-      await buttonMergeItem.tap();
-      await restartButton.tap();
-      await buttonRestoreItem.tap();
-      await expect(storyText).toHaveText(newStory);
-    });
-  });
-
-  // disabling this for now, due to some weird issues with latest builds
-  xdescribe('get / set / clear item delegate test', () => {
-    beforeAll(async () => {
-      await test_getSetClear.tap();
-      if (device.getPlatform() === 'android') {
-        // Not yet supported.
-        return;
-      }
-
-      await device.openURL({ url: 'rnc-asyncstorage://set-delegate' });
-    });
-
-    it('should store value with delegate', async () => {
-      if (device.getPlatform() === 'android') {
-        // Not yet supported.
-        return;
-      }
-
-      const storedNumberText = await element(by.id('storedNumber_text'));
-      const increaseByTenButton = await element(by.id('increaseByTen_button'));
-
-      await expect(storedNumberText).toHaveText('');
-
-      const tapTimes = Math.round(Math.random() * 9) + 1;
-
-      for (let i = 0; i < tapTimes; i++) {
-        await increaseByTenButton.tap();
-      }
-
-      await expect(storedNumberText).toHaveText(`${tapTimes * 10}`);
-      await restartButton.tap();
-
-      // The delegate will distinguish itself by always returning the stored value + 1000000
-      await expect(storedNumberText).toHaveText(`${tapTimes * 10 + 1000000}`);
-    });
-
-    it('should clear item with delegate', async () => {
-      if (device.getPlatform() === 'android') {
-        // Not yet supported.
-        return;
-      }
-
-      const storedNumberText = await element(by.id('storedNumber_text'));
-      const increaseByTenButton = await element(by.id('increaseByTen_button'));
-      const clearButton = await element(by.id('clear_button'));
-
-      await increaseByTenButton.tap();
-      await clearButton.tap();
-      await restartButton.tap();
-
-      // The delegate will distinguish itself by actually setting storing 1000000
-      // instead of clearing. It will also always return the stored value + 1000000.
-      await expect(storedNumberText).toHaveText('2000000');
-    });
-  });
-
-  describe('merge item delegate test', () => {
-    beforeAll(async () => {
-      await test_mergeItem.tap();
-      if (device.getPlatform() === 'android') {
-        // Not yet supported.
-        return;
-      }
-
-      await element(by.id('setDelegate_button')).tap();
-    });
-
-    afterAll(async () => {
-      if (device.getPlatform() === 'android') {
-        // Not yet supported.
-        return;
-      }
-
-      await element(by.id('unsetDelegate_button')).tap();
-    });
-
-    it('should merge items with delegate', async () => {
-      if (device.getPlatform() === 'android') {
-        // Not yet supported.
-        return;
-      }
-
-      const buttonMergeItem = await element(by.id('mergeItem_button'));
-      const buttonRestoreItem = await element(by.id('restoreItem_button'));
-
-      const nameInput = await element(by.id('testInput-name'));
-      const ageInput = await element(by.id('testInput-age'));
-      const eyesInput = await element(by.id('testInput-eyes'));
-      const shoeInput = await element(by.id('testInput-shoe'));
-      const storyText = await element(by.id('storyTextView'));
-
-      let i = 0;
-      async function performInput() {
-        const name = i === 0 ? 'Jerry' : 'Sarah';
-        const age = i === 0 ? '21' : '23';
-        const eyesColor = i === 0 ? 'blue' : 'green';
-        const shoeSize = i === 0 ? '9' : '10';
-        i += 1;
-
-        await nameInput.clearText();
-        await nameInput.typeText(name);
-        await dismissKeyboard();
-
-        await ageInput.clearText();
-        await ageInput.typeText(age);
-        await dismissKeyboard();
-
-        await eyesInput.clearText();
-        await eyesInput.typeText(eyesColor);
-        await dismissKeyboard();
-
-        await shoeInput.clearText();
-        await shoeInput.typeText(shoeSize);
-        await dismissKeyboard();
-
-        return `${name} from delegate is ${age} from delegate, has ${eyesColor} eyes and shoe size of ${shoeSize}.`;
-      }
+    const testNames = Object.keys(tests);
+    for (const name of testNames) {
+      it(name, async () => {
+        await expect(element(by.id(`test:${name}`))).toHaveLabel('Pass');
+      });
+    }
 
-      const story = await performInput();
-      await buttonMergeItem.tap();
-      await restartButton.tap();
-      await buttonRestoreItem.tap();
-      await expect(storyText).toHaveText(story);
-    });
+    // Re-run tests with native delegate set
+    for (const currentName of testNames) {
+      const name = currentName + ' with delegate';
+      it(name, async () => {
+        const el = await element(by.id(`test:${name}`)).getAttributes();
+        if (el.label === "Skip") {
+          return;
+        }
+
+        await expect(element(by.id(`test:${name}`))).toHaveLabel('Pass');
+      });
+    }
   });
 });
diff --git a/example/examples/Basic.tsx b/example/examples/Basic.tsx
index 2b9354dd..f3ef0b70 100644
--- a/example/examples/Basic.tsx
+++ b/example/examples/Basic.tsx
@@ -266,4 +266,11 @@ const styles = StyleSheet.create({
   },
 });
 
-export default NextExample;
+export default {
+  title: 'Basic',
+  testId: 'basic',
+  description: 'Basic functionality test',
+  render() {
+    return <NextExample />;
+  },
+};
diff --git a/example/examples/Functional.tsx b/example/examples/Functional.tsx
new file mode 100644
index 00000000..a8e37421
--- /dev/null
+++ b/example/examples/Functional.tsx
@@ -0,0 +1,137 @@
+// @ts-ignore
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import React, { useEffect, useState } from 'react';
+import isEqual from 'lodash/isEqual';
+import {
+  NativeModules,
+  ScrollView,
+  StyleSheet,
+  Text,
+  View,
+} from 'react-native';
+import tests from "./tests";
+
+const SKIP_TEST = '51609ccd-8ca7-4559-a03a-273e237dba4f';
+
+function Functional(): JSX.Element {
+  const [results, setResults] = useState<[string, unknown, string?][]>([]);
+  useEffect(() => {
+    const results: [string, unknown, string?][] = [];
+    Promise.resolve()
+      .then(async () => {
+        for (const [name, test] of Object.entries(tests)) {
+          try {
+            const expected = await test(name);
+            const actual = await AsyncStorage.getItem(name);
+            results.push([name, expected, actual]);
+          } finally {
+            await AsyncStorage.removeItem(name);
+          }
+        }
+      })
+      .then(async () => {
+        const AsyncStorageTestSupport =
+          NativeModules['AsyncStorageTestSupport'];
+
+        for (const [currentName, test] of Object.entries(tests)) {
+          const name = currentName + ' with delegate';
+
+          if (!AsyncStorageTestSupport?.test_setDelegate) {
+            results.push([name, SKIP_TEST]);
+            continue;
+          }
+
+          const isNativeDelegateSet = await new Promise((resolve) => {
+            AsyncStorageTestSupport.test_setDelegate(resolve);
+          });
+          if (!isNativeDelegateSet) {
+            results.push([
+              name,
+              'Native delegate is set',
+              'Failed to set native delegate',
+            ]);
+            continue;
+          }
+
+          try {
+            const expected = await test(name);
+            const actual = await AsyncStorage.getItem(name);
+            results.push([name, expected, actual]);
+          } finally {
+            await AsyncStorage.removeItem(name);
+            await new Promise((resolve) => {
+              AsyncStorageTestSupport.test_unsetDelegate(resolve);
+            });
+          }
+        }
+      })
+      .then(() => setResults(results));
+  }, []);
+  return (
+    <ScrollView contentContainerStyle={{ flexGrow: 1 }}>
+      <View>
+        {results.map(([name, expected, actual]) => {
+          const testID = 'test:' + name;
+          if (expected === SKIP_TEST) {
+            return (
+              <View key={name} style={styles.skipped}>
+                <Text style={styles.testLabel}>{name}</Text>
+                <Text testID={testID}>Skip</Text>
+              </View>
+            );
+          }
+
+          const result =
+            typeof expected === 'string'
+              ? expected === actual
+              : isEqual(expected, actual ? JSON.parse(actual) : null);
+          return result ? (
+            <View key={name} style={styles.passed}>
+              <Text style={styles.testLabel}>{name}</Text>
+              <Text testID={testID}>Pass</Text>
+            </View>
+          ) : (
+            <View key={name} style={styles.failed}>
+              <Text style={styles.testLabel}>{name}</Text>
+              <View accessibilityLabel="Fail" testID={testID}>
+                <Text>{`Expected: ${JSON.stringify(expected)}`}</Text>
+                <Text>{`Actual: ${actual}`}</Text>
+              </View>
+            </View>
+          );
+        })}
+      </View>
+    </ScrollView>
+  );
+}
+
+const styles = StyleSheet.create({
+  failed: {
+    backgroundColor: '#e53935',
+    flex: 1,
+    padding: 4,
+  },
+  passed: {
+    flex: 1,
+    flexDirection: 'row',
+    padding: 4,
+  },
+  skipped: {
+    backgroundColor: '#ffeb3b',
+    flex: 1,
+    flexDirection: 'row',
+    padding: 4,
+  },
+  testLabel: {
+    flex: 1,
+  },
+});
+
+export default {
+  title: 'Functional',
+  testId: 'functional',
+  description: 'Functional tests',
+  render() {
+    return <Functional />;
+  },
+};
diff --git a/example/examples/GetSetClear.tsx b/example/examples/GetSetClear.tsx
index 3b6ba6ed..cfb23401 100644
--- a/example/examples/GetSetClear.tsx
+++ b/example/examples/GetSetClear.tsx
@@ -10,7 +10,7 @@ import AsyncStorage from '@react-native-async-storage/async-storage';
 import React from 'react';
 import { Button, StyleSheet, Text, View } from 'react-native';
 
-export default function GetSet() {
+function GetSet() {
   const [storedNumber, setStoredNumber] = React.useState('');
   const [needsRestart, setNeedsRestart] = React.useState(false);
 
@@ -66,3 +66,12 @@ const styles = StyleSheet.create({
 });
 
 export const STORAGE_KEY = 'random';
+
+export default {
+  title: 'Simple Get/Set value',
+  testId: 'get-set-clear',
+  description: 'Store and retrieve persisted data',
+  render() {
+    return <GetSet />;
+  },
+};
diff --git a/example/examples/MergeItem.tsx b/example/examples/MergeItem.tsx
index 2e5f70a2..88f7d3da 100644
--- a/example/examples/MergeItem.tsx
+++ b/example/examples/MergeItem.tsx
@@ -55,7 +55,7 @@ const INPUTS = [
   },
 ] as const;
 
-export default function Merge(): JSX.Element {
+function Merge(): JSX.Element {
   const [needRestart, setNeedRestart] = useState(false);
   const [name, setName] = useState('');
   const [age, setAge] = useState('');
@@ -220,3 +220,12 @@ const styles = StyleSheet.create({
     color: '#222',
   },
 });
+
+export default {
+  title: 'Merge item',
+  testId: 'merge-item',
+  description: 'Merge object with already stored data',
+  render() {
+    return <Merge />;
+  },
+};
diff --git a/example/examples/tests.ts b/example/examples/tests.ts
new file mode 100644
index 00000000..a7e3d39b
--- /dev/null
+++ b/example/examples/tests.ts
@@ -0,0 +1,46 @@
+import isEqual from 'lodash/isEqual';
+import AsyncStorage from '../../src/index';
+
+export default {
+  'Should store value in AsyncStorage': async (key: string) => {
+    let value = 0;
+    for (let i = 0; i < 42; i += 10) {
+      await AsyncStorage.setItem(key, i.toString());
+      value = i;
+    }
+    return value.toString();
+  },
+  'Should clear item': async (key: string) => {
+    const value = '42';
+    await AsyncStorage.setItem(key, value);
+    if ((await AsyncStorage.getItem(key)) !== value) {
+      return false;
+    }
+
+    await AsyncStorage.removeItem(key);
+    const actual = await AsyncStorage.getItem(key);
+    return actual === value ? false : null;
+  },
+  'Should merge items': async (key: string) => {
+    const initial = {
+      name: 'Jerry',
+      age: '21',
+      eyesColor: 'blue',
+      shoeSize: '9',
+    };
+    const edit = {
+      name: 'Sarah',
+      age: '23',
+      eyesColor: 'green',
+      shoeSize: '10',
+    };
+
+    await AsyncStorage.setItem(key, JSON.stringify(initial));
+    if (isEqual(await AsyncStorage.getItem(key), initial)) {
+      return false;
+    }
+
+    await AsyncStorage.mergeItem(key, JSON.stringify(edit));
+    return edit;
+  },
+};
diff --git a/example/ios/AsyncStorageExample/AsyncStorageDevSupport.m b/example/ios/AsyncStorageExample/AsyncStorageDevSupport.m
index ec49e844..48243b89 100644
--- a/example/ios/AsyncStorageExample/AsyncStorageDevSupport.m
+++ b/example/ios/AsyncStorageExample/AsyncStorageDevSupport.m
@@ -75,17 +75,7 @@ - (void)mergeValues:(NSArray<NSString *> *)values
         [NSJSONSerialization JSONObjectWithData:[values[0] dataUsingEncoding:NSUTF8StringEncoding]
                                         options:NSJSONReadingMutableContainers
                                           error:&error];
-    NSMutableDictionary *modified = [NSMutableDictionary dictionaryWithCapacity:dictionary.count];
-    for (NSString *key in dictionary) {
-        NSObject *value = dictionary[key];
-        if ([value isKindOfClass:[NSString class]]) {
-            modified[key] = [(NSString *)value stringByAppendingString:@" from delegate"];
-        } else {
-            modified[key] = value;
-        }
-    }
-
-    NSData *data = [NSJSONSerialization dataWithJSONObject:modified options:0 error:&error];
+    NSData *data = [NSJSONSerialization dataWithJSONObject:dictionary options:0 error:&error];
     NSString *str = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
     _memoryStorage[keys[0]] = str;
     completion(@[str]);
@@ -145,7 +135,7 @@ @implementation AsyncStorageTestSupport
 {
     RNCAsyncStorage *asyncStorage = RNCAsyncStorageGetInstance(_bridge);
     asyncStorage.delegate = _sharedInstance;
-    callback(@[]);
+    callback(@[@YES]);
 }
 
 // clang-format off
@@ -154,7 +144,7 @@ @implementation AsyncStorageTestSupport
 {
     RNCAsyncStorage *asyncStorage = RNCAsyncStorageGetInstance(_bridge);
     asyncStorage.delegate = nil;
-    callback(@[]);
+    callback(@[@YES]);
 }
 
 @end
diff --git a/package.json b/package.json
index 683b8b3b..ab8a1964 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
     "@react-native-community/eslint-config": "^3.0.0",
     "@semantic-release/changelog": "^6.0.0",
     "@semantic-release/git": "^10.0.0",
+    "@types/lodash": "^4.14.184",
     "@types/react": "^17.0.0",
     "@types/react-native": "^0.66.0",
     "concurrently": "^6.4.0",
@@ -82,6 +83,7 @@
     "expo": "^43.0.0",
     "jest": "^26.6.3",
     "jest-circus": "^26.6.1",
+    "lodash": "^4.17.21",
     "prettier": "^2.5.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index e7063a48..479b23e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2391,6 +2391,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
+"@types/lodash@^4.14.184":
+  version "4.14.184"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.184.tgz#23f96cd2a21a28e106dc24d825d4aa966de7a9fe"
+  integrity sha512-RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q==
+
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"

From 0dad216e5e39cb45ec57339f5b37792fcc752846 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Wed, 24 Aug 2022 22:27:25 +0200
Subject: [PATCH 2/4] Android needs explicit accessibility labels

---
 example/examples/Functional.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/examples/Functional.tsx b/example/examples/Functional.tsx
index a8e37421..42da6760 100644
--- a/example/examples/Functional.tsx
+++ b/example/examples/Functional.tsx
@@ -76,7 +76,7 @@ function Functional(): JSX.Element {
             return (
               <View key={name} style={styles.skipped}>
                 <Text style={styles.testLabel}>{name}</Text>
-                <Text testID={testID}>Skip</Text>
+                <Text accessibilityLabel="Skip" testID={testID}>Skip</Text>
               </View>
             );
           }
@@ -88,7 +88,7 @@ function Functional(): JSX.Element {
           return result ? (
             <View key={name} style={styles.passed}>
               <Text style={styles.testLabel}>{name}</Text>
-              <Text testID={testID}>Pass</Text>
+              <Text accessibilityLabel="Pass" testID={testID}>Pass</Text>
             </View>
           ) : (
             <View key={name} style={styles.failed}>

From 3dbcbfd8470e4fca546f131fe4696a492c7f3746 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Wed, 24 Aug 2022 22:43:57 +0200
Subject: [PATCH 3/4] fix macOS tests

---
 .../AsyncStorageExample_macOSUITests.m                    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/example/macos/AsyncStorageExample-macOSUITests/AsyncStorageExample_macOSUITests.m b/example/macos/AsyncStorageExample-macOSUITests/AsyncStorageExample_macOSUITests.m
index c006c052..b8acd318 100644
--- a/example/macos/AsyncStorageExample-macOSUITests/AsyncStorageExample_macOSUITests.m
+++ b/example/macos/AsyncStorageExample-macOSUITests/AsyncStorageExample_macOSUITests.m
@@ -36,10 +36,10 @@ - (void)setUp
     _restartButton = _window.otherElements[@"restart_button"].staticTexts.firstMatch;
     [self waitForExpectation:exists evaluatedWithObject:_restartButton timeout:5];
 
-    _getSetClearButton = _window.buttons[@"testType_getSetClear"].staticTexts.firstMatch;
+    _getSetClearButton = _window.buttons[@"get-set-clear"].staticTexts.firstMatch;
     [self waitForExpectation:exists evaluatedWithObject:_getSetClearButton timeout:5];
 
-    _mergeItemButton = _window.buttons[@"testType_mergeItem"].staticTexts.firstMatch;
+    _mergeItemButton = _window.buttons[@"merge-item"].staticTexts.firstMatch;
     [self waitForExpectation:exists evaluatedWithObject:_mergeItemButton timeout:5];
 
     [self setDelegate];
@@ -123,9 +123,7 @@ - (void)testMergeItemDelegate
     XCUIElement *mergeItemButton = _window.buttons[@"mergeItem_button"].staticTexts.firstMatch;
     XCUIElement *storyText = _window.staticTexts[@"storyTextView"];
 
-    NSString *story =
-        [self performInputWithFormat:
-                  @"%@ from delegate is %@ from delegate, has %@ eyes and shoe size of %@."];
+    NSString *story = [self performInputWithFormat:@"%@ is %@, has %@ eyes and shoe size of %@."];
     [mergeItemButton click];
     [_restartButton click];
     [restoreItemButton click];

From 4bb2951e2e518cd4da11605ebd3e468c32299626 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Fri, 26 Aug 2022 15:32:14 +0200
Subject: [PATCH 4/4] make it easier to add tests

---
 example/examples/Functional.tsx | 130 ++++++++++++++++++++++++--------
 example/examples/tests.ts       |  87 +++++++++++----------
 2 files changed, 146 insertions(+), 71 deletions(-)

diff --git a/example/examples/Functional.tsx b/example/examples/Functional.tsx
index 42da6760..007f021e 100644
--- a/example/examples/Functional.tsx
+++ b/example/examples/Functional.tsx
@@ -9,23 +9,86 @@ import {
   Text,
   View,
 } from 'react-native';
-import tests from "./tests";
+import type { TestStep, TestValue } from './tests';
+import tests from './tests';
 
 const SKIP_TEST = '51609ccd-8ca7-4559-a03a-273e237dba4f';
 
+type TestResult =
+  | typeof SKIP_TEST
+  | {
+      step: number;
+      expected: TestValue;
+      actual?: string | null;
+    };
+
+function compare(expected: TestValue, actual: string): boolean {
+  return typeof expected === 'string'
+    ? expected === actual
+    : isEqual(expected, JSON.parse(actual));
+}
+
+function stringify(value: unknown): string {
+  return typeof value === 'string' ? value : JSON.stringify(value);
+}
+
+async function executeStep(step: TestStep): Promise<void> {
+  switch (step.command) {
+    case 'merge': {
+      const { key, value, expected } = step;
+      await AsyncStorage.mergeItem(key, stringify(value));
+      const actual = await AsyncStorage.getItem(key);
+      if (!compare(expected || value, actual)) {
+        throw [expected || value, actual];
+      }
+      break;
+    }
+    case 'remove': {
+      const { key } = step;
+      await AsyncStorage.removeItem(key);
+      const actual = await AsyncStorage.getItem(key);
+      if (actual !== null) {
+        throw [null, actual];
+      }
+      break;
+    }
+    case 'set': {
+      const { key, value, expected } = step;
+      await AsyncStorage.setItem(key, stringify(value));
+      const actual = await AsyncStorage.getItem(key);
+      if (!compare(expected || value, actual)) {
+        throw [expected || value, actual];
+      }
+      break;
+    }
+  }
+}
+
+async function execute(steps: TestStep[]): Promise<void> {
+  const numSteps = steps.length;
+  for (let i = 0; i < numSteps; ++i) {
+    try {
+      await executeStep(steps[i]);
+    } catch ([expected, actual]) {
+      throw { step: i, expected, actual };
+    } finally {
+      await AsyncStorage.clear();
+    }
+  }
+}
+
 function Functional(): JSX.Element {
-  const [results, setResults] = useState<[string, unknown, string?][]>([]);
+  const [results, setResults] = useState<[string, TestResult?][]>([]);
   useEffect(() => {
-    const results: [string, unknown, string?][] = [];
+    const results: [string, TestResult?][] = [];
     Promise.resolve()
       .then(async () => {
         for (const [name, test] of Object.entries(tests)) {
           try {
-            const expected = await test(name);
-            const actual = await AsyncStorage.getItem(name);
-            results.push([name, expected, actual]);
-          } finally {
-            await AsyncStorage.removeItem(name);
+            await execute(test);
+            results.push([name, undefined]);
+          } catch (e: any) {
+            results.push([name, e]);
           }
         }
       })
@@ -47,18 +110,20 @@ function Functional(): JSX.Element {
           if (!isNativeDelegateSet) {
             results.push([
               name,
-              'Native delegate is set',
-              'Failed to set native delegate',
+              {
+                step: 0,
+                expected: 'Native delegate is set',
+                actual: 'Failed to set native delegate',
+              },
             ]);
             continue;
           }
 
           try {
-            const expected = await test(name);
-            const actual = await AsyncStorage.getItem(name);
-            results.push([name, expected, actual]);
-          } finally {
-            await AsyncStorage.removeItem(name);
+            await execute(test);
+            results.push([name, undefined]);
+          } catch (e: any) {
+            results.push([name, e]);
             await new Promise((resolve) => {
               AsyncStorageTestSupport.test_unsetDelegate(resolve);
             });
@@ -70,32 +135,37 @@ function Functional(): JSX.Element {
   return (
     <ScrollView contentContainerStyle={{ flexGrow: 1 }}>
       <View>
-        {results.map(([name, expected, actual]) => {
+        {results.map(([name, result]) => {
           const testID = 'test:' + name;
-          if (expected === SKIP_TEST) {
+          if (!result) {
+            return (
+              <View key={name} style={styles.passed}>
+                <Text style={styles.testLabel}>{name}</Text>
+                <Text accessibilityLabel="Pass" testID={testID}>
+                  Pass
+                </Text>
+              </View>
+            );
+          }
+
+          if (result === SKIP_TEST) {
             return (
               <View key={name} style={styles.skipped}>
                 <Text style={styles.testLabel}>{name}</Text>
-                <Text accessibilityLabel="Skip" testID={testID}>Skip</Text>
+                <Text accessibilityLabel="Skip" testID={testID}>
+                  Skip
+                </Text>
               </View>
             );
           }
 
-          const result =
-            typeof expected === 'string'
-              ? expected === actual
-              : isEqual(expected, actual ? JSON.parse(actual) : null);
-          return result ? (
-            <View key={name} style={styles.passed}>
-              <Text style={styles.testLabel}>{name}</Text>
-              <Text accessibilityLabel="Pass" testID={testID}>Pass</Text>
-            </View>
-          ) : (
+          return (
             <View key={name} style={styles.failed}>
               <Text style={styles.testLabel}>{name}</Text>
               <View accessibilityLabel="Fail" testID={testID}>
-                <Text>{`Expected: ${JSON.stringify(expected)}`}</Text>
-                <Text>{`Actual: ${actual}`}</Text>
+                <Text>{`Step: ${result.step + 1}`}</Text>
+                <Text>{`Expected: ${stringify(result.expected)}`}</Text>
+                <Text>{`Actual: ${result.actual}`}</Text>
               </View>
             </View>
           );
diff --git a/example/examples/tests.ts b/example/examples/tests.ts
index a7e3d39b..ed73cc2c 100644
--- a/example/examples/tests.ts
+++ b/example/examples/tests.ts
@@ -1,46 +1,51 @@
-import isEqual from 'lodash/isEqual';
-import AsyncStorage from '../../src/index';
+export type TestValue = string | Record<string, string>;
 
-export default {
-  'Should store value in AsyncStorage': async (key: string) => {
-    let value = 0;
-    for (let i = 0; i < 42; i += 10) {
-      await AsyncStorage.setItem(key, i.toString());
-      value = i;
+export type TestStep =
+  | {
+      command: 'merge' | 'set';
+      key: string;
+      value: TestValue;
+      expected?: TestValue | null;
     }
-    return value.toString();
-  },
-  'Should clear item': async (key: string) => {
-    const value = '42';
-    await AsyncStorage.setItem(key, value);
-    if ((await AsyncStorage.getItem(key)) !== value) {
-      return false;
-    }
-
-    await AsyncStorage.removeItem(key);
-    const actual = await AsyncStorage.getItem(key);
-    return actual === value ? false : null;
-  },
-  'Should merge items': async (key: string) => {
-    const initial = {
-      name: 'Jerry',
-      age: '21',
-      eyesColor: 'blue',
-      shoeSize: '9',
-    };
-    const edit = {
-      name: 'Sarah',
-      age: '23',
-      eyesColor: 'green',
-      shoeSize: '10',
+  | {
+      command: 'remove';
+      key: string;
     };
 
-    await AsyncStorage.setItem(key, JSON.stringify(initial));
-    if (isEqual(await AsyncStorage.getItem(key), initial)) {
-      return false;
-    }
-
-    await AsyncStorage.mergeItem(key, JSON.stringify(edit));
-    return edit;
-  },
+const tests: Record<string, TestStep[]> = {
+  'Should store value in AsyncStorage': [
+    { command: 'set', key: 'a', value: '0' },
+    { command: 'set', key: 'a', value: '10' },
+    { command: 'set', key: 'a', value: '20' },
+    { command: 'set', key: 'a', value: '30' },
+    { command: 'set', key: 'a', value: '40' },
+  ],
+  'Should clear item': [
+    { command: 'set', key: 'a', value: '42' },
+    { command: 'remove', key: 'a' },
+  ],
+  'Should merge items': [
+    {
+      command: 'set',
+      key: 'a',
+      value: {
+        name: 'Jerry',
+        age: '21',
+        eyesColor: 'blue',
+        shoeSize: '9',
+      },
+    },
+    {
+      command: 'merge',
+      key: 'a',
+      value: {
+        name: 'Sarah',
+        age: '23',
+        eyesColor: 'green',
+        shoeSize: '10',
+      },
+    },
+  ],
 };
+
+export default tests;