Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit 78197fe

Browse files
danielbareladanielbarela
committed
DFRS and Submit report tests
1 parent f0c1efa commit 78197fe

File tree

11 files changed

+638
-34
lines changed

11 files changed

+638
-34
lines changed

‎Marlin/Marlin.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@
142142
F74B9B0D28B7DA210097D448 /* RadioBeaconSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F74B9B0C28B7DA210097D448 /* RadioBeaconSummaryView.swift */; };
143143
F74B9B0F28B7DA8B0097D448 /* RadioBeaconActionBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = F74B9B0E28B7DA8B0097D448 /* RadioBeaconActionBar.swift */; };
144144
F74B9B1128B7DACB0097D448 /* RadioBeaconDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F74B9B1028B7DACB0097D448 /* RadioBeaconDetailView.swift */; };
145+
F75324B429805E5C005C509F /* DFRSSummaryViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75324B329805E5C005C509F /* DFRSSummaryViewTests.swift */; };
146+
F75324B629806329005C509F /* DFRSDetailViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75324B529806329005C509F /* DFRSDetailViewTests.swift */; };
147+
F75324B829807F04005C509F /* SubmitReportViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75324B729807F04005C509F /* SubmitReportViewTests.swift */; };
145148
F75F81D529526E9C0062A708 /* AsamSummaryViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75F81D429526E9C0062A708 /* AsamSummaryViewTests.swift */; };
146149
F75F81D8295DE0EF0062A708 /* AboutCellTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75F81D7295DE0EF0062A708 /* AboutCellTests.swift */; };
147150
F75F81DA295DE4640062A708 /* AboutViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75F81D9295DE4640062A708 /* AboutViewTests.swift */; };
@@ -480,6 +483,9 @@
480483
F74B9B0C28B7DA210097D448 /* RadioBeaconSummaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBeaconSummaryView.swift; sourceTree = "<group>"; };
481484
F74B9B0E28B7DA8B0097D448 /* RadioBeaconActionBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBeaconActionBar.swift; sourceTree = "<group>"; };
482485
F74B9B1028B7DACB0097D448 /* RadioBeaconDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBeaconDetailView.swift; sourceTree = "<group>"; };
486+
F75324B329805E5C005C509F /* DFRSSummaryViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DFRSSummaryViewTests.swift; sourceTree = "<group>"; };
487+
F75324B529806329005C509F /* DFRSDetailViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DFRSDetailViewTests.swift; sourceTree = "<group>"; };
488+
F75324B729807F04005C509F /* SubmitReportViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubmitReportViewTests.swift; sourceTree = "<group>"; };
483489
F75F81D229526D5C0062A708 /* libKIF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libKIF.a; sourceTree = BUILT_PRODUCTS_DIR; };
484490
F75F81D429526E9C0062A708 /* AsamSummaryViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsamSummaryViewTests.swift; sourceTree = "<group>"; };
485491
F75F81D7295DE0EF0062A708 /* AboutCellTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutCellTests.swift; sourceTree = "<group>"; };
@@ -923,6 +929,8 @@
923929
isa = PBXGroup;
924930
children = (
925931
F72D891A297F449C00D022FB /* DFRSDataTests.swift */,
932+
F75324B329805E5C005C509F /* DFRSSummaryViewTests.swift */,
933+
F75324B529806329005C509F /* DFRSDetailViewTests.swift */,
926934
);
927935
path = DFRS;
928936
sourceTree = "<group>";
@@ -1057,6 +1065,7 @@
10571065
F72281D9296F27D000218FC0 /* CurrentLocationTests.swift */,
10581066
F72281DE296F644600218FC0 /* DataSourceRailTests.swift */,
10591067
F72D88F72971FF8000D022FB /* HamburgerTests.swift */,
1068+
F75324B729807F04005C509F /* SubmitReportViewTests.swift */,
10601069
);
10611070
path = Views;
10621071
sourceTree = "<group>";
@@ -1880,6 +1889,7 @@
18801889
F72281D8296E232700218FC0 /* ChartCorrectionQueryTests.swift in Sources */,
18811890
F75F81DA295DE4640062A708 /* AboutViewTests.swift in Sources */,
18821891
F73ABC91295250D50085EDC5 /* SortViewModelTests.swift in Sources */,
1892+
F75324B829807F04005C509F /* SubmitReportViewTests.swift in Sources */,
18831893
F72281DA296F27D000218FC0 /* CurrentLocationTests.swift in Sources */,
18841894
F7C23E182911C7D50002A7DF /* ASAMDataTests.swift in Sources */,
18851895
F75F81DF295F68BB0062A708 /* BadgeTests.swift in Sources */,
@@ -1917,11 +1927,13 @@
19171927
F73ABC88295250BD0085EDC5 /* DataSourceFilterComparisonTests.swift in Sources */,
19181928
F7D8FA1D2922F7F300E7D0A1 /* NoticeToMarinersDataTests.swift in Sources */,
19191929
F73ABC8E295250C70085EDC5 /* DataSourceSortTests.swift in Sources */,
1930+
F75324B629806329005C509F /* DFRSDetailViewTests.swift in Sources */,
19201931
F72EAABC291C138000AC6026 /* PortDataTests.swift in Sources */,
19211932
F72D890E2979F48E00D022FB /* NavigationalWarningDetailTests.swift in Sources */,
19221933
F72EAAC1291C274100AC6026 /* DifferentialGPSStationDataTests.swift in Sources */,
19231934
F72D88FC29785CE100D022FB /* LightSummaryViewTests.swift in Sources */,
19241935
F72D89042979C30500D022FB /* PortSummaryViewTests.swift in Sources */,
1936+
F75324B429805E5C005C509F /* DFRSSummaryViewTests.swift in Sources */,
19251937
F72EAAD0291C669D00AC6026 /* LightDataTests.swift in Sources */,
19261938
F72EAACB291C635100AC6026 /* NavigationalWarningDataTests.swift in Sources */,
19271939
F75F81E729623AAA0062A708 /* MarlinBottomSheetTests.swift in Sources */,

‎Marlin/Marlin/DataSources/DFRS/DFRS+Annotation.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ extension DFRS: MKAnnotation, AnnotationWithView {
1616
}
1717

1818
var coordinate: CLLocationCoordinate2D {
19-
if CLLocationCoordinate2DIsValid(txCoordinate) {
19+
if txPosition != nil {
2020
return txCoordinate
21-
} else if CLLocationCoordinate2DIsValid(rxCoordinate) {
21+
} else if rxPosition != nil {
2222
return rxCoordinate
2323
}
2424
return kCLLocationCoordinate2DInvalid

‎Marlin/Marlin/DataSources/DFRS/DFRS+Decodable.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ struct DFRSProperties: Decodable {
8383
let rawProcedureText = try? values.decode(String.self, forKey: .procedureText)
8484
if let rawProcedureText = rawProcedureText {
8585
if rawProcedureText.hasSuffix("\n") {
86-
self.procedureText = "\(rawProcedureText.dropLast(2))"
86+
self.procedureText = "\(rawProcedureText.dropLast(1))"
8787
} else {
8888
self.procedureText = rawProcedureText
8989
}
@@ -99,7 +99,7 @@ struct DFRSProperties: Decodable {
9999
let rawRemarks = try? values.decode(String.self, forKey: .remarks)
100100
if let rawRemarks = rawRemarks {
101101
if rawRemarks.hasSuffix("\n") {
102-
self.remarks = "\(rawRemarks.dropLast(2))"
102+
self.remarks = "\(rawRemarks.dropLast(1))"
103103
} else {
104104
self.remarks = rawRemarks
105105
}
@@ -115,8 +115,8 @@ struct DFRSProperties: Decodable {
115115
self.rxPosition = rawRxPosition
116116
} else {
117117
self.rxPosition = nil
118-
self.rxLongitude = 0.0
119-
self.rxLatitude = 0.0
118+
self.rxLongitude = -190.0
119+
self.rxLatitude = -190.0
120120
}
121121

122122
self.stationName = try? values.decode(String.self, forKey: .stationName)
@@ -129,8 +129,8 @@ struct DFRSProperties: Decodable {
129129
self.txLatitude = coordinate.latitude
130130
self.txPosition = rawTxPosition
131131
} else {
132-
self.txLongitude = 0.0
133-
self.txLatitude = 0.0
132+
self.txLongitude = -190.0
133+
self.txLatitude = -190.0
134134
self.txPosition = nil
135135
}
136136

‎Marlin/Marlin/DataSources/DFRS/Views/DFRSActionBar.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ struct DFRSActionBar: View {
2121
}) {
2222
Text("More Details")
2323
}
24+
.accessibilityElement()
25+
.accessibilityLabel("More Details")
2426
} else if CLLocationCoordinate2DIsValid(dfrs.coordinate) {
2527
let coordinateButtonTitle = dfrs.coordinate.toDisplay()
2628

@@ -34,6 +36,8 @@ struct DFRSActionBar: View {
3436
Text(coordinateButtonTitle)
3537
.foregroundColor(Color.primaryColorVariant)
3638
}
39+
.accessibilityElement()
40+
.accessibilityLabel("Location")
3741
}
3842

3943
Spacer()
@@ -49,6 +53,8 @@ struct DFRSActionBar: View {
4953
.foregroundColor(Color.primaryColorVariant)
5054
})
5155
}
56+
.accessibilityElement()
57+
.accessibilityLabel("share")
5258
if showFocusButton && CLLocationCoordinate2DIsValid(dfrs.coordinate) {
5359
Button(action: {
5460
NotificationCenter.default.post(name: .MapRequestFocus, object: nil)
@@ -62,6 +68,8 @@ struct DFRSActionBar: View {
6268
.foregroundColor(Color.primaryColorVariant)
6369
})
6470
}
71+
.accessibilityElement()
72+
.accessibilityLabel("focus")
6573
}
6674
}.padding(.trailing, -8)
6775
}

‎Marlin/Marlin/DataSources/DFRS/Views/DFRSDetailView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct DFRSDetailView: View {
4242
mapState.center = MKCoordinateRegion(center: dfrs.coordinate, zoomLevel: 17.0, pixelWidth: 300.0)
4343
}
4444
}
45-
dfrs.summaryView(showMoreDetails: true)
45+
dfrs.summaryView(showMoreDetails: false, showSectionHeader: true)
4646
.padding(.all, 16)
4747
}
4848
.card()

‎Marlin/Marlin/Views/SubmitReportView.swift‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ struct SubmitReportView: View {
2323
Spacer()
2424
}
2525
})
26+
.accessibilityElement()
27+
.accessibilityLabel("Submit Anti-Shipping Activity Message (ASAM) Report")
28+
2629
Link(destination: URL(string: "https://msi.nga.mil/submit-report/Observ-Report")!, label: {
2730
HStack {
2831
Image(systemName: "eye.fill")
@@ -33,6 +36,9 @@ struct SubmitReportView: View {
3336
Spacer()
3437
}
3538
})
39+
.accessibilityElement()
40+
.accessibilityLabel("Submit Observer Report")
41+
3642
Link(destination: URL(string: "https://msi.nga.mil/submit-report/MODU-Report")!, label: {
3743
HStack {
3844
if let image = Modu.image {
@@ -45,6 +51,9 @@ struct SubmitReportView: View {
4551
Spacer()
4652
}
4753
})
54+
.accessibilityElement()
55+
.accessibilityLabel("Submit Mobile Offshore Drilling Unit (MODU) Movement Report")
56+
4857
Link(destination: URL(string: "https://msi.nga.mil/submit-report/Visit-Report")!, label: {
4958
HStack {
5059
if let image = Port.image {
@@ -57,6 +66,9 @@ struct SubmitReportView: View {
5766
Spacer()
5867
}
5968
})
69+
.accessibilityElement()
70+
.accessibilityLabel("Submit US Navy Port Visit Report")
71+
6072
Link(destination: URL(string: "https://msi.nga.mil/submit-report/SHAR-Report")!, label: {
6173
HStack {
6274
Image(systemName: "ferry.fill")
@@ -67,6 +79,8 @@ struct SubmitReportView: View {
6779
Spacer()
6880
}
6981
})
82+
.accessibilityElement()
83+
.accessibilityLabel("Submit Ship Hostile Action Report")
7084
}
7185
}
7286
.navigationTitle("Submit Report")
@@ -80,9 +94,3 @@ struct SubmitReportView: View {
8094
}
8195
}
8296
}
83-
84-
struct SubmitReportView_Previews: PreviewProvider {
85-
static var previews: some View {
86-
SubmitReportView()
87-
}
88-
}

0 commit comments

Comments
 (0)