Merge branch 'develop'

Author: paulsolt-ofsw

.gitignore

@@ -14,7 +14,6 @@ build/
 xcuserdata
 *.xcuserstate
 
-Mage.xcworkspace
-MAGE.xcworkspace
-
 Pods
+sonar-project.properties
+.sonar_lock

MAGE.xcodeproj/project.pbxproj

@@ -27,7 +27,8 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -37,6 +38,21 @@
             ReferencedContainer = "container:MAGE.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F7A94D6518AD9CB000CB9EE0"
+            BuildableName = "MAGE.app"
+            BlueprintName = "MAGE"
+            ReferencedContainer = "container:MAGE.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:MAGE.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -48,18 +64,31 @@
                ReferencedContainer = "container:MAGE.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F7C183A72CD2E13400BA7DCD"
+               BuildableName = "MAGEGeoPackageTests.xctest"
+               BlueprintName = "MAGEGeoPackageTests"
+               ReferencedContainer = "container:MAGE.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      enableASanStackUseAfterReturn = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
+      allowLocationSimulation = "YES"
+      queueDebuggingEnabled = "No">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference
@@ -108,7 +137,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

MAGE.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,83 @@
+{
+  "configurations" : [
+    {
+      "id" : "EA35DCE3-8567-4F1E-9349-44532C30FF5F",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : {
+      "targets" : [
+        {
+          "containerPath" : "container:MAGE.xcodeproj",
+          "identifier" : "F7A94D6518AD9CB000CB9EE0",
+          "name" : "MAGE"
+        }
+      ]
+    },
+    "environmentVariableEntries" : [
+      {
+        "key" : "OS_ACTIVITY_MODE",
+        "value" : "enable"
+      },
+      {
+        "enabled" : false,
+        "key" : "CFNETWORK_DIAGNOSTICS",
+        "value" : "3"
+      }
+    ],
+    "targetForVariableExpansion" : {
+      "containerPath" : "container:MAGE.xcodeproj",
+      "identifier" : "F7A94D6518AD9CB000CB9EE0",
+      "name" : "MAGE"
+    },
+    "testExecutionOrdering" : "random"
+  },
+  "testTargets" : [
+    {
+      "parallelizable" : true,
+      "skippedTests" : [
+        "AttachmentPushServiceTests",
+        "CanCreateObservationTests\/testInitializeTheCanCreateObservationAndLongPressTheMap()",
+        "EventChooserCoordinatorTests",
+        "FeedItemsViewControllerNoTimestampTests",
+        "FeedItemsViewControllerNoTimestampTests\/testOneFeedItemWithPrimaryAndSecondaryValueAndIcon()",
+        "FeedItemsViewControllerNoTimestampTests\/testOneFeedItemWithPrimaryValue()",
+        "FeedItemsViewControllerWithTimestampTests",
+        "FeedItemsViewControllerWithTimestampTests\/testOneFeedItemWithPrimaryAndSecondaryValueAndIconWithoutTimestamp()",
+        "MageServerTestsSwift\/testShouldFailWhenAnImageIsrReturned()",
+        "MageServiceTests",
+        "MageTests",
+        "MapDirectionsTests",
+        "ObservationModelTests",
+        "ObservationPushServiceTests",
+        "ObservationViewCardCollectionViewControllerTests",
+        "UserHeadingDisplayTests",
+        "UserTrackingMapTests\/testInitializeTheUserTrackingMapAndPressTheTrackLocationButtonLocationAuthorized()"
+      ],
+      "target" : {
+        "containerPath" : "container:MAGE.xcodeproj",
+        "identifier" : "F7ED5D2320052161007BD768",
+        "name" : "MAGETests"
+      }
+    },
+    {
+      "parallelizable" : false,
+      "skippedTests" : [
+        "GeoPackageImporterTests\/testImportGeoPackageFileIntoLayer()",
+        "GeoPackageLayerMapTests\/testInitializeTheStaticLayerMapWithANotLoadedLayerThenLoadItButDontAddItToTheMap()",
+        "GeoPackageTests\/testAddGeoPackageTileLayerThenReAdd()",
+        "GeoPackageTests\/testGetFeatureKeys()"
+      ],
+      "target" : {
+        "containerPath" : "container:MAGE.xcodeproj",
+        "identifier" : "F7C183A72CD2E13400BA7DCD",
+        "name" : "MAGEGeoPackageTests"
+      }
+    }
+  ],
+  "version" : 1
+}

MAGE.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,13 @@
+//
+//  MAGEGeoPackageTests-Bridging-Header.h
+//  MAGE
+//
+//  Created by Dan Barela on 10/31/24.
+//  Copyright © 2024 National Geospatial Intelligence Agency. All rights reserved.
+//
+
+
+#import <KIF/KIF.h>
+#import "MAGE-Bridging-Header.h"
+
+#import "TestingAppDelegate.h"

MAGE.xcodeproj/xcshareddata/xcschemes/MAGE.xcscheme

@@ -0,0 +1,36 @@
+//
+//  MAGEGeoPackageTests.swift
+//  MAGEGeoPackageTests
+//
+//  Created by Dan Barela on 10/30/24.
+//  Copyright © 2024 National Geospatial Intelligence Agency. All rights reserved.
+//
+
+import XCTest
+
+final class MAGEGeoPackageTests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+        // Any test you write for XCTest can be annotated as throws and async.
+        // Mark your test throws to produce an unexpected failure when your test encounters an uncaught error.
+        // Mark your test async to allow awaiting for asynchronous code to complete. Check the results with assertions afterwards.
+    }
+
+    func testPerformanceExample() throws {
+        // This is an example of a performance test case.
+        measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}