Skip to content

Commit 3e904ef

Browse files
patrickoppelpatrickoppel
authored
Merge pull request #2 from AeroRust/no_std-test-fixes
functional_tests - improve readability and use vec & no_std attribute
2 parents 3c46eb0 + 533f16e commit 3e904ef

File tree

3 files changed

+204
-187
lines changed

3 files changed

+204
-187
lines changed

Diff for: ‎src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// limitations under the License.
2121
//
2222

23-
// #![no_std]
23+
#![cfg_attr(not(any(feature = "std", test)), no_std)]
2424

2525
mod parse;
2626
mod sentences;

Diff for: ‎tests/file_log_parser/mod.rs

+93-93
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::{
77

88
use nmea::{parse, Nmea};
99

10-
use crate::dump_satellites;
10+
use crate::format_satellites;
1111

1212
#[test]
1313
fn test_parse_file_log() {
@@ -88,100 +88,100 @@ fn test_parse_all_logs() {
8888
}
8989

9090
let sat_state = match i {
91-
0 => {
92-
"{Beidou 2 Some(11.0) Some(112.0) None}, \
93-
{Beidou 5 Some(28.0) Some(135.0) None}, \
94-
{Beidou 7 Some(22.0) Some(49.0) None}, \
95-
{Beidou 9 Some(2.0) Some(118.0) None}, \
96-
{Beidou 10 Some(36.0) Some(54.0) Some(18.0)}, \
97-
{Beidou 11 Some(20.0) Some(75.0) Some(18.0)}, \
98-
{Beidou 12 Some(5.0) Some(29.0) None}, \
99-
{Beidou 19 Some(0.0) Some(0.0) None}, \
100-
{Beidou 20 Some(37.0) Some(296.0) Some(30.0)}, \
101-
{Beidou 23 Some(66.0) Some(39.0) Some(17.0)}, \
102-
{Beidou 25 Some(19.0) Some(68.0) None}, \
103-
{Beidou 28 Some(3.0) Some(153.0) None}, \
104-
{Galileo 2 Some(56.0) Some(46.0) None}, \
105-
{Galileo 3 Some(11.0) Some(149.0) None}, \
106-
{Galileo 7 Some(54.0) Some(298.0) None}, \
107-
{Galileo 8 Some(60.0) Some(174.0) None}, \
108-
{Galileo 11 Some(1.0) Some(46.0) None}, \
109-
{Galileo 25 Some(8.0) Some(52.0) None}, \
110-
{Galileo 27 Some(11.0) Some(233.0) None}, \
111-
{Galileo 30 Some(66.0) Some(239.0) None}, \
112-
{Gps 5 Some(19.0) Some(222.0) Some(19.0)}, \
113-
{Gps 7 Some(5.0) Some(90.0) Some(18.0)}, \
114-
{Gps 13 Some(84.0) Some(239.0) Some(23.0)}, \
115-
{Gps 14 Some(56.0) Some(52.0) Some(16.0)}, \
116-
{Gps 15 Some(50.0) Some(296.0) Some(30.0)}, \
117-
{Gps 17 Some(35.0) Some(125.0) Some(24.0)}, \
118-
{Gps 19 Some(23.0) Some(147.0) None}, \
119-
{Gps 20 Some(3.0) Some(201.0) None}, \
120-
{Gps 23 Some(11.0) Some(319.0) Some(23.0)}, \
121-
{Gps 24 Some(16.0) Some(284.0) Some(25.0)}, \
122-
{Gps 28 Some(0.0) Some(0.0) Some(19.0)}, \
123-
{Gps 30 Some(28.0) Some(84.0) Some(20.0)}, \
124-
{Glonass 68 Some(39.0) Some(185.0) Some(28.0)}, \
125-
{Glonass 69 Some(63.0) Some(275.0) Some(34.0)}, \
126-
{Glonass 70 Some(14.0) Some(330.0) Some(22.0)}, \
127-
{Glonass 79 Some(61.0) Some(298.0) Some(36.0)}, \
128-
{Glonass 81 Some(0.0) Some(0.0) Some(17.0)}, \
129-
{Glonass 87 Some(14.0) Some(39.0) None}, \
130-
{Glonass 88 Some(15.0) Some(82.0) None}"
131-
}
132-
1 => {
133-
"{Gps 1 Some(9.0) Some(74.0) None}, \
134-
{Gps 8 Some(3.0) Some(29.0) Some(22.0)}, \
135-
{Gps 10 Some(4.0) Some(350.0) Some(18.0)}, \
136-
{Gps 11 Some(19.0) Some(59.0) Some(19.0)}, \
137-
{Gps 13 Some(59.0) Some(220.0) None}, \
138-
{Gps 15 Some(45.0) Some(281.0) None}, \
139-
{Gps 17 Some(36.0) Some(151.0) None}, \
140-
{Gps 18 Some(11.0) Some(323.0) None}, \
141-
{Gps 19 Some(17.0) Some(170.0) None}, \
142-
{Gps 20 Some(6.0) Some(258.0) None}, \
143-
{Gps 24 Some(13.0) Some(288.0) None}, \
144-
{Gps 28 Some(65.0) Some(71.0) None}, \
145-
{Gps 30 Some(35.0) Some(109.0) None}, \
146-
{Glonass 65 Some(24.0) Some(229.0) None}, \
147-
{Glonass 66 Some(38.0) Some(296.0) None}, \
148-
{Glonass 67 Some(11.0) Some(347.0) Some(18.0)}, \
149-
{Glonass 74 Some(35.0) Some(78.0) None}, \
150-
{Glonass 75 Some(76.0) Some(343.0) None}, \
151-
{Glonass 76 Some(29.0) Some(279.0) None}, \
152-
{Glonass 83 Some(13.0) Some(12.0) Some(10.0)}, \
153-
{Glonass 84 Some(41.0) Some(67.0) None}, \
154-
{Glonass 85 Some(26.0) Some(132.0) None}"
155-
}
156-
2 => {
157-
"{Gps 2 Some(35.0) Some(291.0) None}, \
158-
{Gps 3 Some(9.0) Some(129.0) None}, \
159-
{Gps 5 Some(14.0) Some(305.0) None}, \
160-
{Gps 6 Some(38.0) Some(226.0) None}, \
161-
{Gps 7 Some(56.0) Some(177.0) None}, \
162-
{Gps 9 Some(70.0) Some(67.0) None}, \
163-
{Gps 16 Some(20.0) Some(55.0) None}, \
164-
{Gps 23 Some(41.0) Some(76.0) None}, \
165-
{Gps 26 Some(10.0) Some(30.0) None}, \
166-
{Gps 29 Some(5.0) Some(341.0) None}, \
167-
{Gps 30 Some(26.0) Some(199.0) None}, \
168-
{Gps 36 Some(30.0) Some(158.0) None}, \
169-
{Gps 49 Some(32.0) Some(192.0) None}, \
170-
{Glonass 66 Some(45.0) Some(91.0) None}, \
171-
{Glonass 67 Some(67.0) Some(334.0) None}, \
172-
{Glonass 68 Some(17.0) Some(297.0) None}, \
173-
{Glonass 75 Some(13.0) Some(25.0) None}, \
174-
{Glonass 76 Some(49.0) Some(59.0) None}, \
175-
{Glonass 77 Some(40.0) Some(156.0) None}, \
176-
{Glonass 78 Some(0.0) Some(183.0) None}, \
177-
{Glonass 82 Some(15.0) Some(246.0) None}, \
178-
{Glonass 83 Some(28.0) Some(298.0) None}, \
179-
{Glonass 84 Some(10.0) Some(352.0) None}"
180-
}
91+
0 => vec![
92+
"{Beidou 2 Some(11.0) Some(112.0) None}",
93+
"{Beidou 5 Some(28.0) Some(135.0) None}",
94+
"{Beidou 7 Some(22.0) Some(49.0) None}",
95+
"{Beidou 9 Some(2.0) Some(118.0) None}",
96+
"{Beidou 10 Some(36.0) Some(54.0) Some(18.0)}",
97+
"{Beidou 11 Some(20.0) Some(75.0) Some(18.0)}",
98+
"{Beidou 12 Some(5.0) Some(29.0) None}",
99+
"{Beidou 19 Some(0.0) Some(0.0) None}",
100+
"{Beidou 20 Some(37.0) Some(296.0) Some(30.0)}",
101+
"{Beidou 23 Some(66.0) Some(39.0) Some(17.0)}",
102+
"{Beidou 25 Some(19.0) Some(68.0) None}",
103+
"{Beidou 28 Some(3.0) Some(153.0) None}",
104+
"{Galileo 2 Some(56.0) Some(46.0) None}",
105+
"{Galileo 3 Some(11.0) Some(149.0) None}",
106+
"{Galileo 7 Some(54.0) Some(298.0) None}",
107+
"{Galileo 8 Some(60.0) Some(174.0) None}",
108+
"{Galileo 11 Some(1.0) Some(46.0) None}",
109+
"{Galileo 25 Some(8.0) Some(52.0) None}",
110+
"{Galileo 27 Some(11.0) Some(233.0) None}",
111+
"{Galileo 30 Some(66.0) Some(239.0) None}",
112+
"{Gps 5 Some(19.0) Some(222.0) Some(19.0)}",
113+
"{Gps 7 Some(5.0) Some(90.0) Some(18.0)}",
114+
"{Gps 13 Some(84.0) Some(239.0) Some(23.0)}",
115+
"{Gps 14 Some(56.0) Some(52.0) Some(16.0)}",
116+
"{Gps 15 Some(50.0) Some(296.0) Some(30.0)}",
117+
"{Gps 17 Some(35.0) Some(125.0) Some(24.0)}",
118+
"{Gps 19 Some(23.0) Some(147.0) None}",
119+
"{Gps 20 Some(3.0) Some(201.0) None}",
120+
"{Gps 23 Some(11.0) Some(319.0) Some(23.0)}",
121+
"{Gps 24 Some(16.0) Some(284.0) Some(25.0)}",
122+
"{Gps 28 Some(0.0) Some(0.0) Some(19.0)}",
123+
"{Gps 30 Some(28.0) Some(84.0) Some(20.0)}",
124+
"{Glonass 68 Some(39.0) Some(185.0) Some(28.0)}",
125+
"{Glonass 69 Some(63.0) Some(275.0) Some(34.0)}",
126+
"{Glonass 70 Some(14.0) Some(330.0) Some(22.0)}",
127+
"{Glonass 79 Some(61.0) Some(298.0) Some(36.0)}",
128+
"{Glonass 81 Some(0.0) Some(0.0) Some(17.0)}",
129+
"{Glonass 87 Some(14.0) Some(39.0) None}",
130+
"{Glonass 88 Some(15.0) Some(82.0) None}"
131+
],
132+
1 => vec![
133+
"{Gps 1 Some(9.0) Some(74.0) None}",
134+
"{Gps 8 Some(3.0) Some(29.0) Some(22.0)}",
135+
"{Gps 10 Some(4.0) Some(350.0) Some(18.0)}",
136+
"{Gps 11 Some(19.0) Some(59.0) Some(19.0)}",
137+
"{Gps 13 Some(59.0) Some(220.0) None}",
138+
"{Gps 15 Some(45.0) Some(281.0) None}",
139+
"{Gps 17 Some(36.0) Some(151.0) None}",
140+
"{Gps 18 Some(11.0) Some(323.0) None}",
141+
"{Gps 19 Some(17.0) Some(170.0) None}",
142+
"{Gps 20 Some(6.0) Some(258.0) None}",
143+
"{Gps 24 Some(13.0) Some(288.0) None}",
144+
"{Gps 28 Some(65.0) Some(71.0) None}",
145+
"{Gps 30 Some(35.0) Some(109.0) None}",
146+
"{Glonass 65 Some(24.0) Some(229.0) None}",
147+
"{Glonass 66 Some(38.0) Some(296.0) None}",
148+
"{Glonass 67 Some(11.0) Some(347.0) Some(18.0)}",
149+
"{Glonass 74 Some(35.0) Some(78.0) None}",
150+
"{Glonass 75 Some(76.0) Some(343.0) None}",
151+
"{Glonass 76 Some(29.0) Some(279.0) None}",
152+
"{Glonass 83 Some(13.0) Some(12.0) Some(10.0)}",
153+
"{Glonass 84 Some(41.0) Some(67.0) None}",
154+
"{Glonass 85 Some(26.0) Some(132.0) None}"
155+
],
156+
2 => vec![
157+
"{Gps 2 Some(35.0) Some(291.0) None}",
158+
"{Gps 3 Some(9.0) Some(129.0) None}",
159+
"{Gps 5 Some(14.0) Some(305.0) None}",
160+
"{Gps 6 Some(38.0) Some(226.0) None}",
161+
"{Gps 7 Some(56.0) Some(177.0) None}",
162+
"{Gps 9 Some(70.0) Some(67.0) None}",
163+
"{Gps 16 Some(20.0) Some(55.0) None}",
164+
"{Gps 23 Some(41.0) Some(76.0) None}",
165+
"{Gps 26 Some(10.0) Some(30.0) None}",
166+
"{Gps 29 Some(5.0) Some(341.0) None}",
167+
"{Gps 30 Some(26.0) Some(199.0) None}",
168+
"{Gps 36 Some(30.0) Some(158.0) None}",
169+
"{Gps 49 Some(32.0) Some(192.0) None}",
170+
"{Glonass 66 Some(45.0) Some(91.0) None}",
171+
"{Glonass 67 Some(67.0) Some(334.0) None}",
172+
"{Glonass 68 Some(17.0) Some(297.0) None}",
173+
"{Glonass 75 Some(13.0) Some(25.0) None}",
174+
"{Glonass 76 Some(49.0) Some(59.0) None}",
175+
"{Glonass 77 Some(40.0) Some(156.0) None}",
176+
"{Glonass 78 Some(0.0) Some(183.0) None}",
177+
"{Glonass 82 Some(15.0) Some(246.0) None}",
178+
"{Glonass 83 Some(28.0) Some(298.0) None}",
179+
"{Glonass 84 Some(10.0) Some(352.0) None}"
180+
],
181181
_ => panic!("You need to add sat state for new log here"),
182182
};
183-
assert_eq!(sat_state, dump_satellites(nmea1.satellites()));
184-
assert_eq!(sat_state, dump_satellites(nmea2.satellites()));
183+
assert_eq!(sat_state, format_satellites(nmea1.satellites()));
184+
assert_eq!(sat_state, format_satellites(nmea2.satellites()));
185185
}
186186
}
187187

0 commit comments

Comments
 (0)