Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions packages/adt-contracts/tests/contracts/coverage.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/**
* ABAP Coverage contract scenarios
*
Expand All @@ -20,7 +20,6 @@
} from '../../src/adt/runtime/traces/coverage';
import { ContractScenario, runScenario, type ContractOperation } from './base';
import { TypedContractScenario, runTypedScenario } from './base/typed-scenario';
import { extractCoverageMeasurementId } from '../../src/adt/aunit/coverage-link';

const SCOV_CONTENT_TYPE = 'application/xml+scov';

Expand Down Expand Up @@ -140,47 +139,3 @@
}

runTypedScenario(new StatementsTypedScenario());

// ─────────────────────────────────────────────────────────────
// 4. Coverage link helper
// ─────────────────────────────────────────────────────────────

describe('extractCoverageMeasurementId', () => {
it('returns undefined when no coverage link is present', () => {
expect(extractCoverageMeasurementId({})).toBeUndefined();
expect(extractCoverageMeasurementId(null)).toBeUndefined();
});

it('finds the measurement id from a flat link array', () => {
// Atom link `rel` is an opaque relation-type URI per RFC 5988, not a
// network URL. Must match SAP wire format byte-for-byte.
const rel =
'http://www.sap.com/adt/relations/runtime/traces/coverage/measurements/coveredobjects'; // NOSONAR: link-relation identifier (not a URL)
const id = extractCoverageMeasurementId({
link: [
{
href: '/sap/bc/adt/runtime/traces/coverage/measurements/6D664D9B46CB1FE1859107ADE8729541/coveredobjects',
rel,
},
],
});
expect(id).toBe('6D664D9B46CB1FE1859107ADE8729541');
});

it('finds the measurement id by walking nested nodes', () => {
const id = extractCoverageMeasurementId({
program: {
testClasses: {
testClass: {
link: [
{
href: '/sap/bc/adt/runtime/traces/coverage/measurements/ABCDEF012345/statements',
},
],
},
},
},
});
expect(id).toBe('ABCDEF012345');
});
});
61 changes: 61 additions & 0 deletions packages/adt-contracts/tests/coverage-link.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/**
* Unit tests for the coverage-link helper.
*
* These are parser-only assertions (no HTTP contract), so they live
* outside tests/contracts/ which is reserved for ContractScenario /
* ContractOperation definitions.
*/

import { describe, it, expect } from 'vitest';
import { fixtures } from '@abapify/adt-fixtures';
import { aunitResult } from '../src/schemas';
import { extractCoverageMeasurementId } from '../src/adt/aunit/coverage-link';

describe('extractCoverageMeasurementId', () => {
it('returns undefined when no coverage link is present', () => {
expect(extractCoverageMeasurementId({})).toBeUndefined();
expect(extractCoverageMeasurementId(null)).toBeUndefined();
});

it('finds the measurement id from a flat link array', () => {
// Atom link `rel` is an opaque relation-type URI per RFC 5988, not a
// network URL. Must match SAP wire format byte-for-byte.
const rel =
'http://www.sap.com/adt/relations/runtime/traces/coverage/measurements/coveredobjects'; // NOSONAR: link-relation identifier (not a URL)
const id = extractCoverageMeasurementId({
link: [
{
href: '/sap/bc/adt/runtime/traces/coverage/measurements/6D664D9B46CB1FE1859107ADE8729541/coveredobjects',
rel,
},
],
});
expect(id).toBe('6D664D9B46CB1FE1859107ADE8729541');
});

it('finds the measurement id by walking nested nodes', () => {
const id = extractCoverageMeasurementId({
program: {
testClasses: {
testClass: {
link: [
{
href: '/sap/bc/adt/runtime/traces/coverage/measurements/ABCDEF012345/statements',
},
],
},
},
},
});
expect(id).toBe('ABCDEF012345');
});

it('preserves the Atom coverage measurement link from an AUnit result', async () => {
const xml = await fixtures.aunit.runResultCoverageLink.load();
const parsed = aunitResult.parse(xml);

expect(extractCoverageMeasurementId(parsed)).toBe(
'6D664D9B46CB1FE1859107ADE8729541',
);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<aunit:runResult xmlns:aunit="http://www.sap.com/adt/aunit" xmlns:atom="http://www.w3.org/2005/Atom">
<atom:link href="/sap/bc/adt/runtime/traces/coverage/measurements/6D664D9B46CB1FE1859107ADE8729541" rel="http://www.sap.com/adt/relations/runtime/traces/coverage/measurements"/>
</aunit:runResult>
1 change: 1 addition & 0 deletions packages/adt-fixtures/src/fixtures/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const registry = {
aunit: {
runRequest: 'aunit/run-request.xml',
runResult: 'aunit/run-result.xml',
runResultCoverageLink: 'aunit/run-result-coverage-link.xml',
// Sourced from jfilak/sapcli test fixtures (fixtures_adt_acoverage /
// fixtures_adt_coverage). Real sanitized SAP responses for the
// /runtime/traces/coverage endpoints.
Expand Down
4 changes: 4 additions & 0 deletions packages/adt-schemas/.xsd/custom/aunitResult.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,20 @@
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:aunit="http://www.sap.com/adt/aunit"
xmlns:atom="http://www.w3.org/2005/Atom"
targetNamespace="http://www.sap.com/adt/aunit"
elementFormDefault="qualified"
attributeFormDefault="unqualified">

<xsd:import namespace="http://www.w3.org/2005/Atom" schemaLocation="../sap/atom.xsd"/>

<!-- Root element -->
<xsd:element name="runResult" type="aunit:AunitRunResult"/>

<!-- Run Result -->
<xsd:complexType name="AunitRunResult">
<xsd:sequence>
<xsd:element ref="atom:link" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="program" type="aunit:AunitProgram" minOccurs="0" maxOccurs="unbounded" form="unqualified"/>
</xsd:sequence>
</xsd:complexType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@
* Source: xsd/custom/aunitResult.xsd
*/

import atom from '../sap/atom';

export default {
$xmlns: {
xsd: 'http://www.w3.org/2001/XMLSchema',
aunit: 'http://www.sap.com/adt/aunit',
atom: 'http://www.w3.org/2005/Atom',
},
$imports: [
atom,
],
targetNamespace: 'http://www.sap.com/adt/aunit',
attributeFormDefault: 'unqualified',
elementFormDefault: 'qualified',
Expand All @@ -24,6 +30,11 @@ export default {
name: 'AunitRunResult',
sequence: {
element: [
{
ref: 'atom:link',
minOccurs: '0',
maxOccurs: 'unbounded',
},
{
name: 'program',
type: 'aunit:AunitProgram',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@

export type AunitResultSchema = {
runResult: {
link?: undefined | {
href: string;
rel?: string | undefined;
type?: string | undefined;
hreflang?: string | undefined;
title?: string | undefined;
length?: number | undefined;
etag?: string | undefined;
_text?: string | undefined;
}[];
program?: undefined | {
testClasses?: undefined | {
testClass?: undefined | {
Expand Down
Loading