diff --git a/lib/MessageDecoder.test.ts b/lib/MessageDecoder.test.ts index b6d6257..9c86b40 100644 --- a/lib/MessageDecoder.test.ts +++ b/lib/MessageDecoder.test.ts @@ -20,9 +20,10 @@ describe('MessageDecoder', () => { expect(decodeResult.message).toBeDefined(); return; } - expect(decodeResult.message.label).toBe('H1'); - expect(decodeResult.message.sublabel).toBe('DF'); - expect(decodeResult.message.text).toContain('A350,000354'); + expect(decodeResult.message.label).toBe('MA'); + expect(decodeResult.message.sublabel).toBeUndefined(); + expect(decodeResult.message.text).toContain('T02!<<,'); + expect(decodeResult.raw.text).toContain('A350,000354'); }) test('Handles Multiple decodes', () => { diff --git a/lib/plugins/Label_MA.test.ts b/lib/plugins/Label_MA.test.ts index 06458ba..c6bfc97 100644 --- a/lib/plugins/Label_MA.test.ts +++ b/lib/plugins/Label_MA.test.ts @@ -24,7 +24,7 @@ describe('Label_MA', () => { const decodeResult = plugin.decode({ text: text }); expect(decodeResult.decoded).toBe(true); - expect(decodeResult.decoder.decodeLevel).toBe('partial'); + expect(decodeResult.decoder.decodeLevel).toBe('full'); expect(decodeResult.formatted.description).toBe('Unknown'); expect(decodeResult.raw.label).toBe('H1'); expect(decodeResult.raw.sublabel).toBe('DF'); diff --git a/lib/plugins/Label_MA.ts b/lib/plugins/Label_MA.ts index 12cee67..fed7200 100644 --- a/lib/plugins/Label_MA.ts +++ b/lib/plugins/Label_MA.ts @@ -20,7 +20,6 @@ export class Label_MA extends DecoderPlugin { if (miamResult.decoded && miamResult.message.data && miamResult.message.data.acars) { decodeResult.decoded = true; - decodeResult.decoder.decodeLevel = 'partial'; ResultFormatter.label(decodeResult, miamResult.message.data.acars.label); if(miamResult.message.data.acars.sublabel) { ResultFormatter.sublabel(decodeResult, miamResult.message.data.acars.sublabel); @@ -32,6 +31,7 @@ export class Label_MA extends DecoderPlugin { const messageText = miamResult.message.data.acars.text; // Only transplant message text if the MIAM core decoded message passed CRC and is complete if(miamResult.message.data.crcOk && miamResult.message.data.complete && messageText) { + decodeResult.decoder.decodeLevel = 'full'; const decoded = this.decoder.decode({ label: miamResult.message.data.acars.label, sublabel: miamResult.message.data.acars.sublabel, @@ -39,23 +39,18 @@ export class Label_MA extends DecoderPlugin { }, options); if(decoded.decoded) { - decodeResult.decoder.decodeLevel = decoded.decoder.decodeLevel; + // decodeResult.decoder.decodeLevel = decoded.decoder.decodeLevel; decodeResult.raw = {...decodeResult.raw, ...decoded.raw}; decodeResult.formatted.items.push(...decoded.formatted.items); } else { ResultFormatter.text(decodeResult, messageText); } - // for existing unit tetsts - do we want to do this? - message.text = messageText } else if(messageText) { + decodeResult.decoder.decodeLevel = 'partial'; ResultFormatter.text(decodeResult, messageText); + } else { + decodeResult.decoder.decodeLevel = 'partial'; } - - // This is for the existing unit test, i don't know if we actually want to do this - message.label = miamResult.message.data.acars.label; - message.sublabel = miamResult.message.data.acars.sublabel; - - return decodeResult; } return decodeResult; }