Added a wrapper class OPTLYDataStore that owns the file manager and database. Moved all the tests to OPTLYDataStoreTest.

alda-optimizely · alda-optimizely · commit d0691f493df9 · 2016-11-15T13:28:54.000-08:00
diff --git a/OptimizelySDKShared/OptimizelySDKShared.xcodeproj/project.pbxproj b/OptimizelySDKShared/OptimizelySDKShared.xcodeproj/project.pbxproj
@@ -441,7 +441,6 @@
 				2D08FBA01DCA5FA8006CA063 /* OPTLYClientBuilder.h in Headers */,
 				EA52499A1DC7D8B800AF6685 /* OptimizelySDKShared.h in Headers */,
 				2DB3D1801DC8181100ECF72E /* OPTLYManagerBuilder.h in Headers */,
-				EA064BD31DD4030700DF7537 /* OPTLYDataStore.h in Headers */,
 				2D08FB6C1DCA5A99006CA063 /* OPTLYClient.h in Headers */,
 				EA5247861DC7226400AF6685 /* OPTLYManager.h in Headers */,
 				EA5247971DC724AF00AF6685 /* OPTLYHTTPRequestManager.h in Headers */,
diff --git a/OptimizelySDKShared/OptimizelySDKShared/OPTLYDataStore.h b/OptimizelySDKShared/OptimizelySDKShared/OPTLYDataStore.h
@@ -1,4 +1,3 @@
-<<<<<<< ce6f3747e73962c7c281bf400714e00bdf7e32d6
 /****************************************************************************
  * Copyright 2016, Optimizely, Inc. and contributors                        *
  *                                                                          *
diff --git a/OptimizelySDKShared/OptimizelySDKShared/OPTLYDataStore.m b/OptimizelySDKShared/OptimizelySDKShared/OPTLYDataStore.m
@@ -1,4 +1,3 @@
-<<<<<<< ce6f3747e73962c7c281bf400714e00bdf7e32d6
 /****************************************************************************
  * Copyright 2016, Optimizely, Inc. and contributors                        *
  *                                                                          *
diff --git a/OptimizelySDKShared/OptimizelySDKShared/OPTLYDatabase.h b/OptimizelySDKShared/OptimizelySDKShared/OPTLYDatabase.h
@@ -27,6 +27,13 @@
 #import <Foundation/Foundation.h>
 
 @interface OPTLYDatabase : NSObject
+/**
+ * File manager initializer.
+ *
+ * @param baseDir The base directory where the database will be stored.
+ * @return an instance of OPTLYDatabase.
+ **/
+- (nullable instancetype)initWithBaseDir:(nonnull NSString *)baseDir;
 
 /**
  * Creates a new table.
diff --git a/OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYFileManagerTest.m b/OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYFileManagerTest.m

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-<<<<<<< ce6f3747e73962c7c281bf400714e00bdf7e32d6`
`2`	`1`	`/****************************************************************************`
`3`	`2`	`* Copyright 2016, Optimizely, Inc. and contributors *`
`4`	`3`	`* *`