Skip to content

Commit

Permalink
[FIX] MogenSwiftTest main target compiles. Test target is still hosed…
Browse files Browse the repository at this point in the history 
…. Waiting on Swift 1.2 PR's.
  • Loading branch information
Justin Williams committed Apr 26, 2015
1 parent 5983bf0 commit 517e527
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 41 deletions.
43 changes: 17 additions & 26 deletions test/MogenSwiftTest/MogenSwiftTest/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {

@IBOutlet var window: NSWindow?


func applicationDidFinishLaunching(aNotification: NSNotification?) {
// Insert code here to initialize your application
}

func applicationWillTerminate(aNotification: NSNotification?) {
// Insert code here to tear down your application
}

@IBAction func saveAction(sender: AnyObject) {
// Performs the save action for the application, which is to send the save: message to the application's managed object context. Any encountered errors are presented to the user.
var error: NSError? = nil
Expand All @@ -30,7 +21,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
println("\(NSStringFromClass(self.dynamicType)) unable to commit editing before saving")
}
if !moc.save(&error) {
NSApplication.sharedApplication().presentError(error)
NSApplication.sharedApplication().presentError(error!)
}
}
}
Expand All @@ -50,7 +41,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}

let modelURL = NSBundle.mainBundle().URLForResource("MogenSwiftTest", withExtension: "momd")
_managedObjectModel = NSManagedObjectModel(contentsOfURL: modelURL)
_managedObjectModel = NSManagedObjectModel(contentsOfURL: modelURL!)
return _managedObjectModel!
}
var _managedObjectModel: NSManagedObjectModel? = nil
Expand All @@ -70,31 +61,31 @@ class AppDelegate: NSObject, NSApplicationDelegate {
let optProperties: NSDictionary? = applicationFilesDirectory.resourceValuesForKeys([NSURLIsDirectoryKey], error: &error)

if let properties = optProperties {
if !properties[NSURLIsDirectoryKey].boolValue {
if !properties[NSURLIsDirectoryKey]!.boolValue {
// Customize and localize this error.
let failureDescription = "Expected a folder to store application data, found a file \(applicationFilesDirectory.path)."
let dict = NSMutableDictionary()
dict[NSLocalizedDescriptionKey] = failureDescription
error = NSError.errorWithDomain("YOUR_ERROR_DOMAIN", code: 101, userInfo: dict)
var errorDict = [NSObject : AnyObject ]()
errorDict[NSLocalizedDescriptionKey] = failureDescription
error = NSError(domain: "YOUR_ERROR_DOMAIN", code: 101, userInfo: errorDict)

NSApplication.sharedApplication().presentError(error)
NSApplication.sharedApplication().presentError(error!)
return nil
}
} else {
var ok = false
if error!.code == NSFileReadNoSuchFileError {
ok = fileManager.createDirectoryAtPath(applicationFilesDirectory.path, withIntermediateDirectories: true, attributes: nil, error: &error)
ok = fileManager.createDirectoryAtPath(applicationFilesDirectory.path!, withIntermediateDirectories: true, attributes: nil, error: &error)
}
if !ok {
NSApplication.sharedApplication().presentError(error)
NSApplication.sharedApplication().presentError(error!)
return nil
}
}

let url = applicationFilesDirectory.URLByAppendingPathComponent("MogenSwiftTest.storedata")
var coordinator = NSPersistentStoreCoordinator(managedObjectModel: mom)
if coordinator.addPersistentStoreWithType(NSXMLStoreType, configuration: nil, URL: url, options: nil, error: &error) == nil {
NSApplication.sharedApplication().presentError(error)
NSApplication.sharedApplication().presentError(error!)
return nil
}
_persistentStoreCoordinator = coordinator
Expand All @@ -110,11 +101,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}

let coordinator = self.persistentStoreCoordinator
if !coordinator {
var dict = NSMutableDictionary()
dict[NSLocalizedDescriptionKey] = "Failed to initialize the store"
dict[NSLocalizedFailureReasonErrorKey] = "There was an error building up the data file."
let error = NSError.errorWithDomain("YOUR_ERROR_DOMAIN", code: 9999, userInfo: dict)
if !(coordinator != nil) {
var errorDict = [NSObject : AnyObject ]()
errorDict[NSLocalizedDescriptionKey] = "Failed to initialize the store"
errorDict[NSLocalizedFailureReasonErrorKey] = "There was an error building up the data file."
let error = NSError(domain: "YOUR_ERROR_DOMAIN", code: 9999, userInfo: errorDict)
NSApplication.sharedApplication().presentError(error)
return nil
}
Expand All @@ -137,7 +128,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
func applicationShouldTerminate(sender: NSApplication) -> NSApplicationTerminateReply {
// Save changes in the application's managed object context before the application terminates.

if !_managedObjectContext {
if !(_managedObjectContext != nil) {
// Accesses the underlying stored property because we don't want to cause the lazy initialization
return .TerminateNow
}
Expand All @@ -154,7 +145,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
var error: NSError? = nil
if !moc.save(&error) {
// Customize this code block to include application-specific recovery steps.
let result = sender.presentError(error)
let result = sender.presentError(error!)
if (result) {
return .TerminateCancel
}
Expand Down
2 changes: 1 addition & 1 deletion test/MogenSwiftTest/MogenSwiftTest/MogenSwiftTest/_MyEntityMO.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class _MyEntityMO: NSManagedObject {

/// pragma mark - Life cycle methods

init(entity: NSEntityDescription!, insertIntoManagedObjectContext context: NSManagedObjectContext!) {
override init(entity: NSEntityDescription, insertIntoManagedObjectContext context: NSManagedObjectContext?) {
super.init(entity: entity, insertIntoManagedObjectContext: context)
}

Expand Down
2 changes: 1 addition & 1 deletion test/MogenSwiftTest/MogenSwiftTest/MogenSwiftTest/_UnorderedToManyDstMO.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class _UnorderedToManyDstMO: NSManagedObject {

/// pragma mark - Life cycle methods

init(entity: NSEntityDescription!, insertIntoManagedObjectContext context: NSManagedObjectContext!) {
override init(entity: NSEntityDescription, insertIntoManagedObjectContext context: NSManagedObjectContext?) {
super.init(entity: entity, insertIntoManagedObjectContext: context)
}

Expand Down
16 changes: 8 additions & 8 deletions test/MogenSwiftTest/MogenSwiftTest/MogenSwiftTest/_UnorderedToManySrcMO.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class _UnorderedToManySrcMO: NSManagedObject {

/// pragma mark - Life cycle methods

init(entity: NSEntityDescription!, insertIntoManagedObjectContext context: NSManagedObjectContext!) {
override init(entity: NSEntityDescription, insertIntoManagedObjectContext context: NSManagedObjectContext?) {
super.init(entity: entity, insertIntoManagedObjectContext: context)
}

Expand Down Expand Up @@ -61,32 +61,32 @@ class _UnorderedToManySrcMO: NSManagedObject {
}

class func fetchAllUnorderedToManySrcs(managedObjectContext: NSManagedObjectContext!, error outError: NSErrorPointer) -> [AnyObject] {
let model = managedObjectContext.persistentStoreCoordinator.managedObjectModel
let model = managedObjectContext.persistentStoreCoordinator!.managedObjectModel
let substitutionVariables = [:]

let fetchRequest = model.fetchRequestFromTemplateWithName("allUnorderedToManySrcs", substitutionVariables: substitutionVariables)
let fetchRequest = model.fetchRequestFromTemplateWithName("allUnorderedToManySrcs", substitutionVariables: substitutionVariables as [NSObject : AnyObject])
assert(fetchRequest != nil, "Can't find fetch request named \"allUnorderedToManySrcs\".")

var error: NSError? = nil
let results = managedObjectContext.executeFetchRequest(fetchRequest, error: &error)
let results = managedObjectContext.executeFetchRequest(fetchRequest!, error: &error)

if error {
if (error != nil) {
outError.memory = error
}

return results
return results!
}

}

extension _UnorderedToManySrcMO {

func addRelationship(objects: NSSet) {
self.relationshipSet().unionSet(objects)
self.relationshipSet().unionSet(objects as Set<NSObject>)
}

func removeRelationship(objects: NSSet) {
self.relationshipSet().minusSet(objects)
self.relationshipSet().minusSet(objects as Set<NSObject>)
}

func addRelationshipObject(value: UnorderedToManyDstMO!) {
Expand Down
2 changes: 1 addition & 1 deletion test/MogenSwiftTest/MogenSwiftTest/main.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

import Cocoa

NSApplicationMain(C_ARGC, C_ARGV)
NSApplicationMain(Process.argc, Process.unsafeArgv)
8 changes: 4 additions & 4 deletions test/MogenSwiftTest/MogenSwiftTestTests/MogenSwiftTestTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import MogenSwiftTest

class MogenSwiftTestTests: XCTestCase {
func newMoc() -> (NSManagedObjectContext) {
let momURL : NSURL = NSBundle.mainBundle().URLForResource("MogenSwiftTest", withExtension: "momd")
let mom : NSManagedObjectModel = NSManagedObjectModel(contentsOfURL: momURL)
let momURL : NSURL = NSBundle.mainBundle().URLForResource("MogenSwiftTest", withExtension: "momd")!
let mom : NSManagedObjectModel = NSManagedObjectModel(contentsOfURL: momURL)!
let psc : NSPersistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: mom);
let ps : NSPersistentStore = psc.addPersistentStoreWithType(
NSInMemoryStoreType,
configuration: nil,
URL: nil,
options: nil,
error: nil)
error: nil)!
let moc : NSManagedObjectContext = NSManagedObjectContext()
moc.persistentStoreCoordinator = psc
return moc
Expand Down Expand Up @@ -87,7 +87,7 @@ class MogenSwiftTestTests: XCTestCase {

extension NSEntityDescription {
class func entityForName_workaround(entityName: String!, inManagedObjectContext context: NSManagedObjectContext!) -> NSEntityDescription! {
let entities = context.persistentStoreCoordinator.managedObjectModel.entitiesByName;
let entities = context.persistentStoreCoordinator!.managedObjectModel.entitiesByName;
let keys = Array(entities.keys)
var result : NSEntityDescription?
for (key, value) in entities {
Expand Down

0 comments on commit 517e527

Please sign in to comment.