fixed up regression tessts for release

roznet · Mar 13, 2022 · eacc76f · eacc76f
1 parent b1f068a
commit eacc76f
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 7 deletions.
diff --git a/ConnectStats/src/GCHistoryFieldSummaryStats.h b/ConnectStats/src/GCHistoryFieldSummaryStats.h
@@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
                                               activityTypeSelection:(nullable GCActivityTypeSelection*)typeSelection
                                          referenceDate:(nullable NSDate*)refOrNil
                                             ignoreMode:(gcIgnoreMode)ignoreMode;
-+(GCHistoryFieldSummaryStats*)fieldStatsWithHealthMeasures:(NSArray*)measures;
++(GCHistoryFieldSummaryStats*)fieldSummaryStatsWithHealthMeasures:(NSArray<GCHealthMeasure*>*)measures;
 -(void)addHealthMeasures:(NSArray<GCHealthMeasure*>*)measures referenceDate:(nullable NSDate*)refOrNil;
 
 -(GCHistoryFieldSummaryDataHolder*)dataForField:(GCField*)aField;

diff --git a/ConnectStats/src/GCHistoryFieldSummaryStats.m b/ConnectStats/src/GCHistoryFieldSummaryStats.m
@@ -134,7 +134,7 @@ +(GCHistoryFieldSummaryStats*)fieldSummaryStatsWithActivities:(NSArray<GCActivit
     return rv;
 }
 
-+(GCHistoryFieldSummaryStats*)fieldStatsWithHealthMeasures:(NSArray*)measures{
++(GCHistoryFieldSummaryStats*)fieldSummaryStatsWithHealthMeasures:(NSArray*)measures{
     GCHistoryFieldSummaryStats * rv = [[[GCHistoryFieldSummaryStats alloc] init] autorelease];
     if (rv) {
         rv.fieldData = [NSMutableDictionary dictionaryWithCapacity:30];

diff --git a/ConnectStatsTests/GCTestAggregatedStats.swift b/ConnectStatsTests/GCTestAggregatedStats.swift
@@ -223,7 +223,7 @@ class GCTestAggregatedStats: XCTestCase {
         let performance = RZPerformance()
         performance.reset()
 
-        let fieldsdata = GCHistoryFieldSummaryStats.fieldStats(withActivities: activities, activityTypeSelection: nil, referenceDate: nil, ignoreMode: gcIgnoreMode.activityFocus)
+        let fieldsdata = GCHistoryFieldSummaryStats(activities: activities, activityTypeSelection: nil, referenceDate: nil, ignoreMode: gcIgnoreMode.activityFocus)
 
         if let basedate = activities.first?.date {
             let indexes : Set<Index> = [

diff --git a/connectstatstestapp/ConnectStatsTestApp-Bridging-Header.h b/connectstatstestapp/ConnectStatsTestApp-Bridging-Header.h
@@ -37,6 +37,7 @@
 
 #import "GCHistoryFieldSummaryDataHolder.h"
 #import "GCHistoryFieldSummaryStats.h"
+#import "GCFieldsForCategory.h"
 
 #import "GCTestAppGlobal.h"
 #import "GCGarminLoginSSORequest.h"

diff --git a/...Test/checkGridCellSnapshot_5881498219 running SumEnergy Detail New Style@2x.png b/...Test/checkGridCellSnapshot_5881498219 running SumEnergy Detail New Style@2x.png
diff --git a/...Test/checkGridCellSnapshot_5881498219 running SumEnergy Detail New Style@3x.png b/...Test/checkGridCellSnapshot_5881498219 running SumEnergy Detail New Style@3x.png
diff --git a/...mages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@2x.png b/...mages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@2x.png
diff --git a/...mages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@3x.png b/...mages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@3x.png
diff --git a/...ges/GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs@2x.png b/...ges/GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs@2x.png
diff --git a/...ges/GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs@3x.png b/...ges/GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs@3x.png
diff --git a/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[1]@2x.png b/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[1]@2x.png
diff --git a/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[1]@3x.png b/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[1]@3x.png
diff --git a/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[2]@2x.png b/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[2]@2x.png
diff --git a/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[2]@3x.png b/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[2]@3x.png
diff --git a/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[3]@2x.png b/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[3]@2x.png
diff --git a/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[3]@3x.png b/.../GCTestUIUnitTest/checkSimpleGraphSnapshot_sample15_HistDerivedGraphs[3]@3x.png
diff --git a/connectstatstestapp/src/GCAppDelegate.h b/connectstatstestapp/src/GCAppDelegate.h
@@ -33,7 +33,7 @@
 #import "GCHealthOrganizer.h"
 #import "GCDerivedOrganizer.h"
 #import "GCTestServicesViewController.h"
-
+#import "GCAppActionDelegate.h"
 
 @interface GCAppDelegate : UIResponder <UIApplicationDelegate>
 
@@ -50,6 +50,7 @@
 @property (nonatomic, retain) GCAppProfiles * profile;
 @property (nonatomic, retain) GCHealthOrganizer * health;
 @property (nonatomic, retain) GCDerivedOrganizer * derived;
+@property (nonatomic, readonly) NSObject<GCAppActionDelegate>*actionDelegate;
 
 -(void)setupEmptyState:(NSString*)name withSettingsName:(NSString*)settingName;
 -(void)setupEmptyState:(NSString*)name;

diff --git a/connectstatstestapp/src/GCAppDelegate.m b/connectstatstestapp/src/GCAppDelegate.m
@@ -390,4 +390,8 @@ -(void)versionSummary{
     RZLog(RZLogInfo,@"Version %@", [[NSBundle mainBundle] infoDictionary][@"CFBundleVersion"]);
 }
 
+- (NSObject<UIApplicationDelegate> *)actionDelegate{
+    return nil;
+}
+
 @end
diff --git a/connectstatstestapp/src/GCTestUISamples.m b/connectstatstestapp/src/GCTestUISamples.m
@@ -46,7 +46,7 @@
 #import "GCConnectStatsRequestFitFile.h"
 #import "GCGarminActivityTrack13Request.h"
 #import "GCGarminRequestActivityReload.h"
-#import "GCStatsDerivedAnalysisHistory.h"
+#import "GCStatsDerivedHistory.h"
 #import "GCTestAppGlobal.h"
 #import "GCActivitiesOrganizer.h"
 #import "ConnectStats-Swift.h"
@@ -682,10 +682,9 @@ -(GCSimpleGraphCachedDataSource*)sample14_SimpleGradientFillPlot{
 
     NSMutableArray * rv = [NSMutableArray array];
 
-    GCStatsMultiFieldConfig * fieldConfig = [GCStatsMultiFieldConfig fieldListConfigFrom:nil];
     GCStatsDerivedHistoryConfig * derivedAnalysisConfig = [GCStatsDerivedHistoryConfig configForActivityType:GC_TYPE_RUNNING];;
 
-    GCStatsDerivedAnalysisHistory * config = [GCStatsDerivedAnalysisHistory analysisWith:fieldConfig and:derivedAnalysisConfig];
+    GCStatsDerivedHistory * config = [GCStatsDerivedHistory analysisWith:derivedAnalysisConfig];
     config.mode = gcDerivedHistModeAbsolute;
     config.longTermSmoothing = gcDerivedHistSmoothingMovingAverage;
     config.shortTermSmoothing = gcDerivedHistSmoothingMovingAverage;