Skip to content

Commit

Permalink
Tests fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@dsalantic
dsalantic committed Aug 26, 2020
1 parent b5d3344 commit 2f45f35
Show file tree
Hide file tree
Showing 6 changed files with 447 additions and 352 deletions.
8 changes: 5 additions & 3 deletions asterix/test/test_parse.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ def test_ParseCAT048(self):
self.assertEqual(packet[0]['I250'][0], {'TARGET_ALT_STATUS': {'desc': 'Status of Target ALT source bits',
'meaning': 'No source information provided',
'val': 0},
'res': {'desc': 'Reserved', 'val': 0},
'res1': {'desc': 'Reserved 1', 'val': 0},
'res2': {'desc': 'Reserved 2', 'val': 0},
'FMS_ALT': {'desc': 'FMS Selected Altitude', 'val': 0.0},
'APP': {'desc': 'APPROACH Mode', 'meaning': 'Not active', 'val': 0},
'ALT_HOLD': {'desc': 'ALT HOLD Mode', 'meaning': 'Not active',
Expand Down Expand Up @@ -126,7 +127,8 @@ def test_ParseCAT048_nodescription(self):
'CHdg': {'val': 124.002685546875}})
self.assertEqual(packet[0]['I220'], {'ACAddr': {'val': '3C660C'}})
self.assertEqual(packet[0]['I250'][0], {'TARGET_ALT_STATUS': {'val': 0},
'res': {'val': 0},
'res1': {'val': 0},
'res2': {'val': 0},
'FMS_ALT': {'val': 0.0},
'APP': {'val': 0},
'ALT_HOLD': {'val': 0},
Expand Down Expand Up @@ -389,7 +391,7 @@ def test_ParseCAT062CAT065(self):

self.assertEqual(packet[1]['I390']['RDS'], {'NU1': {'desc': 'First number', 'val': ' '},
'LTR': {'desc': 'Letter', 'val': ' '},
'NU2': {'desc': 'Second number', 'val': ' '}})
'NU2': {'desc': 'Second number', 'val': ''}})

self.assertEqual(packet[1]['I390']['WTC'],
{'WTC': {'desc': 'Wake Turbulence Category', 'val': 'M'}})
Expand Down
16 changes: 8 additions & 8 deletions install/sample_output/cat_001_002.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<ASTERIX ver="1" length="23" crc="C3141406" timestamp="45826414" hexdata="01001AF7C619C9A00EB2767F189408AA42D8033405C8800D400E" cat="1"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>2</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3762</tpn></I161><I040><RHO>236.9921875</RHO><THETA>34.5629883</THETA></I040><I200><CalcGS>487.9600000</CalcGS><CalcHdg>93.9990234</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>1464</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>370.0000000</ModeC></I090><I141><Time>256.1015625</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" length="23" crc="906485F6" timestamp="45826414" hexdata="01001AF7C619C9B00F7561EC1A14077EB5550E5205508014400E" cat="1"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>3</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3957</tpn></I161><I040><RHO>195.8437500</RHO><THETA>36.6723633</THETA></I040><I200><CalcGS>421.9600000</CalcGS><CalcHdg>254.9981689</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>7122</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>340.0000000</ModeC></I090><I141><Time>256.1562500</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" length="23" crc="646E354E" timestamp="45826414" hexdata="01001AF7C619C9B00DCA69DE1A7C07F011110E3006188016400E" cat="1"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>3</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3530</tpn></I161><I040><RHO>211.7343750</RHO><THETA>37.2436523</THETA></I040><I200><CalcGS>447.0400000</CalcGS><CalcHdg>23.9996338</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>7060</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>390.0000000</ModeC></I090><I141><Time>256.1718750</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" length="23" crc="7F3A77FF" timestamp="45826414" hexdata="01001AF7C619C9B00D685C881CE008424FA4004A04D88022400E" cat="1"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>3</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3432</tpn></I161><I040><RHO>185.0625000</RHO><THETA>40.6054688</THETA></I040><I200><CalcGS>465.0800000</CalcGS><CalcHdg>111.9946289</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>0112</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>310.0000000</ModeC></I090><I141><Time>256.2656250</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" length="8" crc="F99F71EB" timestamp="45826414" hexdata="02000BF019C90250598117" cat="2"><I010><SAC>25</SAC><SIC>201</SIC></I010><I000><type>2</type></I000><I020><Azi>112.5000000</Azi></I020><I030><ToD>45826.1796875</ToD></I030></ASTERIX>
<ASTERIX ver="1" length="23" crc="87B79637" timestamp="45826414" hexdata="01001AF7C619C9B00CE173571E28081DD1100AC405A08028400E" cat="1"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>3</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3297</tpn></I161><I040><RHO>230.6796875</RHO><THETA>42.4072266</THETA></I040><I200><CalcGS>456.9400000</CalcGS><CalcHdg>293.9941406</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>5304</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>360.0000000</ModeC></I090><I141><Time>256.3125000</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" length="23" crc="0651441B" timestamp="45826414" hexdata="01001AF7C619C9A00C10514C212C05DCE2D7059E025A8038400E" cat="1"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>2</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3088</tpn></I161><I040><RHO>162.5937500</RHO><THETA>46.6479492</THETA></I040><I200><CalcGS>330.0000000</CalcGS><CalcHdg>318.9935303</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>2636</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>150.5000000</ModeC></I090><I141><Time>256.4375000</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" length="23" crc="BB67C462" timestamp="45826414" hexdata="01001AF7C619C9B00F0D37FE21C80755D1C605A505A0803B400E" cat="1"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>3</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3853</tpn></I161><I040><RHO>111.9843750</RHO><THETA>47.5048828</THETA></I040><I200><CalcGS>412.9400000</CalcGS><CalcHdg>294.9938965</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>2645</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>360.0000000</ModeC></I090><I141><Time>256.4609375</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" cat="1" length="23" crc="C3141406" timestamp="45826414" hexdata="01001AF7C619C9A00EB2767F189408AA42D8033405C8800D400E"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>2</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3762</tpn></I161><I040><RHO>236.9921875</RHO><THETA>34.5629883</THETA></I040><I200><CalcGS>487.9600000</CalcGS><CalcHdg>93.9990234</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>1464</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>370.0000000</ModeC></I090><I141><Time>256.1015625</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" cat="1" length="23" crc="906485F6" timestamp="45826414" hexdata="01001AF7C619C9B00F7561EC1A14077EB5550E5205508014400E"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>3</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3957</tpn></I161><I040><RHO>195.8437500</RHO><THETA>36.6723633</THETA></I040><I200><CalcGS>421.9600000</CalcGS><CalcHdg>254.9981689</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>7122</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>340.0000000</ModeC></I090><I141><Time>256.1562500</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" cat="1" length="23" crc="646E354E" timestamp="45826414" hexdata="01001AF7C619C9B00DCA69DE1A7C07F011110E3006188016400E"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>3</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3530</tpn></I161><I040><RHO>211.7343750</RHO><THETA>37.2436523</THETA></I040><I200><CalcGS>447.0400000</CalcGS><CalcHdg>23.9996338</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>7060</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>390.0000000</ModeC></I090><I141><Time>256.1718750</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" cat="1" length="23" crc="7F3A77FF" timestamp="45826414" hexdata="01001AF7C619C9B00D685C881CE008424FA4004A04D88022400E"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>3</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3432</tpn></I161><I040><RHO>185.0625000</RHO><THETA>40.6054688</THETA></I040><I200><CalcGS>465.0800000</CalcGS><CalcHdg>111.9946289</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>0112</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>310.0000000</ModeC></I090><I141><Time>256.2656250</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" cat="2" length="8" crc="F99F71EB" timestamp="45826414" hexdata="02000BF019C90250598117"><I010><SAC>25</SAC><SIC>201</SIC></I010><I000><type>2</type></I000><I020><Azi>112.5000000</Azi></I020><I030><ToD>45826.1796875</ToD></I030></ASTERIX>
<ASTERIX ver="1" cat="1" length="23" crc="87B79637" timestamp="45826414" hexdata="01001AF7C619C9B00CE173571E28081DD1100AC405A08028400E"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>3</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3297</tpn></I161><I040><RHO>230.6796875</RHO><THETA>42.4072266</THETA></I040><I200><CalcGS>456.9400000</CalcGS><CalcHdg>293.9941406</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>5304</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>360.0000000</ModeC></I090><I141><Time>256.3125000</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" cat="1" length="23" crc="0651441B" timestamp="45826414" hexdata="01001AF7C619C9A00C10514C212C05DCE2D7059E025A8038400E"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>2</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3088</tpn></I161><I040><RHO>162.5937500</RHO><THETA>46.6479492</THETA></I040><I200><CalcGS>330.0000000</CalcGS><CalcHdg>318.9935303</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>2636</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>150.5000000</ModeC></I090><I141><Time>256.4375000</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
<ASTERIX ver="1" cat="1" length="23" crc="BB67C462" timestamp="45826414" hexdata="01001AF7C619C9B00F0D37FE21C80755D1C605A505A0803B400E"><I010><SAC>25</SAC><SIC>201</SIC></I010><I020><TYP>1</TYP><SIM>0</SIM><SSRPSR>3</SSRPSR><ANT>0</ANT><SPI>0</SPI><RAB>0</RAB><FX>0</FX></I020><I161><tpn>3853</tpn></I161><I040><RHO>111.9843750</RHO><THETA>47.5048828</THETA></I040><I200><CalcGS>412.9400000</CalcGS><CalcHdg>294.9938965</CalcHdg></I200><I070><V>0</V><G>0</G><L>0</L><spare>0</spare><Mode3A>2645</Mode3A></I070><I090><V>0</V><G>0</G><ModeC>360.0000000</ModeC></I090><I141><Time>256.4609375</Time></I141><I170><CON>0</CON><RAD>1</RAD><MAN>0</MAN><DOU>0</DOU><RDPC>0</RDPC><spare>0</spare><GHO>0</GHO><FX>0</FX></I170><I210><Qty>7</Qty><FX>0</FX></I210></ASTERIX>
Loading

0 comments on commit 2f45f35

Please sign in to comment.