Rewrite tests to ensure calls reach the delegate

Author: tido64

example/e2e/asyncstorage.e2e.js

@@ -155,13 +155,21 @@ describe('Async Storage', () => {
 
   describe('get / set / clear item delegate test', () => {
     beforeAll(async () => {
-      if (device.getPlatform() === 'ios') {
-        await device.openURL({url: 'rnc-asyncstorage://set-delegate'});
-      }
       await test_getSetClear.tap();
+      if (device.getPlatform() === 'android') {
+        // Not yet supported.
+        return;
+      }
+
+      await device.openURL({url: 'rnc-asyncstorage://set-delegate'});
     });
 
-    it('should store value in async storage', async () => {
+    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'));
 
@@ -175,18 +183,28 @@ describe('Async Storage', () => {
 
       await expect(storedNumberText).toHaveText(`${tapTimes * 10}`);
       await restartButton.tap();
-      await expect(storedNumberText).toHaveText(`${tapTimes * 10}`);
+
+      // The delegate will distinguish itself by always returning the stored value + 1000000
+      await expect(storedNumberText).toHaveText(`${tapTimes * 10 + 1000000}`);
     });
 
-    it('should clear item', async () => {
+    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();
-      await expect(storedNumberText).toHaveText('');
+
+      // 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');
     });
   });
 
@@ -198,22 +216,61 @@ describe('Async Storage', () => {
       await test_mergeItem.tap();
     });
 
-    it('should crash when merging items in async storage', async () => {
+    it('should merge items with delegate', async () => {
       if (device.getPlatform() === 'android') {
         // Not yet supported.
         return;
       }
 
       const buttonMergeItem = await element(by.id('mergeItem_button'));
-      try {
-        await buttonMergeItem.tap();
-
-        // Not quite sure why ESLint thinks Jest hasn't defined fail().
-        // eslint-disable-next-line no-undef
-        fail();
-      } catch {
-        // Expected
+      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'));
+
+      const isAndroid = device.getPlatform() === 'android';
+
+      async function performInput() {
+        const name = Math.random() > 0.5 ? 'Jerry' : 'Sarah';
+        const age = Math.random() > 0.5 ? '21' : '23';
+        const eyesColor = Math.random() > 0.5 ? 'blue' : 'green';
+        const shoeSize = Math.random() > 0.5 ? '9' : '10';
+
+        if (!isAndroid) {
+          await eyesInput.tap();
+        }
+        await nameInput.typeText(name);
+        await closeKeyboard.tap();
+
+        if (!isAndroid) {
+          await eyesInput.tap();
+        }
+        await ageInput.typeText(age);
+        await closeKeyboard.tap();
+
+        if (!isAndroid) {
+          await eyesInput.tap();
+        }
+        await eyesInput.typeText(eyesColor);
+        await closeKeyboard.tap();
+
+        if (!isAndroid) {
+          await eyesInput.tap();
+        }
+        await shoeInput.typeText(shoeSize);
+        await closeKeyboard.tap();
+
+        return `${name} from delegate is ${age} from delegate, has ${eyesColor} eyes and shoe size of ${shoeSize}.`;
       }
+
+      const story = await performInput();
+      await buttonMergeItem.tap();
+      await restartButton.tap();
+      await buttonRestoreItem.tap();
+      expect(storyText).toHaveText(story);
     });
   });
 });

example/ios/AsyncStorageExample.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
 		196F5D682254C1530035A6D3 /* AppDelegate+RNCAsyncStorageDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 196F5D672254C1530035A6D3 /* AppDelegate+RNCAsyncStorageDelegate.m */; };
+		19C469542256303E00CA1332 /* RNCTestAsyncStorageDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 19C469532256303E00CA1332 /* RNCTestAsyncStorageDelegate.m */; };
 		3D82E3B72248BD39001F5D1A /* libRNCAsyncStorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DC5398C220F2C940035D3A3 /* libRNCAsyncStorage.a */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
@@ -323,6 +324,8 @@
 		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
 		196F5D672254C1530035A6D3 /* AppDelegate+RNCAsyncStorageDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "AppDelegate+RNCAsyncStorageDelegate.m"; path = "AsyncStorageExample/AppDelegate+RNCAsyncStorageDelegate.m"; sourceTree = "<group>"; };
 		196F5D8E2254C2C90035A6D3 /* AppDelegate+RNCAsyncStorageDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "AppDelegate+RNCAsyncStorageDelegate.h"; path = "AsyncStorageExample/AppDelegate+RNCAsyncStorageDelegate.h"; sourceTree = "<group>"; };
+		19C4692D22562FD400CA1332 /* RNCTestAsyncStorageDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNCTestAsyncStorageDelegate.h; path = AsyncStorageExample/RNCTestAsyncStorageDelegate.h; sourceTree = "<group>"; };
+		19C469532256303E00CA1332 /* RNCTestAsyncStorageDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNCTestAsyncStorageDelegate.m; path = AsyncStorageExample/RNCTestAsyncStorageDelegate.m; sourceTree = "<group>"; };
 		2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3DC5395A220F2C940035D3A3 /* RNCAsyncStorage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNCAsyncStorage.xcodeproj; path = ../../ios/RNCAsyncStorage.xcodeproj; sourceTree = "<group>"; };
 		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
@@ -428,6 +431,8 @@
 				13B07FB01A68108700A75B9A /* AppDelegate.m */,
 				196F5D8E2254C2C90035A6D3 /* AppDelegate+RNCAsyncStorageDelegate.h */,
 				196F5D672254C1530035A6D3 /* AppDelegate+RNCAsyncStorageDelegate.m */,
+				19C4692D22562FD400CA1332 /* RNCTestAsyncStorageDelegate.h */,
+				19C469532256303E00CA1332 /* RNCTestAsyncStorageDelegate.m */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
@@ -961,6 +966,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
+				19C469542256303E00CA1332 /* RNCTestAsyncStorageDelegate.m in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
 				196F5D682254C1530035A6D3 /* AppDelegate+RNCAsyncStorageDelegate.m in Sources */,
 			);

example/ios/AsyncStorageExample/AppDelegate.m

@@ -8,6 +8,7 @@
 #import "AppDelegate.h"
 
 #import "AppDelegate+RNCAsyncStorageDelegate.h"
+#import "RNCTestAsyncStorageDelegate.h"
 
 #import <RNCAsyncStorage/RNCAsyncStorage.h>
 #import <React/RCTBundleURLProvider.h>
@@ -16,6 +17,7 @@
 
 @implementation AppDelegate {
   __weak RCTBridge *_bridge;
+  RNCTestAsyncStorageDelegate *_testDelegate;
 }
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
@@ -81,8 +83,11 @@ - (BOOL)application:(UIApplication *)app
   }
 
   if ([url.host isEqualToString:@"set-delegate"]) {
+    if (_testDelegate == nil) {
+      _testDelegate = [RNCTestAsyncStorageDelegate new];
+    }
     RNCAsyncStorage *asyncStorage = [_bridge moduleForClass:[RNCAsyncStorage class]];
-    asyncStorage.delegate = self;
+    asyncStorage.delegate = _testDelegate;
   } else if ([url.host isEqualToString:@"unset-delegate"]) {
     RNCAsyncStorage *asyncStorage = [_bridge moduleForClass:[RNCAsyncStorage class]];
     asyncStorage.delegate = nil;

example/ios/AsyncStorageExample/RNCTestAsyncStorageDelegate.h

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <RNCAsyncStorage/RNCAsyncStorageDelegate.h>
+
+/*!
+ * Implementation of |RNCAsyncStorageDelegate| used for E2E testing purposes only.
+ */
+@interface RNCTestAsyncStorageDelegate : NSObject <RNCAsyncStorageDelegate>
+@end

example/ios/AsyncStorageExample/RNCTestAsyncStorageDelegate.m

@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RNCTestAsyncStorageDelegate.h"
+
+const NSInteger RNCTestAsyncStorageExtraValue = 1000000;
+
+NSString *RNCTestAddExtraValue(NSString *value)
+{
+  NSInteger i = [value integerValue];
+  if (i == 0) {
+    return value;
+  }
+  return [NSString stringWithFormat:@"%ld", (long)i + RNCTestAsyncStorageExtraValue];
+}
+
+NSString *RNCTestRemoveExtraValue(NSString *value)
+{
+  NSInteger i = [value integerValue];
+  if (i > RNCTestAsyncStorageExtraValue) {
+    i -= RNCTestAsyncStorageExtraValue;
+  }
+  return [NSString stringWithFormat:@"%ld", (long)i];
+}
+
+@implementation RNCTestAsyncStorageDelegate {
+  NSMutableDictionary<NSString *, NSString *> *_memoryStorage;
+}
+
+- (instancetype)init
+{
+  if (self = [super init]) {
+    _memoryStorage = [NSMutableDictionary dictionary];
+  }
+  return self;
+}
+
+- (void)allKeys:(RNCAsyncStorageResultCallback)completion
+{
+  completion(_memoryStorage.allKeys);
+}
+
+- (void)mergeValues:(nonnull NSArray<NSString *> *)values
+            forKeys:(nonnull NSArray<NSString *> *)keys
+         completion:(nonnull RNCAsyncStorageResultCallback)completion
+{
+  NSError *error = nil;
+  NSDictionary *dictionary =
+      [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];
+  NSString *str = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+  _memoryStorage[keys[0]] = str;
+  completion(@[str]);
+}
+
+- (void)removeAllValues:(nonnull RNCAsyncStorageCompletion)completion
+{
+  [_memoryStorage removeAllObjects];
+  completion(nil);
+}
+
+- (void)removeValuesForKeys:(nonnull NSArray<NSString *> *)keys
+                 completion:(nonnull RNCAsyncStorageResultCallback)completion
+{
+  for (NSString *key in keys) {
+    [_memoryStorage
+        setObject:[NSString stringWithFormat:@"%ld", (long)RNCTestAsyncStorageExtraValue]
+           forKey:key];
+  }
+  completion(@[]);
+}
+
+- (void)setValues:(nonnull NSArray<NSString *> *)values
+          forKeys:(nonnull NSArray<NSString *> *)keys
+       completion:(nonnull RNCAsyncStorageResultCallback)completion
+{
+  for (NSUInteger i = 0; i < values.count; ++i) {
+    NSString *value = values[i];
+    NSString *key = keys[i];
+    [_memoryStorage setObject:RNCTestRemoveExtraValue(value) forKey:key];
+  }
+  completion(@[]);
+}
+
+- (void)valuesForKeys:(nonnull NSArray<NSString *> *)keys
+           completion:(nonnull RNCAsyncStorageResultCallback)completion
+{
+  NSMutableArray *values = [NSMutableArray arrayWithCapacity:keys.count];
+  for (NSString *key in keys) {
+    NSString *value = _memoryStorage[key];
+    [values addObject:value == nil ? [NSNull null] : RNCTestAddExtraValue(value)];
+  }
+  completion(values);
+}
+
+@end