neatening up test plans; added a localizable asset catalog image

mattneub · mattneub · commit ae30f34e41f6 · 2019-07-07T12:09:09.000-07:00
diff --git a/bk1ch09p380unitTesting/EmptyWindowUITests/EmptyWindowUITests.swift b/bk1ch09p380unitTesting/EmptyWindowUITests/EmptyWindowUITests.swift
@@ -23,7 +23,12 @@ class EmptyWindowUITests: XCTestCase {
     func testExample() {
         
         let app = XCUIApplication()
-        app.buttons["Howdy"].tap()
+        let screenshot = XCUIApplication().windows.firstMatch.screenshot()
+        let attachment = XCTAttachment(screenshot: screenshot)
+        attachment.lifetime = .keepAlways
+        attachment.name = "OpeningScreen"
+        self.add(attachment)
+        app.buttons["GreetingButton"].tap()
         app.alerts["Howdy!"].buttons["OK"].tap()
         
     }
diff --git a/bk1ch09p380unitTesting/TestPlan1.xctestplan b/bk1ch09p380unitTesting/TestPlan1.xctestplan
@@ -1,7 +1,13 @@
 {
   "configurations" : [
     {
-      "name" : "EmptyWindowConfig",
+      "name" : "TestPlan1Config1",
+      "options" : {
+
+      }
+    },
+    {
+      "name" : "TestPlan1Config2",
       "options" : {
 
       }
diff --git a/bk1ch09p380unitTesting/TestPlan2.xctestplan b/bk1ch09p380unitTesting/TestPlan2.xctestplan
@@ -1,7 +1,7 @@
 {
   "configurations" : [
     {
-      "name" : "TestPlanConfig",
+      "name" : "TestPlan2Config",
       "options" : {
 
       }
diff --git a/bk1ch09p380unitTesting/bk1ch09p380unitTesting.xcodeproj/project.pbxproj b/bk1ch09p380unitTesting/bk1ch09p380unitTesting.xcodeproj/project.pbxproj
@@ -47,8 +47,8 @@
 		814A1AB01D109C1F008F3FF6 /* EmptyWindowTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EmptyWindowTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		814A1AB21D109C1F008F3FF6 /* EmptyWindowTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyWindowTests.swift; sourceTree = "<group>"; };
 		814A1AB41D109C1F008F3FF6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		8185E5BE22D0EED2004AD7E2 /* TestPlan.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = TestPlan.xctestplan; sourceTree = "<group>"; };
-		8185E5BF22D0EFD2004AD7E2 /* EmptyWindow.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = EmptyWindow.xctestplan; sourceTree = "<group>"; };
+		8185E5BE22D0EED2004AD7E2 /* TestPlan2.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = TestPlan2.xctestplan; sourceTree = "<group>"; };
+		8185E5BF22D0EFD2004AD7E2 /* TestPlan1.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = TestPlan1.xctestplan; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -79,8 +79,8 @@
 		32080BE71AFE632800DB7A17 = {
 			isa = PBXGroup;
 			children = (
-				8185E5BE22D0EED2004AD7E2 /* TestPlan.xctestplan */,
-				8185E5BF22D0EFD2004AD7E2 /* EmptyWindow.xctestplan */,
+				8185E5BE22D0EED2004AD7E2 /* TestPlan2.xctestplan */,
+				8185E5BF22D0EFD2004AD7E2 /* TestPlan1.xctestplan */,
 				32080BF21AFE632800DB7A17 /* bk1ch09p380unitTesting */,
 				814A1AA31D109B13008F3FF6 /* EmptyWindowUITests */,
 				814A1AB11D109C1F008F3FF6 /* EmptyWindowTests */,
diff --git a/bk1ch09p380unitTesting/bk1ch09p380unitTesting/Base.lproj/Main.storyboard b/bk1ch09p380unitTesting/bk1ch09p380unitTesting/Base.lproj/Main.storyboard
@@ -16,9 +16,10 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KSR-PR-fGd">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KSR-PR-fGd">
                                 <rect key="frame" x="44" y="45" width="61" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <accessibility key="accessibilityConfiguration" identifier="GreetingButton"/>
                                 <state key="normal" title="Howdy"/>
                                 <connections>
                                     <action selector="buttonPressed:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="d97-gm-Ww5"/>
diff --git a/bk1ch09p397localization/Empty Window/Assets.xcassets/AppIcon.appiconset/Contents.json b/bk1ch09p397localization/Empty Window/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -84,6 +84,11 @@
       "idiom" : "ipad",
       "size" : "83.5x83.5",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/bk1ch09p397localization/Empty Window/Assets.xcassets/Contents.json b/bk1ch09p397localization/Empty Window/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/bk1ch09p397localization/Empty Window/Assets.xcassets/LocalizableImage.imageset/180.png b/bk1ch09p397localization/Empty Window/Assets.xcassets/LocalizableImage.imageset/180.png
diff --git a/bk1ch09p397localization/Empty Window/Assets.xcassets/LocalizableImage.imageset/180_fr.png b/bk1ch09p397localization/Empty Window/Assets.xcassets/LocalizableImage.imageset/180_fr.png
diff --git a/bk1ch09p397localization/Empty Window/Assets.xcassets/LocalizableImage.imageset/Contents.json b/bk1ch09p397localization/Empty Window/Assets.xcassets/LocalizableImage.imageset/Contents.json
@@ -0,0 +1,55 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "180.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "locale" : "en"
+    },
+    {
+      "locale" : "fr",
+      "idiom" : "universal",
+      "filename" : "180_fr.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "locale" : "en"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "locale" : "fr"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "locale" : "en"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "locale" : "fr"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "localizable" : true
+  }
+}
diff --git a/bk1ch09p397localization/Empty Window/Base.lproj/Main.storyboard b/bk1ch09p397localization/Empty Window/Base.lproj/Main.storyboard
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13168.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14835.7" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13147.4"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14790.5"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -25,6 +24,10 @@
                                     <action selector="buttonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="r42-fS-mRa"/>
                                 </connections>
                             </button>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="LocalizableImage" translatesAutoresizingMaskIntoConstraints="NO" id="tWA-Vk-4PR">
+                                <rect key="frame" x="33" y="110" width="180" height="180"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
@@ -35,4 +38,7 @@
             <point key="canvasLocation" x="117.59999999999999" y="123.68815592203899"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="LocalizableImage" width="180" height="180"/>
+    </resources>
 </document>
diff --git a/bk1ch09p397localization/Empty Window/fr.lproj/InfoPlist.strings b/bk1ch09p397localization/Empty Window/fr.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
-/* (No Comment) */
+/* Bundle display name */
 "CFBundleDisplayName" = "Fenêtre Vide";
 
-/* (No Comment) */
+/* Bundle name */
 "CFBundleName" = "$(PRODUCT_NAME)";
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`"configurations" : [`
`3`	`3`	`{`
`4`		`- "name" : "EmptyWindowConfig",`
	`4`	`+ "name" : "TestPlan1Config1",`
	`5`	`+ "options" : {`
	`6`	`+`
	`7`	`+ }`
	`8`	`+ },`
	`9`	`+ {`
	`10`	`+ "name" : "TestPlan1Config2",`
`5`	`11`	`"options" : {`
`6`	`12`
`7`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"configurations" : [`
`3`	`3`	`{`
`4`		`- "name" : "TestPlanConfig",`
	`4`	`+ "name" : "TestPlan2Config",`
`5`	`5`	`"options" : {`
`6`	`6`
`7`	`7`	`}`