From eb8e005830c1e409a920d24cf4ca9e46af850ea4 Mon Sep 17 00:00:00 2001
From: Abhishek <abhishekbanthia@me.com>
Date: Mon, 28 Dec 2020 11:06:53 -0600
Subject: [PATCH] Fix tests!

---
 Clocker/Clocker.xcodeproj/project.pbxproj      |  4 ++--
 .../xcshareddata/xcschemes/Clocker.xcscheme    | 18 ++++++++++++++++--
 Clocker/ClockerUITests/AboutUsTests.swift      |  2 +-
 Clocker/ClockerUITests/ClockerUITests.m        | 13 ++++++++-----
 .../CoreLoggerKitTests.swift                   |  7 -------
 Clocker/Onboarding/Onboarding.storyboard       | 16 ++++++++--------
 .../Appearance/AppearanceViewController.swift  |  1 +
 7 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/Clocker/Clocker.xcodeproj/project.pbxproj b/Clocker/Clocker.xcodeproj/project.pbxproj
index e9ebe48..b84d6b5 100755
--- a/Clocker/Clocker.xcodeproj/project.pbxproj
+++ b/Clocker/Clocker.xcodeproj/project.pbxproj
@@ -227,7 +227,6 @@
 		3508CCA9259A0027000E3530 /* StatusContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusContainerView.swift; sourceTree = "<group>"; };
 		352AF497232E07B400D96FA7 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		352AF499232E07B400D96FA7 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Localizable.strings; sourceTree = "<group>"; };
-		354BB0842574810500097121 /* Keys.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Keys.plist; path = ../Internal/Keys.plist; sourceTree = "<group>"; };
 		3569A44E25441F320087E254 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		357391852507277500D30819 /* HourMarkerViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HourMarkerViewItem.swift; sourceTree = "<group>"; };
 		357391862507277500D30819 /* HourMarkerViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HourMarkerViewItem.xib; sourceTree = "<group>"; };
@@ -235,6 +234,7 @@
 		35B2FEB1259A1649005DA84D /* StartupKit */ = {isa = PBXFileReference; lastKnownFileType = folder; path = StartupKit; sourceTree = "<group>"; };
 		35B2FED4259A2244005DA84D /* CoreLoggerKit */ = {isa = PBXFileReference; lastKnownFileType = folder; path = CoreLoggerKit; sourceTree = "<group>"; };
 		35B2FEE4259A2C25005DA84D /* CoreModelKit */ = {isa = PBXFileReference; lastKnownFileType = folder; path = CoreModelKit; sourceTree = "<group>"; };
+		35B2FF02259A3F69005DA84D /* Keys.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Keys.plist; path = ../Internal/Keys.plist; sourceTree = "<group>"; };
 		35C11E2024873A550031F18C /* VersionUpdateHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionUpdateHandler.swift; sourceTree = "<group>"; };
 		35C36EE822595F13002FA5C6 /* OnboardingPermissionsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPermissionsViewController.swift; sourceTree = "<group>"; };
 		35C36EE922595F13002FA5C6 /* OnboardingWelcomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingWelcomeViewController.swift; sourceTree = "<group>"; };
@@ -818,10 +818,10 @@
 		DD4F7BF913C30F9F00825C6E = {
 			isa = PBXGroup;
 			children = (
+				35B2FF02259A3F69005DA84D /* Keys.plist */,
 				35B2FEE4259A2C25005DA84D /* CoreModelKit */,
 				35B2FED4259A2244005DA84D /* CoreLoggerKit */,
 				35B2FEB1259A1649005DA84D /* StartupKit */,
-				354BB0842574810500097121 /* Keys.plist */,
 				35C36F9B2259EC97002FA5C6 /* Events and Reminders */,
 				35C36F382259D80C002FA5C6 /* Overall App */,
 				35C36F242259D64D002FA5C6 /* Panel */,
diff --git a/Clocker/Clocker.xcodeproj/xcshareddata/xcschemes/Clocker.xcscheme b/Clocker/Clocker.xcodeproj/xcshareddata/xcschemes/Clocker.xcscheme
index c825819..d1ace0a 100644
--- a/Clocker/Clocker.xcodeproj/xcshareddata/xcschemes/Clocker.xcscheme
+++ b/Clocker/Clocker.xcodeproj/xcshareddata/xcschemes/Clocker.xcscheme
@@ -39,7 +39,9 @@
       </MacroExpansion>
       <Testables>
          <TestableReference
-            skipped = "YES">
+            skipped = "YES"
+            parallelizable = "YES"
+            testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "C2BFE3E22049F82300825BE5"
@@ -49,7 +51,9 @@
             </BuildableReference>
          </TestableReference>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "YES"
+            testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "C20839C621515C1E00C86589"
@@ -58,6 +62,16 @@
                ReferencedContainer = "container:Clocker.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CoreModelKitTests"
+               BuildableName = "CoreModelKitTests"
+               BlueprintName = "CoreModelKitTests"
+               ReferencedContainer = "container:CoreModelKit">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/Clocker/ClockerUITests/AboutUsTests.swift b/Clocker/ClockerUITests/AboutUsTests.swift
index 1d61bb6..7900fa0 100644
--- a/Clocker/ClockerUITests/AboutUsTests.swift
+++ b/Clocker/ClockerUITests/AboutUsTests.swift
@@ -33,7 +33,7 @@ class AboutUsTests: XCTestCase {
         tapAboutTab()
 
         let appDisplayName = "CFBundleDisplayName".localizedString()
-        let expectedVersion = "\(appDisplayName) 20.10.03 (83)"
+        let expectedVersion = "\(appDisplayName) 20.10.03 (86)"
 
         guard let presentVersion = app.windows["Clocker"].staticTexts["ClockerVersion"].value as? String else {
             XCTFail("Present version not present")
diff --git a/Clocker/ClockerUITests/ClockerUITests.m b/Clocker/ClockerUITests/ClockerUITests.m
index b0604bc..c33a74c 100644
--- a/Clocker/ClockerUITests/ClockerUITests.m
+++ b/Clocker/ClockerUITests/ClockerUITests.m
@@ -97,11 +97,12 @@
     XCUIElement *appearance = [[self.app.toolbars buttons] elementBoundByIndex: 1];
     [appearance click];
     
-    XCUIElement *timeFormat = self.app.radioButtons[@"12-hour clock"];
-    [timeFormat click];
-    
+    XCUIElement *timeFormat = [self.app.popUpButtons[@"TimeFormatPopover"] firstMatch];
+    [timeFormat click]; // Open Time Format Popover
+    XCUIElementQuery *const query = [[[timeFormat childrenMatchingType:XCUIElementTypeMenu] firstMatch] childrenMatchingType:0];
+    [[query elementBoundByIndex:0] click]; // 0 is 12-Hour
+ 
     XCUIElementQuery *mainTableView = [[self.app.tables[@"mainTableView"] cells] staticTexts];
-    
     NSPredicate *timeCells = [NSPredicate predicateWithFormat:@"identifier like 'ActualTime'"];
     XCUIElementQuery *elements = [mainTableView matchingPredicate:timeCells];
     
@@ -121,8 +122,10 @@
     XCUIElement *appearance = [[self.app.toolbars buttons] elementBoundByIndex: 1];
     [appearance click];
     
-    XCUIElement *timeFormat = self.app.radioButtons[@"24-hour clock"];
+    XCUIElement *timeFormat = self.app.popUpButtons[@"TimeFormatPopover"];
     [timeFormat click];
+  XCUIElementQuery *const query = [[[timeFormat childrenMatchingType:XCUIElementTypeMenu] firstMatch] childrenMatchingType:0];
+  [[query elementBoundByIndex:1] click]; // 1 is 24-Hour
     
     XCUIElementQuery *mainTableView = [[self.app.tables[@"mainTableView"] cells] staticTexts];
     
diff --git a/Clocker/CoreLoggerKit/Tests/CoreLoggerKitTests/CoreLoggerKitTests.swift b/Clocker/CoreLoggerKit/Tests/CoreLoggerKitTests/CoreLoggerKitTests.swift
index a5adf3d..297d241 100644
--- a/Clocker/CoreLoggerKit/Tests/CoreLoggerKitTests/CoreLoggerKitTests.swift
+++ b/Clocker/CoreLoggerKit/Tests/CoreLoggerKitTests/CoreLoggerKitTests.swift
@@ -2,13 +2,6 @@
 import XCTest
 
 final class CoreLoggerKitTests: XCTestCase {
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct
-        // results.
-        XCTAssertEqual(CoreLoggerKit().text, "Hello, World!")
-    }
-
     static var allTests = [
         ("testExample", testExample),
     ]
diff --git a/Clocker/Onboarding/Onboarding.storyboard b/Clocker/Onboarding/Onboarding.storyboard
index b444010..1c914a5 100644
--- a/Clocker/Onboarding/Onboarding.storyboard
+++ b/Clocker/Onboarding/Onboarding.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="fde-UX-327">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="fde-UX-327">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -613,7 +613,7 @@ DQ
                 </viewController>
                 <customObject id="VtX-cF-vU0" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1984" y="749.5"/>
+            <point key="canvasLocation" x="1983.5" y="749.5"/>
         </scene>
         <!--Final Onboarding View Controller-->
         <scene sceneID="5L4-Km-YMW">
@@ -648,11 +648,11 @@ DQ
                                 </textFieldCell>
                             </textField>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="nbC-4o-Xjf">
-                                <rect key="frame" x="122" y="245" width="294" height="24"/>
+                                <rect key="frame" x="122" y="246" width="294" height="23"/>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" imageScaling="proportionallyDown" image="Dark Menubar" id="cZ2-x0-bJ2"/>
                             </imageView>
                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="kMo-BE-OAn">
-                                <rect key="frame" x="120" y="189" width="298" height="16"/>
+                                <rect key="frame" x="120" y="190" width="298" height="16"/>
                                 <textFieldCell key="cell" selectable="YES" title="Multiline Label" id="M4F-nv-Eyo">
                                     <font key="font" size="12" name="Avenir-Book"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -660,7 +660,7 @@ DQ
                                 </textFieldCell>
                             </textField>
                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6WD-GP-iz1">
-                                <rect key="frame" x="122" y="139" width="288" height="22"/>
+                                <rect key="frame" x="122" y="140" width="288" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="OvB-hh-3zl"/>
                                 </constraints>
@@ -671,7 +671,7 @@ DQ
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qLP-tx-m41" customClass="UnderlinedButton" customModule="Clocker" customModuleProvider="target">
-                                <rect key="frame" x="117" y="102" width="293" height="14"/>
+                                <rect key="frame" x="117" y="103" width="293" height="14"/>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="left" imageScaling="proportionallyDown" inset="2" id="o87-us-e82">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" size="13" name="Avenir-Book"/>
@@ -718,6 +718,6 @@ DQ
     </scenes>
     <resources>
         <image name="ClockerIcon-512" width="1024" height="1024"/>
-        <image name="Dark Menubar" width="276" height="24"/>
+        <image name="Dark Menubar" width="235" height="23"/>
     </resources>
 </document>
diff --git a/Clocker/Preferences/Appearance/AppearanceViewController.swift b/Clocker/Preferences/Appearance/AppearanceViewController.swift
index 921ed42..5847010 100644
--- a/Clocker/Preferences/Appearance/AppearanceViewController.swift
+++ b/Clocker/Preferences/Appearance/AppearanceViewController.swift
@@ -47,6 +47,7 @@ class AppearanceViewController: ParentViewController {
         timeFormat.item(at: 8)?.isEnabled = false
         timeFormat.autoenablesItems = false
         timeFormat.selectItem(at: chosenFormat)
+        timeFormat.setAccessibilityIdentifier("TimeFormatPopover")
 
         informationLabel.setAccessibilityIdentifier("InformationLabel")