Merge pull request #1726 from finos/conformance-test-rename

Removed version numbers from conformance test names

Author: kriswest

CHANGELOG.md

@@ -25,7 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Increased FDC3 Conformance Test WindowCloseWaitTime to 2000 (from 1000). ([#1586](https://github.com/finos/FDC3/issues/1586))
 * Enhanced method binding for FDC3 API objects to support destructuring. All public methods of `Channel`, `PrivateChannel`, and `IntentResolution` objects are now properly bound to their instances using `.bind(this)` in their constructors. ([#1645](https://github.com/finos/FDC3/issues/1645))
 * Changed fdc3-web-impl to not deliver broadcast messages back to the sending application, as recommended (SHOULD) in the Standard. [#1749](https://github.com/finos/FDC3/pull/1749)
-
+* Removed version number prefix from conformance test names and implementation to simplify future maintenance. ([#1726](https://github.com/finos/FDC3/pull/1726))
 
 ### Deprecated
 

toolbox/fdc3-conformance/README.md

@@ -5,7 +5,7 @@ A framework for testing whether desktop containers implement the [FDC3 standard]
 
 The tests implemented for each FDC3 version are based on the FDC3 Conformance tests specifications defined by the FDC3 maintainers and hosted on the [FDC3 website](https://fdc3.finos.org/docs/api/conformance/Conformance-Overview). 
 
-Tests in this module currently implement versions 2.0 and 2.2 of the FDC3 Standard.  For old 1.2 conformance testing, please see the [archived FDC3 Conformance project](https://github.com/finos/FDC3-Conformance-Framework) 
+Tests in this module currently implement versions 2.0 and 2.2 of the FDC3 Standard.  For old 1.2 conformance testing, please see the [archived FDC3 Conformance project](https://github.com/finos/FDC3-Conformance-Framework).
 
 ## What Is It?
 

toolbox/fdc3-conformance/eslint.config.mjs

@@ -7,6 +7,7 @@ import eslintConfigPrettier from 'eslint-config-prettier';
 export default [
   { files: ['**/*.{js,mjs,cjs,ts}'] },
   { languageOptions: { globals: globals.browser } },
+  { parsetOptions: { tsconfigRootDir: 'src' } },
   pluginJs.configs.recommended,
   ...tseslint.configs.recommended,
   eslintConfigPrettier,

toolbox/fdc3-conformance/instructions.md

@@ -1,14 +1,14 @@
 # How to Apply For FDC3 Certification for a Desktop Agent
 
-## 1. Run The Conformance Tests Yourself.
+## 1. Run The Conformance Tests Yourself
 
 See [Readme](README.md) about how to do this.  
- 
+
 ## 2. Raise An Issue On This project
 
 [Raise An Issue](https://github.com/finos/FDC3/issues) tagging it with `conformance`.  
 
-In all likelihood, you will need to liase with the maintainers of this project in order to get the conformance tests to work with your desktop agent.  
+In all likelihood, you will need to liaise with the maintainers of this project in order to get the conformance tests to work with your desktop agent.  
 
 This will also kick off the process of applying for the "FDC3 Certified" mark.
 
@@ -48,5 +48,4 @@ On completion of the above steps you will be given your certificate via the [Cre
 
 ## 8.  Re-Certification
 
-Certification only applies to a single version of your software product. FINOS reserves the right to allow certification to carry over at no additional cost for minor/maintenance version changes of your desktop agent if no backward incompatible changes are introduced in those versions. 
-
+Certification only applies to a single version of your software product. FINOS reserves the right to allow certification to carry over at no additional cost for minor/maintenance version changes of your desktop agent if no backward incompatible changes are introduced in those versions.

toolbox/fdc3-conformance/package.json

@@ -12,7 +12,7 @@
     "copy": "shx mkdir -p ./dist && shx cp -R static/* ./dist",
     "build": "webpack build && npm run copy",
     "serve": "npx http-server ./dist -p 3001 -c-1",
-    "dev": "npm run build && npm run serve",
+    "dev": "npm run clean && npm run build && npm run serve",
     "clean": "rimraf dist"
   },
   "dependencies": {

toolbox/fdc3-conformance/src/context-types.ts

@@ -1,4 +1,3 @@
-/** same in 1.2 and 2.0 */
 export interface CommonContext {
   id?: {
     [key: string]: string;

…/fdc3-conformance/src/mock/v2.0/basic.ts …olbox/fdc3-conformance/src/mock/basic.tstoolbox/fdc3-conformance/src/mock/v2.0/basic.ts renamed to toolbox/fdc3-conformance/src/mock/basic.ts toolbox/fdc3-conformance/src/mock/v2.0/basic.ts renamed to toolbox/fdc3-conformance/src/mock/basic.ts

@@ -1,8 +1,7 @@
-import { closeWindowOnCompletion } from './mock-functions';
+import { closeWindowOnCompletion, sendContextToTests } from './mock-functions';
 import { getAgent } from '@finos/fdc3';
-import { sendContextToTests } from './mock-functions';
-import { AppControlContext } from '../../context-types';
-import { ControlContextType, Intent } from '../../test/support/intent-support-2.0';
+import { AppControlContext } from '../context-types';
+import { ControlContextType, Intent } from '../test/support/intent-support';
 
 getAgent().then(async fdc3 => {
   await closeWindowOnCompletion(fdc3);

…dc3-conformance/src/mock/v2.0/channel.ts …box/fdc3-conformance/src/mock/channel.tstoolbox/fdc3-conformance/src/mock/v2.0/channel.ts renamed to toolbox/fdc3-conformance/src/mock/channel.ts toolbox/fdc3-conformance/src/mock/v2.0/channel.ts renamed to toolbox/fdc3-conformance/src/mock/channel.ts

@@ -1,6 +1,6 @@
-import { ChannelService2_0 } from './support/channel-support-2.0';
+import { ChannelServiceImpl } from './support/channel-support';
 import { Context, getAgent } from '@finos/fdc3';
-import { Fdc3CommandExecutor } from '../channel-command';
+import { Fdc3CommandExecutor } from './channel-command';
 
 getAgent().then(fdc3 => {
   let firedOnce = false;
@@ -9,7 +9,7 @@ getAgent().then(fdc3 => {
     if (firedOnce === false && context.type == 'channelsAppContext') {
       firedOnce = true;
       const commandExecutor = new Fdc3CommandExecutor();
-      commandExecutor.executeCommands(context.commands, context.config, new ChannelService2_0(fdc3));
+      commandExecutor.executeCommands(context.commands, context.config, new ChannelServiceImpl(fdc3));
     }
   });
 });

toolbox/fdc3-conformance/src/mock/constants.ts

@@ -8,5 +8,5 @@ export const commands = {
   retrieveTestAppChannel: 'retrieveTestAppChannel',
   broadcastInstrumentContext: 'broadcastInstrumentContext',
   broadcastContactContext: 'broadcastContactContext',
-  joinUserChannelOne: 'joinUserChannelOne', // v2.0
+  joinUserChannelOne: 'joinUserChannelOne',
 };

…dc3-conformance/src/mock/v2.0/general.ts …box/fdc3-conformance/src/mock/general.tstoolbox/fdc3-conformance/src/mock/v2.0/general.ts renamed to toolbox/fdc3-conformance/src/mock/general.ts toolbox/fdc3-conformance/src/mock/v2.0/general.ts renamed to toolbox/fdc3-conformance/src/mock/general.ts

@@ -1,7 +1,6 @@
-import { closeWindowOnCompletion } from './mock-functions';
+import { closeWindowOnCompletion, sendContextToTests } from './mock-functions';
 import { getAgent, Context } from '@finos/fdc3';
-import { sendContextToTests } from '../v2.0/mock-functions';
-import { AppControlContext } from '../../context-types';
+import { AppControlContext } from '../context-types';
 
 getAgent().then(async fdc3 => {
   await closeWindowOnCompletion(fdc3);