UIテスト用ウインドウ追加

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index 56f5c7b..1844c4d 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -142,6 +142,8 @@
                F4D2CBCB18B05E58000EBC59 /* HMMaserShipCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D2CBCA18B05E58000EBC59 /* HMMaserShipCommand.m */; };
                F4D6BC4F1A938EFC00742FEB /* HMDropShipHistoryCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D6BC4E1A938EFC00742FEB /* HMDropShipHistoryCommand.m */; };
                F4D6BC551A93903E00742FEB /* HMDropShipHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D6BC541A93903E00742FEB /* HMDropShipHistory.m */; };
+               F4D6BC9C1AA1FAC700742FEB /* HMUITestWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D6BC9A1AA1FAC600742FEB /* HMUITestWindowController.m */; };
+               F4D6BC9D1AA1FAC700742FEB /* HMUITestWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4D6BC9B1AA1FAC600742FEB /* HMUITestWindowController.xib */; };
                F4E33B5818BF5F67005B8C07 /* HMMemberSlotItemCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4E33B5718BF5F67005B8C07 /* HMMemberSlotItemCommand.m */; };
                F4E7802818DBD2A00011BC4C /* HMGetShipCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4E7802718DBD2A00011BC4C /* HMGetShipCommand.m */; };
                F4E7802B18DC3A820011BC4C /* HMLocalDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = F4E7802A18DC3A820011BC4C /* HMLocalDataStore.m */; };
@@ -410,6 +412,9 @@
                F4D6BC4E1A938EFC00742FEB /* HMDropShipHistoryCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMDropShipHistoryCommand.m; sourceTree = "<group>"; };
                F4D6BC531A93903E00742FEB /* HMDropShipHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMDropShipHistory.h; sourceTree = "<group>"; };
                F4D6BC541A93903E00742FEB /* HMDropShipHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMDropShipHistory.m; sourceTree = "<group>"; };
+               F4D6BC991AA1FAC600742FEB /* HMUITestWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMUITestWindowController.h; sourceTree = "<group>"; };
+               F4D6BC9A1AA1FAC600742FEB /* HMUITestWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMUITestWindowController.m; sourceTree = "<group>"; };
+               F4D6BC9B1AA1FAC600742FEB /* HMUITestWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HMUITestWindowController.xib; sourceTree = "<group>"; };
                F4E33B5618BF5F67005B8C07 /* HMMemberSlotItemCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberSlotItemCommand.h; sourceTree = "<group>"; };
                F4E33B5718BF5F67005B8C07 /* HMMemberSlotItemCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMemberSlotItemCommand.m; sourceTree = "<group>"; };
                F4E7802618DBD2A00011BC4C /* HMGetShipCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMGetShipCommand.h; sourceTree = "<group>"; };
@@ -806,6 +811,9 @@
                                F4513EF718BB699700073552 /* HMShipWindowController.h */,
                                F4513EF818BB699700073552 /* HMShipWindowController.m */,
                                F4B3DC3818E5C8650011B4FC /* HMShipWindowController.xib */,
+                               F4D6BC991AA1FAC600742FEB /* HMUITestWindowController.h */,
+                               F4D6BC9A1AA1FAC600742FEB /* HMUITestWindowController.m */,
+                               F4D6BC9B1AA1FAC600742FEB /* HMUITestWindowController.xib */,
                        );
                        name = TestAndDebug;
                        path = KCD;
@@ -900,6 +908,7 @@
                                F4B2D02B18F83A2F00542742 /* HMScreenshotWindowController.xib in Resources */,
                                F4B3DC3918E5C8700011B4FC /* HMJSONViewWindowController.xib in Resources */,
                                F4B3DC3318E5C8520011B4FC /* HMShipViewController.xib in Resources */,
+                               F4D6BC9D1AA1FAC700742FEB /* HMUITestWindowController.xib in Resources */,
                                F43E67B718BE02A10087E5B6 /* STypeShortName.plist in Resources */,
                                F4A2AF541A074DE40024BD9E /* HMScreenshotListWindowController.xib in Resources */,
                                F4B2A0901A1F9C2100D2EF12 /* HMExternalBrowserWindowController.xib in Resources */,
@@ -1018,6 +1027,7 @@
                                F494DC6718C8BA6400AE97E4 /* HMPowerUpSupportViewController.m in Sources */,
                                F43BA4A7197CD59400CFF788 /* HMNyukyoSpeedChangeCommand.m in Sources */,
                                F4A3AD8819B6149D00FDBF80 /* HMNyukyoStartCommand.m in Sources */,
+                               F4D6BC9C1AA1FAC700742FEB /* HMUITestWindowController.m in Sources */,
                                F4B1E30C19D1C06900805879 /* HMHokyuChargeCommand.m in Sources */,
                                F494DC6318C608C100AE97E4 /* HMShipViewController.m in Sources */,
                                F46F104918ABAC910063E503 /* KCD.xcdatamodeld in Sources */,

diff --git a/KCD/HMAppDelegate.m b/KCD/HMAppDelegate.m
index 1ba69f1..655a87a 100644 (file)
--- a/KCD/HMAppDelegate.m
+++ b/KCD/HMAppDelegate.m
@@ -26,6 +26,7 @@
 
 #ifdef DEBUG
 #import "HMShipWindowController.h"
+#import "HMUITestWindowController.h"
 #endif
 
 //@interface NSObject (HMM_NSUserNotificationCenterPrivateMethods)
@@ -45,6 +46,7 @@
 #ifdef DEBUG
 @property (strong) HMShipWindowController *shipWindowController;
 @property (strong) HMShipMasterDetailWindowController *shipMDWindowController;
+@property (strong) HMUITestWindowController *uiTestWindowController;
 #endif
 #if ENABLE_JSON_LOG
 @property (strong) HMJSONViewWindowController *logedJSONViewWindowController;
@@ -124,6 +126,9 @@
        
        self.shipMDWindowController = [HMShipMasterDetailWindowController new];
        [self.shipMDWindowController showWindow:nil];
+       
+       self.uiTestWindowController = [HMUITestWindowController new];
+       [self.uiTestWindowController showWindow:nil];
 #endif
        if(!HMStandardDefaults.showsDebugMenu) {
                [self.debugMenuItem setHidden:YES];

diff --git a/KCD/HMUITestWindowController.h b/KCD/HMUITestWindowController.h
new file mode 100644 (file)
index 0000000..8a17088
--- /dev/null
+++ b/KCD/HMUITestWindowController.h
@@ -0,0 +1,15 @@
+//
+//  HMUITestWindowController.h
+//  KCD
+//
+//  Created by Hori,Masaki on 2015/02/28.
+//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface HMUITestWindowController : NSWindowController
+
+@property (nonatomic, weak) IBOutlet NSView *testViewPlaceholder;
+
+@end

diff --git a/KCD/HMUITestWindowController.m b/KCD/HMUITestWindowController.m
new file mode 100644 (file)
index 0000000..48e6ae0
--- /dev/null
+++ b/KCD/HMUITestWindowController.m
@@ -0,0 +1,37 @@
+//
+//  HMUITestWindowController.m
+//  KCD
+//
+//  Created by Hori,Masaki on 2015/02/28.
+//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+#import "HMUITestWindowController.h"
+
+@interface HMUITestWindowController ()
+@property (strong) NSViewController *testViewController;
+@end
+
+@implementation HMUITestWindowController
+
+- (id)init
+{
+       self = [super initWithWindowNibName:NSStringFromClass([self class])];
+       return self;
+}
+
+- (Class)testViewControllerClass
+{
+       return NSClassFromString(@"HMShipDetailViewController");
+}
+
+- (void)windowDidLoad {
+    [super windowDidLoad];
+       
+       self.testViewController = [self.testViewControllerClass new];
+       [self.testViewController.view setFrame:[self.testViewPlaceholder frame]];
+       [self.testViewController.view setAutoresizingMask:[self.testViewPlaceholder autoresizingMask]];
+       [[self.testViewPlaceholder superview] replaceSubview:self.testViewPlaceholder with:self.testViewController.view];
+}
+
+@end

diff --git a/KCD/HMUITestWindowController.xib b/KCD/HMUITestWindowController.xib
new file mode 100644 (file)
index 0000000..cf95dde
--- /dev/null
+++ b/KCD/HMUITestWindowController.xib
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="HMUITestWindowController">
+            <connections>
+                <outlet property="testViewPlaceholder" destination="Lxs-Lw-GIx" id="8nM-Lh-pEE"/>
+                <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="UITestWindow" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="240" width="460" height="220"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
+            <view key="contentView" id="se5-gp-TjO">
+                <rect key="frame" x="0.0" y="-1" width="460" height="220"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <customView id="Lxs-Lw-GIx">
+                        <rect key="frame" x="7" y="65" width="266" height="147"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    </customView>
+                </subviews>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
+            </connections>
+            <point key="canvasLocation" x="262" y="182"/>
+        </window>
+    </objects>
+</document>