Updated functionality and tests of getting local data

Joris Janssen · Joris Janssen · commit e5c40d450193 · 2015-01-08T14:38:07.000+01:00
diff --git a/Sense Library Tests/CSStorageTest.m b/Sense Library Tests/CSStorageTest.m
@@ -0,0 +1,82 @@
+//
+//  CSStorageTest.m
+//  SensePlatform
+//
+//  Created by Joris Janssen on 07/01/15.
+//
+//
+
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+#import "CSSensePlatform.h"
+#import "CSSensorStore.h"
+#import "CSStorage.h"
+
+
+
+@interface CSStorageTest : XCTestCase
+
+@end
+
+@implementation CSStorageTest {
+    CSStorage* storage;
+    NSDate* startDate;
+    NSString* sensorName;
+}
+
+- (void)setUp {
+    [super setUp];
+
+    NSString *rootPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
+    NSString* dbPath =[rootPath stringByAppendingPathComponent:@"data.db"];
+    
+    storage = [[CSStorage alloc] initWithPath:dbPath];
+    
+    startDate = [NSDate date];
+    sensorName = @"testSensor";
+    
+    //put one datapoint in the database
+    [storage storeSensor:sensorName description:@"testDescription" deviceType:@"testDeviceType" device:@"testDevice" dataType:@"testDataType" value:@"somevalue" timestamp:[startDate timeIntervalSince1970]];
+
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+    [super tearDown];
+}
+
+/**
+ * Tests the function for getting data in CSStorage
+ */
+- (void)testSensorDataPointsFromId {
+    NSArray* result = [storage getSensorDataPointsFromId:0 limit:5];
+//  NSLog(@"Number of rows is %i", result.count);
+    XCTAssertGreaterThan(result.count, 0, @"No data found in sensordata store!");
+    XCTAssertEqual(result.count, 1, @"Not one row found in sensordata store although only one point should have been added!");
+}
+
+/**
+ * Tests the function for getting data from a sensor getDataFromSensor in CSStorage
+ */
+- (void) testGetDataFromSensor {
+
+    NSDate* endDate = [startDate dateByAddingTimeInterval: 2.0];
+    
+    NSArray* result = [storage getDataFromSensor:sensorName from:startDate to:endDate];
+    XCTAssertGreaterThan(result.count, 0, @"No data found in sensordata store!");
+    XCTAssertEqual(result.count, 1, @"Not one row found in sensordata store although only one point should have been added!");
+    
+    //this time we expect no data points because we use a non existing sensor name
+    result = [storage getDataFromSensor:@"nonExistingSensorName" from:startDate to:endDate];
+    XCTAssertEqual(result.count, 0, @"Data found in sensordata store despite using non existing sensor name");
+    
+    //shifting the interval
+    startDate = endDate;
+    endDate = [startDate dateByAddingTimeInterval: 2.0];
+    
+    // this time we expect no datapoints because they do not fit in the correct time interval
+    result = [storage getDataFromSensor:sensorName from:startDate to:endDate];
+    XCTAssertEqual(result.count, 0, @"Data found in sensordata store despite using incorrect time interval");
+}
+
+@end
diff --git a/Sense Library Tests/CSStorageTests.m b/Sense Library Tests/CSStorageTests.m
diff --git a/Sense Library Tests/Sense_Library_Tests.m b/Sense Library Tests/Sense_Library_Tests.m
@@ -25,7 +25,8 @@ - (void)tearDown {
     [super tearDown];
 }
 
-- (void)testExample {
+- (void)testStoreData {
+    
     // This is an example of a functional test case.
     XCTAssert(YES, @"Pass");
 }
diff --git a/SensePlatform.xcodeproj/project.pbxproj b/SensePlatform.xcodeproj/project.pbxproj
@@ -110,9 +110,18 @@
 		3EE091ED18FD597300A04ED4 /* CSSensorIdKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EE091EC18FD597300A04ED4 /* CSSensorIdKey.m */; };
 		3EF47FBA19093D3E00104D69 /* NSData+GZIP.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EF47FB919093D3E00104D69 /* NSData+GZIP.m */; };
 		A96D6ECF1A5C49FF00554BBC /* Sense_Library_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = A96D6ECE1A5C49FF00554BBC /* Sense_Library_Tests.m */; };
-		A96D6ED01A5C49FF00554BBC /* libSensePlatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E820D6A15D40AB50001A3EC /* libSensePlatform.a */; };
-		A96D6ED71A5C4B2500554BBC /* CSStorageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A96D6ED61A5C4B2500554BBC /* CSStorageTests.m */; };
-		A96D6ED81A5C4B2500554BBC /* CSStorageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A96D6ED61A5C4B2500554BBC /* CSStorageTests.m */; };
+		A99F99CF1A5D16D300D6CB76 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E148BD0160A18DC0010A0D1 /* UIKit.framework */; };
+		A99F99D41A5D18B100D6CB76 /* CSStorageTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A99F99D31A5D18B100D6CB76 /* CSStorageTest.m */; };
+		A99F99D51A5D8A5D00D6CB76 /* libSensePlatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E820D6A15D40AB50001A3EC /* libSensePlatform.a */; };
+		A99F99D61A5D8B7800D6CB76 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E513F4F18F7DDE60008415A /* libsqlite3.dylib */; };
+		A99F99D91A5D8C2400D6CB76 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E9C157D15D574D300F520D0 /* CoreAudio.framework */; };
+		A99F99DA1A5D8C2D00D6CB76 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E9C158315D574E700F520D0 /* CoreLocation.framework */; };
+		A99F99DB1A5D8C3600D6CB76 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E9C158115D574E100F520D0 /* CoreMotion.framework */; };
+		A99F99DC1A5D8C4300D6CB76 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E9C157F15D574DB00F520D0 /* AVFoundation.framework */; };
+		A99F99DD1A5D8C4D00D6CB76 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E9C157B15D574C300F520D0 /* AudioToolbox.framework */; };
+		A99F99DE1A5D8C5700D6CB76 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E9C157915D574BB00F520D0 /* CoreTelephony.framework */; };
+		A99F99DF1A5D8C6100D6CB76 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E9C157615D574B500F520D0 /* SystemConfiguration.framework */; };
+		A99F99E01A5D8C6B00D6CB76 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E820D6D15D40AB50001A3EC /* Foundation.framework */; };
 		FFC80BE6183CCF5900E3EF27 /* CSScreenSensor.m in Sources */ = {isa = PBXBuildFile; fileRef = FFC80BE5183CCF5900E3EF27 /* CSScreenSensor.m */; };
 /* End PBXBuildFile section */
 
@@ -293,7 +302,9 @@
 		A96D6ECA1A5C49FF00554BBC /* Sense Library Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Sense Library Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		A96D6ECD1A5C49FF00554BBC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A96D6ECE1A5C49FF00554BBC /* Sense_Library_Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Sense_Library_Tests.m; sourceTree = "<group>"; };
-		A96D6ED61A5C4B2500554BBC /* CSStorageTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSStorageTests.m; path = "Sense Library Tests/CSStorageTests.m"; sourceTree = "<group>"; };
+		A96D6ED91A5D147700554BBC /* Xcode.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = Xcode.app; path = ../../../../../../Applications/Xcode.app; sourceTree = "<group>"; };
+		A99F99D31A5D18B100D6CB76 /* CSStorageTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSStorageTest.m; sourceTree = "<group>"; };
+		A99F99D71A5D8C1300D6CB76 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		FFC80BE4183CCF5900E3EF27 /* CSScreenSensor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSScreenSensor.h; sourceTree = "<group>"; };
 		FFC80BE5183CCF5900E3EF27 /* CSScreenSensor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSScreenSensor.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -358,7 +369,17 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A96D6ED01A5C49FF00554BBC /* libSensePlatform.a in Frameworks */,
+				A99F99E01A5D8C6B00D6CB76 /* Foundation.framework in Frameworks */,
+				A99F99DF1A5D8C6100D6CB76 /* SystemConfiguration.framework in Frameworks */,
+				A99F99DE1A5D8C5700D6CB76 /* CoreTelephony.framework in Frameworks */,
+				A99F99DD1A5D8C4D00D6CB76 /* AudioToolbox.framework in Frameworks */,
+				A99F99DC1A5D8C4300D6CB76 /* AVFoundation.framework in Frameworks */,
+				A99F99DB1A5D8C3600D6CB76 /* CoreMotion.framework in Frameworks */,
+				A99F99DA1A5D8C2D00D6CB76 /* CoreLocation.framework in Frameworks */,
+				A99F99D91A5D8C2400D6CB76 /* CoreAudio.framework in Frameworks */,
+				A99F99D61A5D8B7800D6CB76 /* libsqlite3.dylib in Frameworks */,
+				A99F99D51A5D8A5D00D6CB76 /* libSensePlatform.a in Frameworks */,
+				A99F99CF1A5D16D300D6CB76 /* UIKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -406,7 +427,6 @@
 		3E820D5F15D40AB50001A3EC = {
 			isa = PBXGroup;
 			children = (
-				A96D6ED61A5C4B2500554BBC /* CSStorageTests.m */,
 				3EACDD84172E927900975C8D /* plugins */,
 				3E148BD0160A18DC0010A0D1 /* UIKit.framework */,
 				3E148BCC160A18130010A0D1 /* CFNetwork.framework */,
@@ -445,6 +465,8 @@
 		3E820D6C15D40AB50001A3EC /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				A99F99D71A5D8C1300D6CB76 /* libz.dylib */,
+				A96D6ED91A5D147700554BBC /* Xcode.app */,
 				3E513F4F18F7DDE60008415A /* libsqlite3.dylib */,
 				3E820D6D15D40AB50001A3EC /* Foundation.framework */,
 				3E148B7A160A11280010A0D1 /* SenTestingKit.framework */,
@@ -599,6 +621,7 @@
 		A96D6ECB1A5C49FF00554BBC /* Sense Library Tests */ = {
 			isa = PBXGroup;
 			children = (
+				A99F99D31A5D18B100D6CB76 /* CSStorageTest.m */,
 				A96D6ECE1A5C49FF00554BBC /* Sense_Library_Tests.m */,
 				A96D6ECC1A5C49FF00554BBC /* Supporting Files */,
 			);
@@ -844,7 +867,6 @@
 				3E820E4415D40B190001A3EC /* CSUserProximity.m in Sources */,
 				3E820E4615D40B190001A3EC /* CSSensorStore.m in Sources */,
 				3E513F5318F81D2C0008415A /* CSDataPoint.m in Sources */,
-				A96D6ED71A5C4B2500554BBC /* CSStorageTests.m in Sources */,
 				3E820E4715D40B190001A3EC /* CSSettings.m in Sources */,
 				3E59ACBE15F4DB9D00C07D59 /* UIDevice+IdentifierAddition.m in Sources */,
 				3E11261B16A7086400805102 /* UIDevice+Hardware.m in Sources */,
@@ -859,7 +881,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A96D6ECF1A5C49FF00554BBC /* Sense_Library_Tests.m in Sources */,
-				A96D6ED81A5C4B2500554BBC /* CSStorageTests.m in Sources */,
+				A99F99D41A5D18B100D6CB76 /* CSStorageTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1212,6 +1234,7 @@
 				A96D6ED51A5C49FF00554BBC /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/SensePlatformTestAppTests/SensePlatformTestAppTests.m b/SensePlatformTestAppTests/SensePlatformTestAppTests.m
@@ -82,8 +82,4 @@ - (void)testAddDataFunction
     [NSThread sleepForTimeInterval:15];
 }
 
-- (void) testStorage {
-    CSSt
-}
-
 @end
diff --git a/sense platform/CSSensePlatform.m b/sense platform/CSSensePlatform.m
@@ -116,6 +116,10 @@ + (void) logout {
     [[CSSettings sharedSettings] setSettingType:kCSSettingTypeGeneral setting:kCSGeneralSettingUploadToCommonSense value:kCSSettingNO];
 }
 
++ (NSArray*) getLocalDataForSensor:(NSString *)name from:(NSDate *)startDate to:(NSDate *)endDate {
+    return [[CSSensorStore sharedSensorStore] getLocalDataForSensor: name from: startDate to: endDate];
+}
+
 + (NSArray*) getDataForSensor:(NSString*) name onlyFromDevice:(bool) onlyFromDevice nrLastPoints:(NSInteger) nrLastPoints {
     return [[CSSensorStore sharedSensorStore] getDataForSensor:name onlyFromDevice:onlyFromDevice nrLastPoints:nrLastPoints];
 }
@@ -266,9 +270,9 @@ + (void) synchronizeWithBloodPressureMonitor:(bpmCallBack) callback {
      */
 }
 
-+ (NSArray*) getDataForSensor:(NSString *)name onlyFromDevice:(bool)onlyFromDevice nrLastPoints:(NSInteger)nrLastPoints {
-    
-}
+//+ (NSArray*) getDataForSensor:(NSString *)name onlyFromDevice:(bool)onlyFromDevice nrLastPoints:(NSInteger)nrLastPoints {
+//    
+//}
 
 + (NSString*) dataTypeOf:(NSString*) value {
     NSNumberFormatter* f = [[NSNumberFormatter alloc] init];
diff --git a/sense platform/CSSensorStore.h b/sense platform/CSSensorStore.h
@@ -36,7 +36,14 @@
 - (void) enabledChanged:(id) notification;
 - (void) setSyncRate: (int) newRate;
 - (void) addSensor:(CSSensor*) sensor;
+
 - (NSArray*) getDataForSensor:(NSString*) name onlyFromDevice:(bool) onlyFromDevice nrLastPoints:(NSInteger) nrLastPoints;
+
+/** 
+ * 
+ */
+- (NSArray*) getLocalDataForSensor:(NSString *)name from:(NSDate *)startDate to:(NSDate *)endDate;
+
 - (void) giveFeedbackOnState:(NSString*) state from:(NSDate*)from to:(NSDate*) to label:(NSString*)label;
 
 /* Ensure all sensor data is flushed, used to reduce memory usage.
diff --git a/sense platform/CSSensorStore.m b/sense platform/CSSensorStore.m
@@ -434,6 +434,10 @@ - (NSArray*) getDataForSensor:(NSString*) name onlyFromDevice:(bool) onlyFromDev
     }
 }
 
+- (NSArray*) getLocalDataForSensor:(NSString *)name from:(NSDate *)startDate to:(NSDate *)endDate {
+    return [self->storage getDataFromSensor:name from:startDate to:endDate];
+}
+
 - (void) giveFeedbackOnState:(NSString*) state from:(NSDate*)from to:(NSDate*) to label:(NSString*)label {
     NSString* sensorId = [self resolveSensorIdForSensorName:state onlyThisDevice:NO];
 
diff --git a/sense platform/CSStorage.h b/sense platform/CSStorage.h
@@ -9,14 +9,27 @@
 #import <Foundation/Foundation.h>
 
 @interface CSStorage : NSObject
+
 - (id) initWithPath:(NSString*) databaseFilePath;
+
 - (void) storeSensor:(NSString*) sensor description:(NSString*) description deviceType:(NSString*) deviceType device:(NSString*) device dataType:(NSString*) dataType value:(NSString*) value timestamp:(double) timestamp;
+
 - (NSArray*) getSensorDataPointsFromId:(long long) start limit:(size_t) limit;
+
+/** Retrieve all the sensor data stored in the database between a certain time interval.
+ * @param name The name of the sensor to get the data from
+ * @param startDate The date and time at which to start looking for datapoints
+ * @param endDate The date and time at which to stop looking for datapoints
+ * @return an array of values, each value is a dictonary that descirbes the data point
+ */
+- (NSArray*) getDataFromSensor: (NSString*) name from: (NSDate*) startDate to: (NSDate*) endDate;
+
+
 - (void) removeDataBeforeId:(long long) rowId;
 
-/*
+/**
  * Removes all data from before a certain date from buffer and main data store
- * @param: dateThreshold Date which marks the threshold, all data older than (from before) the date will be removed
+ * @param dateThreshold NSDate which marks the threshold, all data older than (from before) the date will be removed
  */
 - (void) removeDataBeforeTime:(NSDate *) dateThreshold;
 
@@ -25,13 +38,8 @@
 - (void) flush;
 
 - (void) storeSensorDescription:(NSString*) jsonDescription forSensor:(NSString*) sensor description:(NSString*) description deviceType:(NSString*) deviceType device:(NSString*) device;
+
 - (NSString*) getSensorDescriptionForSensor:(NSString*) sensor description:(NSString*) description deviceType:(NSString*) deviceType device:(NSString*) device;
 
-/** Retrieve all the sensor data stored in the database between a certain time interval.
- * @param name The name of the sensor to get the data from
- * @param startDate The date and time at which to start looking for datapoints
- * @param endDate The date and time at which to stop looking for datapoints
- * @return an array of values, each value is a dictonary that descirbes the data point
- */
-- (NSArray*) getDataFromSensor: (NSString*) name from: (NSDate*) startDate to: (NSDate*) endDate;
-@end
+
+@end
diff --git a/sense platform/CSStorage.m b/sense platform/CSStorage.m

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ - (void)tearDown {`
`25`	`25`	`[super tearDown];`
`26`	`26`	`}`
`27`	`27`
`28`		`-- (void)testExample {`
	`28`	`+- (void)testStoreData {`
	`29`	`+`
`29`	`30`	`// This is an example of a functional test case.`
`30`	`31`	`XCTAssert(YES, @"Pass");`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,4 @@ - (void)testAddDataFunction`
`82`	`82`	`[NSThread sleepForTimeInterval:15];`
`83`	`83`	`}`
`84`	`84`
`85`		`-- (void) testStorage {`
`86`		`- CSSt`
`87`		`-}`
`88`		`-`
`89`	`85`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -434,6 +434,10 @@ - (NSArray) getDataForSensor:(NSString) name onlyFromDevice:(bool) onlyFromDev`
`434`	`434`	`}`
`435`	`435`	`}`
`436`	`436`
	`437`	`+- (NSArray) getLocalDataForSensor:(NSString )name from:(NSDate )startDate to:(NSDate )endDate {`
	`438`	`+ return [self->storage getDataFromSensor:name from:startDate to:endDate];`
	`439`	`+}`
	`440`	`+`
`437`	`441`	`- (void) giveFeedbackOnState:(NSString) state from:(NSDate)from to:(NSDate) to label:(NSString)label {`
`438`	`442`	`NSString* sensorId = [self resolveSensorIdForSensorName:state onlyThisDevice:NO];`
`439`	`443`