Merge branch 'master' of git.wanmeizhensuo.com:gengmeiios/GMPhobos into zx/phobosTest

Example/GMPhobos.xcodeproj/xcshareddata/xcschemes/GMPhobos-Example.xcscheme

@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -44,6 +43,16 @@
                </Test>
             </SkippedTests>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "63EFAB0D22658352005EEAC6"
+               BuildableName = "GMPhobos_ExampleTests.xctest"
+               BlueprintName = "GMPhobos_ExampleTests"
+               ReferencedContainer = "container:GMPhobos.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
@@ -61,7 +70,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Example/GMPhobos_ExampleTests/GMPhobos_ExampleTests.m

+//
+//  GMPhobos_ExampleTests.m
+//  GMPhobos_ExampleTests
+//
+//  Created by Jing on 2019/4/16.
+//  Copyright © 2019 licong. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+
+@interface GMPhobos_ExampleTests : XCTestCase
+
+@end
+
+@implementation GMPhobos_ExampleTests
+
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
+
+- (void)testExample {
+    // This is an example of a functional test case.
+    // Use XCTAssert and related functions to verify your tests produce the correct results.
+}
+
+- (void)testPerformanceExample {
+    // This is an example of a performance test case.
+    [self measureBlock:^{
+        // Put the code you want to measure the time of here.
+    }];
+}
+
+@end

Example/GMPhobos_ExampleTests/Info.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

Example/Tests/GMPhotoTest.m

@@ -27,13 +27,18 @@ NSString      *const MockCityId       = @"beijing";
 - (void)setUp {
     [super setUp];
     _client = [Phobos clientWithAppName:MockAppName channelId:MockChannelId];
+    _client.serverAPI = @"http://log.test.igengmei.com/log/collect";
+    [_client setLogEnabled:NO]; // 调试打Log模式，看情况开启
+    _client.signingType = PhobosSigningTypeDebug;
+    _client.userId = @"";
     [Phobos setSharedClient:_client];
 }
 
 - (void)tearDown {
     // Put teardown code here. This method is called after the invocation of each test method in the class.
     [super tearDown];
-    [GMCache removeObjectAtDucmentPathWithkey:PhobosCacheKey];
+    [GMCache removeObjectAtDocumentPathWithkey:PhobosCacheKey];
+    [GMCache removeObjectAtDocumentPathWithkey:PhobosTempCacheKey];
 }
 
 /**
@@ -45,7 +50,7 @@ NSString      *const MockCityId       = @"beijing";
     [_client setUserId:MockUserId];
     [_client setCurrentCityId:MockCityId];
     [Phobos track:MockEventId];
-    NSArray *array = [GMCache fetchObjectAtDucmentPathWithkey:PhobosCacheKey];
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
     XCTAssertTrue(array.count == 1, @"array is empty");
     NSDictionary *dict = [array objectAtIndex:0];
     [self verfiyDict:dict];
@@ -59,7 +64,7 @@ NSString      *const MockCityId       = @"beijing";
  */
 - (void)testTrackEventWithoutAttr{
     [Phobos track:MockEventId];
-    NSArray *array = [GMCache fetchObjectAtDucmentPathWithkey:PhobosCacheKey];
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
     XCTAssertTrue(array.count == 1, @"array is empty");
     NSDictionary *dict = [array objectAtIndex:0];
     [self verfiyDict:dict];
@@ -74,7 +79,7 @@ NSString      *const MockCityId       = @"beijing";
 - (void)testTrackEventWithAttr{
     NSDictionary *attr = @{@"attr":@"track_attr"};
     [Phobos track:MockEventId attributes:attr];
-    NSArray *array = [GMCache fetchObjectAtDucmentPathWithkey:PhobosCacheKey];
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
     XCTAssertTrue(array.count == 1, @"array is empty");
     NSDictionary *dict = [array objectAtIndex:0];
     [self verfiyDict:dict];
@@ -95,10 +100,175 @@ NSString      *const MockCityId       = @"beijing";
     // When
     [Phobos track:MockEventId attributes:attr sendNow:YES];
     // Then
-    NSArray *array = [GMCache fetchObjectAtDucmentPathWithkey:PhobosCacheKey];
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
     XCTAssertTrue(array.count == 0, @"array should be empty");
 }
 
+/**
+ *  @brief 测试立即发送带参数事件成功，不应该清除不立即发送的埋点
+ *
+ *  @since 1.1.4
+ */
+- (void)testTrackEventWithAttrAndSendNowDonotClearNormal {
+    // Given
+    NSDictionary *attr = @{@"attr":@"track_attr"};
+    NSDictionary *sendNowAttr = @{@"attr":@"track_attr_send_now"};
+    // When
+    [Phobos track:MockEventId attributes:attr sendNow:NO];
+    // When
+    [Phobos track:MockEventId attributes:sendNowAttr sendNow:YES];
+    
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count != 0, @"array shouldn't be empty");
+}
+
+/**
+ *  @brief 测试二次立即发送带参数事件成功，不应该重复发送上一条
+ *
+ *  @since 1.1.4
+ */
+- (void)testTrackEventWithDoubleAttrAndSendNow {
+    NSDictionary *attr = @{@"attr":@"track_attr"};
+    [Phobos track:MockEventId attributes:attr sendNow:YES];
+    
+    // 因为实时埋点是异步删除，所以这个位置暂时延时取数据，待优化 TODO
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosTempCacheKey];
+        XCTAssertTrue(array.count == 0, @"array shouldn't be empty");
+        [Phobos track:MockEventId attributes:attr sendNow:YES];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosTempCacheKey];
+            XCTAssertTrue(array.count == 0, @"array shouldn't be empty");
+            [Phobos track:MockEventId attributes:attr sendNow:YES];
+            
+            array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+            XCTAssertTrue(array.count == 0, @"array shouldn't be empty");
+        });
+    });
+}
+
+/**
+  *  @brief 测试不立即发送带参数事件成功后，数据会被清除
+  *
+  *  @since 1.1.4
+  */
+- (void)testTrackEventWithDoubleAttrAndNoSendNow {
+    NSDictionary *attr = @{@"attr":@"track_attr"};
+    //
+    [Phobos track:MockEventId attributes:attr];
+    
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 1, @"array shouldn't be empty");
+
+    // PhobosCacheKey超过50条数据会自动上报，模拟此情况
+    for (int i = 0; i < 50; i++) {
+        [Phobos track:MockEventId attributes:attr];
+    }
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 0, @"array shouldn't be empty");
+    [Phobos track:MockEventId attributes:attr];
+    
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 1, @"array shouldn't be empty");
+}
+
+/**
+ *  @brief 测试不实时和实时穿插 1
+ *
+ *  @since 1.1.4
+ */
+- (void)testTrackEventWithSendNowAndNoSendNowOne {
+    NSDictionary *attr = @{@"attr":@"track_attr"};
+    NSDictionary *sendNowAttr = @{@"attr":@"track_attr_send_now"};
+    
+    for (int i = 0; i < 30; i++) {
+        [Phobos track:MockEventId attributes:attr];
+    }
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 30, @"array shouldn't be empty");
+    
+    // PhobosCacheKey超过50条数据会自动上报，模拟此情况
+    [Phobos track:MockEventId attributes:sendNowAttr sendNow:YES];
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 30, @"array shouldn't be empty");
+    
+    
+    [Phobos track:MockEventId attributes:sendNowAttr sendNow:YES];
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 30, @"array shouldn't be empty");
+    
+    
+    [Phobos track:MockEventId attributes:sendNowAttr sendNow:YES];
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 30, @"array shouldn't be empty");
+    
+    
+    [Phobos track:MockEventId attributes:attr];
+    
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 31, @"array shouldn't be empty");
+}
+
+/**
+ *  @brief 测试不实时和实时穿插 2
+ *
+ *  @since 1.1.4
+ */
+- (void)testTrackEventWithSendNowAndNoSendNowTwo {
+    NSDictionary *attr = @{@"attr":@"track_attr"};
+    NSDictionary *sendNowAttr = @{@"attr":@"track_attr_send_now"};
+    
+    [Phobos track:MockEventId attributes:sendNowAttr sendNow:YES];
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 0, @"array shouldn't be empty");
+    
+    [Phobos track:MockEventId attributes:attr];
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 1, @"array shouldn't be empty");
+    
+    [Phobos track:MockEventId attributes:attr];
+    
+    [Phobos track:MockEventId attributes:sendNowAttr sendNow:YES];
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 2, @"array shouldn't be empty");
+    
+    
+    [Phobos track:MockEventId attributes:sendNowAttr sendNow:YES];
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 2, @"array shouldn't be empty");
+    
+    
+    [Phobos track:MockEventId attributes:attr];
+    
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 3, @"array shouldn't be empty");
+}
+
+/**
+ *  @brief 测试不实时和实时穿插 3
+ *
+ *  @since 1.1.4
+ */
+- (void)testTrackEventWithSendNowAndNoSendNowThree {
+    NSDictionary *attr = @{@"attr":@"track_attr"};
+    //
+    [Phobos track:MockEventId attributes:attr];
+    
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 1, @"array shouldn't be empty");
+    
+    // PhobosCacheKey超过50条数据会自动上报，模拟此情况
+    for (int i = 0; i < 50; i++) {
+        [Phobos track:MockEventId attributes:attr];
+    }
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 0, @"array shouldn't be empty");
+    [Phobos track:MockEventId attributes:attr];
+    
+    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    XCTAssertTrue(array.count == 1, @"array shouldn't be empty");
+}
+
 - (void)verfiyDict:(NSDictionary *)dict{
     NSArray *keys = [dict allKeys];
     XCTAssertTrue([keys containsObject:@"type"], @"Missing type");
@@ -139,7 +309,7 @@ NSString      *const MockCityId       = @"beijing";
     [controller viewWillAppear:true];
     [controller viewWillDisappear:true];
     [self paramUnNilCheck];
-    NSArray *array = [GMCache fetchObjectAtDucmentPathWithkey:PhobosCacheKey];
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
     XCTAssertTrue(array.count != 0, @"PhobosCacheKey 下面应该有数据");
 
     NSDictionary *dic = array[0][@"params"];
@@ -153,7 +323,7 @@ NSString      *const MockCityId       = @"beijing";
 }
 
 - (void)paramUnNilCheck {
-    NSArray *array = [GMCache fetchObjectAtDucmentPathWithkey:PhobosCacheKey];
+    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
     XCTAssertTrue(array.count != 0, @"PhobosCacheKey 下面应该有数据");
 
     NSDictionary *dic = array[0][@"params"];

GMPhobos.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "GMPhobos"
-  s.version          = "1.1.2"
+  s.version          = "1.1.4"
   s.summary          = "GM statistic data sdk"
 
   s.description      = <<-DESC

GMPhobos/Classes/Phobos.m

@@ -569,7 +569,9 @@ static NSString *sdkVersion = @"110";
         //2.把缓存区的数据发送给服务器
         [self sendArray];
         //3.把原有的数据删除
-        [GMCache removeObjectAtDocumentPathWithkey:PhobosCacheKey];
+        if (clean) {
+            [GMCache removeObjectAtDocumentPathWithkey:PhobosCacheKey];
+        }
     }
     @catch (NSException *exception) {
         phobosLog(exception);

fastlane/report.xml

@@ -5,57 +5,57 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="00: Verifying fastlane version" time="0.007838">
+      <testcase classname="fastlane.lanes" name="00: Verifying fastlane version" time="0.007052">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.001584">
+      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.001408">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="02: git_pull" time="1.00925">
+      <testcase classname="fastlane.lanes" name="02: git_pull" time="1.021717">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="03: pod_repo_update" time="1.074785">
+      <testcase classname="fastlane.lanes" name="03: pod_repo_update" time="1.155085">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="04: pod_lib_lint" time="8.891135">
+      <testcase classname="fastlane.lanes" name="04: pod_lib_lint" time="39.406002">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="05: version_bump_podspec" time="0.003002">
+      <testcase classname="fastlane.lanes" name="05: version_bump_podspec" time="0.003062">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="06: git_commit_all" time="0.020952">
+      <testcase classname="fastlane.lanes" name="06: git_commit_all" time="0.020985">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="07: add_git_tag" time="0.012407">
+      <testcase classname="fastlane.lanes" name="07: add_git_tag" time="0.013462">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="08: push_to_git_remote" time="0.891278">
+      <testcase classname="fastlane.lanes" name="08: push_to_git_remote" time="0.912066">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="09: pod_push" time="9.80237">
+      <testcase classname="fastlane.lanes" name="09: pod_push" time="10.151093">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="10: pod_repo_update" time="0.95132">
+      <testcase classname="fastlane.lanes" name="10: pod_repo_update" time="0.938345">
         
       </testcase>