From c6a983116cd52240c2010c5053acffd9c59f5ef9 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 14 Jan 2022 11:07:52 +0100 Subject: [PATCH 1/9] chore: restructure folder for cts --- tests/package.json | 4 ++-- tests/src/{ => cts}/cts.ts | 2 +- tests/src/{ => cts}/generate.ts | 3 +-- tests/src/{ => cts}/main.ts | 2 +- tests/src/{ => cts}/templates.ts | 0 tests/src/{ => cts}/types.ts | 5 ----- tests/src/utils.ts | 5 +++++ 7 files changed, 10 insertions(+), 11 deletions(-) rename tests/src/{ => cts}/cts.ts (98%) rename tests/src/{ => cts}/generate.ts (92%) rename tests/src/{ => cts}/main.ts (95%) rename tests/src/{ => cts}/templates.ts (100%) rename tests/src/{ => cts}/types.ts (85%) diff --git a/tests/package.json b/tests/package.json index 94d3e9bd102..d3c8cbf98e5 100644 --- a/tests/package.json +++ b/tests/package.json @@ -7,8 +7,8 @@ "scripts": { "build": "tsc", "lint:fix": "yarn workspace javascript-tests lint:fix", - "generate": "node dist/tests/src/main.js ${0:-javascript} ${1:-search}", - "start": "yarn build && yarn generate ${0:-javascript} ${1:-search} && yarn lint:fix" + "generate:cts": "node dist/tests/src/cts/main.js ${0:-javascript} ${1:-search}", + "start": "yarn build && yarn generate:cts ${0:-javascript} ${1:-search} && yarn lint:fix" }, "devDependencies": { "@apidevtools/swagger-parser": "10.0.3", diff --git a/tests/src/cts.ts b/tests/src/cts/cts.ts similarity index 98% rename from tests/src/cts.ts rename to tests/src/cts/cts.ts index 2d8e220507d..5fc2b262718 100644 --- a/tests/src/cts.ts +++ b/tests/src/cts/cts.ts @@ -4,7 +4,7 @@ import SwaggerParser from '@apidevtools/swagger-parser'; import type { OpenAPIV3 } from 'openapi-types'; import type { CTS, CTSBlock, Tests } from './types'; -import { removeObjectName, walk } from './utils'; +import { removeObjectName, walk } from '../utils'; async function loadRequestsCTS(client: string): Promise { // load the list of operations from the spec diff --git a/tests/src/generate.ts b/tests/src/cts/generate.ts similarity index 92% rename from tests/src/generate.ts rename to tests/src/cts/generate.ts index 83e959c416a..ad53cdfcb6c 100644 --- a/tests/src/generate.ts +++ b/tests/src/cts/generate.ts @@ -5,8 +5,7 @@ import Mustache from 'mustache'; import { loadCTS } from './cts'; import { loadRequestsTemplate } from './templates'; import type { CTSBlock } from './types'; -import { extensionForLanguage } from './types'; -import { createClientName, packageNames } from './utils'; +import { createClientName, packageNames, extensionForLanguage } from '../utils'; async function createOutputDir(language: string): Promise { await fsp.mkdir(`output/${language}`, { recursive: true }); diff --git a/tests/src/main.ts b/tests/src/cts/main.ts similarity index 95% rename from tests/src/main.ts rename to tests/src/cts/main.ts index 00c8a86a52e..307a4bd21ae 100644 --- a/tests/src/main.ts +++ b/tests/src/cts/main.ts @@ -1,7 +1,7 @@ /* eslint-disable no-console */ import { generateTests } from './generate'; -import { packageNames } from './utils'; +import { packageNames } from '../utils'; function printUsage(): void { console.log(`usage: generateCTS language client`); diff --git a/tests/src/templates.ts b/tests/src/cts/templates.ts similarity index 100% rename from tests/src/templates.ts rename to tests/src/cts/templates.ts diff --git a/tests/src/types.ts b/tests/src/cts/types.ts similarity index 85% rename from tests/src/types.ts rename to tests/src/cts/types.ts index 9be17ec2b38..b6e62c2a7d1 100644 --- a/tests/src/types.ts +++ b/tests/src/cts/types.ts @@ -30,8 +30,3 @@ export type CTSBlock = { export type CTS = { requests: CTSBlock[]; }; - -export const extensionForLanguage: Record = { - javascript: 'test.ts', - java: 'java', -}; diff --git a/tests/src/utils.ts b/tests/src/utils.ts index 25c65426011..3377e72b244 100644 --- a/tests/src/utils.ts +++ b/tests/src/utils.ts @@ -56,3 +56,8 @@ export function removeObjectName(obj: Record): void { } } } + +export const extensionForLanguage: Record = { + javascript: 'test.ts', + java: 'java', +}; From e60fd39f4ea467772f3c9587ddb14fca06bf0c05 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 14 Jan 2022 11:13:18 +0100 Subject: [PATCH 2/9] chore: fix script --- tests/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/package.json b/tests/package.json index d3c8cbf98e5..31c1a624ded 100644 --- a/tests/package.json +++ b/tests/package.json @@ -7,8 +7,9 @@ "scripts": { "build": "tsc", "lint:fix": "yarn workspace javascript-tests lint:fix", + "generate": "yarn generate:cts ${0:-javascript} ${1:-search}", "generate:cts": "node dist/tests/src/cts/main.js ${0:-javascript} ${1:-search}", - "start": "yarn build && yarn generate:cts ${0:-javascript} ${1:-search} && yarn lint:fix" + "start": "yarn build && yarn generate ${0:-javascript} ${1:-search} && yarn lint:fix" }, "devDependencies": { "@apidevtools/swagger-parser": "10.0.3", From 011230c8f0b1342c9aed103eba838f97257cb888 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 14 Jan 2022 11:53:12 +0100 Subject: [PATCH 3/9] chore: restructure --- .../requests/abtesting.test.ts} | 0 .../requests/analytics.test.ts} | 0 .../requests/insights.test.ts} | 0 .../requests/personalization.test.ts} | 0 .../requests/query-suggestions.test.ts} | 0 .../requests/recommend.test.ts} | 0 .../requests/search.test.ts} | 0 tests/package.json | 4 ++-- tests/src/client/.gitkeep | 0 tests/src/integrations/.gitkeep | 0 tests/src/{cts => methods/requests}/cts.ts | 2 +- tests/src/{cts => methods/requests}/generate.ts | 13 +++++++++---- tests/src/{cts => methods/requests}/main.ts | 2 +- tests/src/{cts => methods/requests}/templates.ts | 0 tests/src/{cts => methods/requests}/types.ts | 0 15 files changed, 13 insertions(+), 8 deletions(-) rename tests/output/javascript/tests/{abtestingRequests.test.ts => methods/requests/abtesting.test.ts} (100%) rename tests/output/javascript/tests/{analyticsRequests.test.ts => methods/requests/analytics.test.ts} (100%) rename tests/output/javascript/tests/{insightsRequests.test.ts => methods/requests/insights.test.ts} (100%) rename tests/output/javascript/tests/{personalizationRequests.test.ts => methods/requests/personalization.test.ts} (100%) rename tests/output/javascript/tests/{query-suggestionsRequests.test.ts => methods/requests/query-suggestions.test.ts} (100%) rename tests/output/javascript/tests/{recommendRequests.test.ts => methods/requests/recommend.test.ts} (100%) rename tests/output/javascript/tests/{searchRequests.test.ts => methods/requests/search.test.ts} (100%) create mode 100644 tests/src/client/.gitkeep create mode 100644 tests/src/integrations/.gitkeep rename tests/src/{cts => methods/requests}/cts.ts (98%) rename tests/src/{cts => methods/requests}/generate.ts (78%) rename tests/src/{cts => methods/requests}/main.ts (95%) rename tests/src/{cts => methods/requests}/templates.ts (100%) rename tests/src/{cts => methods/requests}/types.ts (100%) diff --git a/tests/output/javascript/tests/abtestingRequests.test.ts b/tests/output/javascript/tests/methods/requests/abtesting.test.ts similarity index 100% rename from tests/output/javascript/tests/abtestingRequests.test.ts rename to tests/output/javascript/tests/methods/requests/abtesting.test.ts diff --git a/tests/output/javascript/tests/analyticsRequests.test.ts b/tests/output/javascript/tests/methods/requests/analytics.test.ts similarity index 100% rename from tests/output/javascript/tests/analyticsRequests.test.ts rename to tests/output/javascript/tests/methods/requests/analytics.test.ts diff --git a/tests/output/javascript/tests/insightsRequests.test.ts b/tests/output/javascript/tests/methods/requests/insights.test.ts similarity index 100% rename from tests/output/javascript/tests/insightsRequests.test.ts rename to tests/output/javascript/tests/methods/requests/insights.test.ts diff --git a/tests/output/javascript/tests/personalizationRequests.test.ts b/tests/output/javascript/tests/methods/requests/personalization.test.ts similarity index 100% rename from tests/output/javascript/tests/personalizationRequests.test.ts rename to tests/output/javascript/tests/methods/requests/personalization.test.ts diff --git a/tests/output/javascript/tests/query-suggestionsRequests.test.ts b/tests/output/javascript/tests/methods/requests/query-suggestions.test.ts similarity index 100% rename from tests/output/javascript/tests/query-suggestionsRequests.test.ts rename to tests/output/javascript/tests/methods/requests/query-suggestions.test.ts diff --git a/tests/output/javascript/tests/recommendRequests.test.ts b/tests/output/javascript/tests/methods/requests/recommend.test.ts similarity index 100% rename from tests/output/javascript/tests/recommendRequests.test.ts rename to tests/output/javascript/tests/methods/requests/recommend.test.ts diff --git a/tests/output/javascript/tests/searchRequests.test.ts b/tests/output/javascript/tests/methods/requests/search.test.ts similarity index 100% rename from tests/output/javascript/tests/searchRequests.test.ts rename to tests/output/javascript/tests/methods/requests/search.test.ts diff --git a/tests/package.json b/tests/package.json index 31c1a624ded..82fd1ec4501 100644 --- a/tests/package.json +++ b/tests/package.json @@ -7,8 +7,8 @@ "scripts": { "build": "tsc", "lint:fix": "yarn workspace javascript-tests lint:fix", - "generate": "yarn generate:cts ${0:-javascript} ${1:-search}", - "generate:cts": "node dist/tests/src/cts/main.js ${0:-javascript} ${1:-search}", + "generate": "yarn generate:methods:requets ${0:-javascript} ${1:-search}", + "generate:methods:requets": "node dist/tests/src/methods/requests/main.js ${0:-javascript} ${1:-search}", "start": "yarn build && yarn generate ${0:-javascript} ${1:-search} && yarn lint:fix" }, "devDependencies": { diff --git a/tests/src/client/.gitkeep b/tests/src/client/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/src/integrations/.gitkeep b/tests/src/integrations/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/src/cts/cts.ts b/tests/src/methods/requests/cts.ts similarity index 98% rename from tests/src/cts/cts.ts rename to tests/src/methods/requests/cts.ts index 5fc2b262718..9f7efad24cc 100644 --- a/tests/src/cts/cts.ts +++ b/tests/src/methods/requests/cts.ts @@ -4,7 +4,7 @@ import SwaggerParser from '@apidevtools/swagger-parser'; import type { OpenAPIV3 } from 'openapi-types'; import type { CTS, CTSBlock, Tests } from './types'; -import { removeObjectName, walk } from '../utils'; +import { removeObjectName, walk } from '../../utils'; async function loadRequestsCTS(client: string): Promise { // load the list of operations from the spec diff --git a/tests/src/cts/generate.ts b/tests/src/methods/requests/generate.ts similarity index 78% rename from tests/src/cts/generate.ts rename to tests/src/methods/requests/generate.ts index ad53cdfcb6c..244d2f17a83 100644 --- a/tests/src/cts/generate.ts +++ b/tests/src/methods/requests/generate.ts @@ -5,11 +5,16 @@ import Mustache from 'mustache'; import { loadCTS } from './cts'; import { loadRequestsTemplate } from './templates'; import type { CTSBlock } from './types'; -import { createClientName, packageNames, extensionForLanguage } from '../utils'; +import { + createClientName, + packageNames, + extensionForLanguage, +} from '../../utils'; async function createOutputDir(language: string): Promise { - await fsp.mkdir(`output/${language}`, { recursive: true }); - await fsp.mkdir(`output/${language}/tests`, { recursive: true }); + await fsp.mkdir(`output/${language}/tests/methods/requests`, { + recursive: true, + }); } async function generateRequestsTests( @@ -34,7 +39,7 @@ async function generateRequestsTests( ].includes(client), }); await fsp.writeFile( - `output/${language}/tests/${client}Requests.${extensionForLanguage[language]}`, + `output/${language}/tests/methods/requests/${client}.${extensionForLanguage[language]}`, code ); } diff --git a/tests/src/cts/main.ts b/tests/src/methods/requests/main.ts similarity index 95% rename from tests/src/cts/main.ts rename to tests/src/methods/requests/main.ts index 307a4bd21ae..b8b5ba95bf5 100644 --- a/tests/src/cts/main.ts +++ b/tests/src/methods/requests/main.ts @@ -1,7 +1,7 @@ /* eslint-disable no-console */ import { generateTests } from './generate'; -import { packageNames } from '../utils'; +import { packageNames } from '../../utils'; function printUsage(): void { console.log(`usage: generateCTS language client`); diff --git a/tests/src/cts/templates.ts b/tests/src/methods/requests/templates.ts similarity index 100% rename from tests/src/cts/templates.ts rename to tests/src/methods/requests/templates.ts diff --git a/tests/src/cts/types.ts b/tests/src/methods/requests/types.ts similarity index 100% rename from tests/src/cts/types.ts rename to tests/src/methods/requests/types.ts From 1404650e89d8c393f40ec1d3a216b15f13aeda61 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 14 Jan 2022 11:57:10 +0100 Subject: [PATCH 4/9] chore: testing ci --- tests/output/javascript/tests/methods/requests/search.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/output/javascript/tests/methods/requests/search.test.ts b/tests/output/javascript/tests/methods/requests/search.test.ts index 434d0a6d15d..2ac210b7a9d 100644 --- a/tests/output/javascript/tests/methods/requests/search.test.ts +++ b/tests/output/javascript/tests/methods/requests/search.test.ts @@ -16,7 +16,7 @@ describe('addApiKey', () => { maxHitsPerQuery: 20, })) as unknown as EchoResponse; - expect(req.path).toEqual('/1/keys'); + expect(req.path).toEqual('/1/keyssss'); expect(req.method).toEqual('POST'); expect(req.data).toEqual({ acl: ['search', 'addObject'], From ce48633fe4c018eee527939a7d6c4a40654f0c7d Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 14 Jan 2022 11:59:46 +0100 Subject: [PATCH 5/9] revert: chore: testing ci This reverts commit 1404650e89d8c393f40ec1d3a216b15f13aeda61. --- tests/output/javascript/tests/methods/requests/search.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/output/javascript/tests/methods/requests/search.test.ts b/tests/output/javascript/tests/methods/requests/search.test.ts index 2ac210b7a9d..434d0a6d15d 100644 --- a/tests/output/javascript/tests/methods/requests/search.test.ts +++ b/tests/output/javascript/tests/methods/requests/search.test.ts @@ -16,7 +16,7 @@ describe('addApiKey', () => { maxHitsPerQuery: 20, })) as unknown as EchoResponse; - expect(req.path).toEqual('/1/keyssss'); + expect(req.path).toEqual('/1/keys'); expect(req.method).toEqual('POST'); expect(req.data).toEqual({ acl: ['search', 'addObject'], From 6d5ce42d0f40a229a1209ed4ba66e85e45f91fe6 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 14 Jan 2022 12:01:37 +0100 Subject: [PATCH 6/9] chore: test ci --- specs/recommend/spec.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/specs/recommend/spec.yml b/specs/recommend/spec.yml index 3200a16c9e6..fe76ce3578e 100644 --- a/specs/recommend/spec.yml +++ b/specs/recommend/spec.yml @@ -7,8 +7,6 @@ components: securitySchemes: appId: $ref: '../common/securitySchemes.yml#/appId' - apiKey: - $ref: '../common/securitySchemes.yml#/apiKey' security: - appId: [] apiKey: [] From 5ba62ced77c7ce35a689c4eb4351649822f18b8f Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 14 Jan 2022 12:03:57 +0100 Subject: [PATCH 7/9] chore: test ci 2 --- specs/recommend/spec.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/specs/recommend/spec.yml b/specs/recommend/spec.yml index fe76ce3578e..d0185d1e562 100644 --- a/specs/recommend/spec.yml +++ b/specs/recommend/spec.yml @@ -7,6 +7,7 @@ components: securitySchemes: appId: $ref: '../common/securitySchemes.yml#/appId' + apiKey: security: - appId: [] apiKey: [] From 404e7eb3867aaaf1c690cae20e1da1a4c6929a71 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 14 Jan 2022 12:06:13 +0100 Subject: [PATCH 8/9] chore: revert tests --- specs/recommend/spec.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/specs/recommend/spec.yml b/specs/recommend/spec.yml index d0185d1e562..3200a16c9e6 100644 --- a/specs/recommend/spec.yml +++ b/specs/recommend/spec.yml @@ -8,6 +8,7 @@ components: appId: $ref: '../common/securitySchemes.yml#/appId' apiKey: + $ref: '../common/securitySchemes.yml#/apiKey' security: - appId: [] apiKey: [] From 90e1ae2b85d6da9d5666a1f6e0118d87dea31304 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 14 Jan 2022 14:31:52 +0100 Subject: [PATCH 9/9] chore: move cts specs --- .../{templates/java/requests.mustache => integration/.gitkeep} | 0 .../requests => methods/requests/abtesting}/addABTests.json | 0 .../requests => methods/requests/abtesting}/deleteABTest.json | 0 .../requests => methods/requests/abtesting}/getABTest.json | 0 .../requests => methods/requests/abtesting}/listABTests.json | 0 .../requests => methods/requests/abtesting}/stopABTest.json | 0 .../requests/analytics}/getAverageClickPosition.json | 0 .../requests/analytics}/getClickPositions.json | 0 .../requests/analytics}/getClickThroughRate.json | 0 .../requests/analytics}/getConversationRate.json | 0 .../requests => methods/requests/analytics}/getNoClickRate.json | 0 .../requests/analytics}/getNoResultsRate.json | 0 .../requests/analytics}/getSearchesCount.json | 0 .../requests/analytics}/getSearchesNoClicks.json | 0 .../requests/analytics}/getSearchesNoResults.json | 0 .../requests => methods/requests/analytics}/getStatus.json | 0 .../requests/analytics}/getTopCountries.json | 0 .../requests/analytics}/getTopFilterAttributes.json | 0 .../requests/analytics}/getTopFilterForAttribute.json | 0 .../requests/analytics}/getTopFiltersNoResults.json | 0 .../requests => methods/requests/analytics}/getTopHits.json | 0 .../requests => methods/requests/analytics}/getTopSearches.json | 0 .../requests => methods/requests/analytics}/getUsersCount.json | 0 .../requests => methods/requests/insights}/pushEvents.json | 0 .../requests/personalization}/deleteUserProfile.json | 0 .../requests/personalization}/getPersonalizationStrategy.json | 0 .../requests/personalization}/getUserTokenProfile.json | 0 .../requests/personalization}/setPersonalizationStrategy.json | 0 .../requests/query-suggestions}/createConfig.json | 0 .../requests/query-suggestions}/deleteConfig.json | 0 .../requests/query-suggestions}/getAllConfigs.json | 0 .../requests/query-suggestions}/getConfig.json | 0 .../requests/query-suggestions}/getConfigStatus.json | 0 .../requests/query-suggestions}/getLogFile.json | 0 .../requests/query-suggestions}/updateConfig.json | 0 .../requests/recommend}/getRecommendations.json | 0 .../search/requests => methods/requests/search}/addApiKey.json | 0 .../requests => methods/requests/search}/addOrUpdateObject.json | 0 .../requests => methods/requests/search}/appendSource.json | 0 .../requests => methods/requests/search}/assignUserId.json | 0 .../search/requests => methods/requests/search}/batch.json | 0 .../requests/search}/batchAssignUserIds.json | 0 .../requests/search}/batchDictionaryEntries.json | 0 .../search/requests => methods/requests/search}/batchRules.json | 0 .../search/requests => methods/requests/search}/browse.json | 0 .../requests => methods/requests/search}/clearAllSynonyms.json | 0 .../requests => methods/requests/search}/clearObjects.json | 0 .../search/requests => methods/requests/search}/clearRules.json | 0 .../requests => methods/requests/search}/deleteApiKey.json | 0 .../search/requests => methods/requests/search}/deleteBy.json | 0 .../requests => methods/requests/search}/deleteIndex.json | 0 .../requests => methods/requests/search}/deleteObject.json | 0 .../search/requests => methods/requests/search}/deleteRule.json | 0 .../requests => methods/requests/search}/deleteSource.json | 0 .../requests => methods/requests/search}/deleteSynonym.json | 0 .../search/requests => methods/requests/search}/getApiKey.json | 0 .../requests/search}/getDictionaryLanguages.json | 0 .../requests/search}/getDictionarySettings.json | 0 .../search/requests => methods/requests/search}/getLogs.json | 0 .../search/requests => methods/requests/search}/getObject.json | 0 .../search/requests => methods/requests/search}/getObjects.json | 0 .../search/requests => methods/requests/search}/getRule.json | 0 .../requests => methods/requests/search}/getSettings.json | 0 .../search/requests => methods/requests/search}/getSources.json | 0 .../search/requests => methods/requests/search}/getSynonym.json | 0 .../search/requests => methods/requests/search}/getTask.json | 0 .../requests => methods/requests/search}/getTopUserIds.json | 0 .../search/requests => methods/requests/search}/getUserId.json | 0 .../requests/search}/hasPendingMappings.json | 0 .../requests => methods/requests/search}/listApiKeys.json | 0 .../requests => methods/requests/search}/listClusters.json | 0 .../requests => methods/requests/search}/listIndices.json | 0 .../requests => methods/requests/search}/listUserIds.json | 0 .../requests => methods/requests/search}/multipleBatch.json | 0 .../requests => methods/requests/search}/multipleQueries.json | 0 .../requests => methods/requests/search}/operationIndex.json | 0 .../requests/search}/partialUpdateObject.json | 0 .../requests => methods/requests/search}/removeUserId.json | 0 .../requests => methods/requests/search}/replaceSources.json | 0 .../requests => methods/requests/search}/restoreApiKey.json | 0 .../search/requests => methods/requests/search}/saveObject.json | 0 .../search/requests => methods/requests/search}/saveRule.json | 0 .../requests => methods/requests/search}/saveSynonym.json | 0 .../requests => methods/requests/search}/saveSynonyms.json | 0 .../search/requests => methods/requests/search}/search.json | 0 .../requests/search}/searchDictionaryEntries.json | 0 .../requests/search}/searchForFacetValues.json | 0 .../requests => methods/requests/search}/searchRules.json | 0 .../requests => methods/requests/search}/searchSynonyms.json | 0 .../requests => methods/requests/search}/searchUserIds.json | 0 .../requests/search}/setDictionarySettings.json | 0 .../requests => methods/requests/search}/setSettings.json | 0 .../requests => methods/requests/search}/updateApiKey.json | 0 tests/CTS/methods/responses/.gitkeep | 0 tests/CTS/methods/templates/java/requests.mustache | 0 tests/CTS/{ => methods}/templates/javascript/requests.mustache | 0 tests/src/methods/requests/cts.ts | 2 +- tests/src/methods/requests/templates.ts | 2 +- 98 files changed, 2 insertions(+), 2 deletions(-) rename tests/CTS/{templates/java/requests.mustache => integration/.gitkeep} (100%) rename tests/CTS/{clients/abtesting/requests => methods/requests/abtesting}/addABTests.json (100%) rename tests/CTS/{clients/abtesting/requests => methods/requests/abtesting}/deleteABTest.json (100%) rename tests/CTS/{clients/abtesting/requests => methods/requests/abtesting}/getABTest.json (100%) rename tests/CTS/{clients/abtesting/requests => methods/requests/abtesting}/listABTests.json (100%) rename tests/CTS/{clients/abtesting/requests => methods/requests/abtesting}/stopABTest.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getAverageClickPosition.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getClickPositions.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getClickThroughRate.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getConversationRate.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getNoClickRate.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getNoResultsRate.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getSearchesCount.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getSearchesNoClicks.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getSearchesNoResults.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getStatus.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getTopCountries.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getTopFilterAttributes.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getTopFilterForAttribute.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getTopFiltersNoResults.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getTopHits.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getTopSearches.json (100%) rename tests/CTS/{clients/analytics/requests => methods/requests/analytics}/getUsersCount.json (100%) rename tests/CTS/{clients/insights/requests => methods/requests/insights}/pushEvents.json (100%) rename tests/CTS/{clients/personalization/requests => methods/requests/personalization}/deleteUserProfile.json (100%) rename tests/CTS/{clients/personalization/requests => methods/requests/personalization}/getPersonalizationStrategy.json (100%) rename tests/CTS/{clients/personalization/requests => methods/requests/personalization}/getUserTokenProfile.json (100%) rename tests/CTS/{clients/personalization/requests => methods/requests/personalization}/setPersonalizationStrategy.json (100%) rename tests/CTS/{clients/query-suggestions/requests => methods/requests/query-suggestions}/createConfig.json (100%) rename tests/CTS/{clients/query-suggestions/requests => methods/requests/query-suggestions}/deleteConfig.json (100%) rename tests/CTS/{clients/query-suggestions/requests => methods/requests/query-suggestions}/getAllConfigs.json (100%) rename tests/CTS/{clients/query-suggestions/requests => methods/requests/query-suggestions}/getConfig.json (100%) rename tests/CTS/{clients/query-suggestions/requests => methods/requests/query-suggestions}/getConfigStatus.json (100%) rename tests/CTS/{clients/query-suggestions/requests => methods/requests/query-suggestions}/getLogFile.json (100%) rename tests/CTS/{clients/query-suggestions/requests => methods/requests/query-suggestions}/updateConfig.json (100%) rename tests/CTS/{clients/recommend/requests => methods/requests/recommend}/getRecommendations.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/addApiKey.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/addOrUpdateObject.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/appendSource.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/assignUserId.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/batch.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/batchAssignUserIds.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/batchDictionaryEntries.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/batchRules.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/browse.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/clearAllSynonyms.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/clearObjects.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/clearRules.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/deleteApiKey.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/deleteBy.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/deleteIndex.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/deleteObject.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/deleteRule.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/deleteSource.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/deleteSynonym.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getApiKey.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getDictionaryLanguages.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getDictionarySettings.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getLogs.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getObject.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getObjects.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getRule.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getSettings.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getSources.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getSynonym.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getTask.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getTopUserIds.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/getUserId.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/hasPendingMappings.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/listApiKeys.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/listClusters.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/listIndices.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/listUserIds.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/multipleBatch.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/multipleQueries.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/operationIndex.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/partialUpdateObject.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/removeUserId.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/replaceSources.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/restoreApiKey.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/saveObject.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/saveRule.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/saveSynonym.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/saveSynonyms.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/search.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/searchDictionaryEntries.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/searchForFacetValues.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/searchRules.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/searchSynonyms.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/searchUserIds.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/setDictionarySettings.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/setSettings.json (100%) rename tests/CTS/{clients/search/requests => methods/requests/search}/updateApiKey.json (100%) create mode 100644 tests/CTS/methods/responses/.gitkeep create mode 100644 tests/CTS/methods/templates/java/requests.mustache rename tests/CTS/{ => methods}/templates/javascript/requests.mustache (100%) diff --git a/tests/CTS/templates/java/requests.mustache b/tests/CTS/integration/.gitkeep similarity index 100% rename from tests/CTS/templates/java/requests.mustache rename to tests/CTS/integration/.gitkeep diff --git a/tests/CTS/clients/abtesting/requests/addABTests.json b/tests/CTS/methods/requests/abtesting/addABTests.json similarity index 100% rename from tests/CTS/clients/abtesting/requests/addABTests.json rename to tests/CTS/methods/requests/abtesting/addABTests.json diff --git a/tests/CTS/clients/abtesting/requests/deleteABTest.json b/tests/CTS/methods/requests/abtesting/deleteABTest.json similarity index 100% rename from tests/CTS/clients/abtesting/requests/deleteABTest.json rename to tests/CTS/methods/requests/abtesting/deleteABTest.json diff --git a/tests/CTS/clients/abtesting/requests/getABTest.json b/tests/CTS/methods/requests/abtesting/getABTest.json similarity index 100% rename from tests/CTS/clients/abtesting/requests/getABTest.json rename to tests/CTS/methods/requests/abtesting/getABTest.json diff --git a/tests/CTS/clients/abtesting/requests/listABTests.json b/tests/CTS/methods/requests/abtesting/listABTests.json similarity index 100% rename from tests/CTS/clients/abtesting/requests/listABTests.json rename to tests/CTS/methods/requests/abtesting/listABTests.json diff --git a/tests/CTS/clients/abtesting/requests/stopABTest.json b/tests/CTS/methods/requests/abtesting/stopABTest.json similarity index 100% rename from tests/CTS/clients/abtesting/requests/stopABTest.json rename to tests/CTS/methods/requests/abtesting/stopABTest.json diff --git a/tests/CTS/clients/analytics/requests/getAverageClickPosition.json b/tests/CTS/methods/requests/analytics/getAverageClickPosition.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getAverageClickPosition.json rename to tests/CTS/methods/requests/analytics/getAverageClickPosition.json diff --git a/tests/CTS/clients/analytics/requests/getClickPositions.json b/tests/CTS/methods/requests/analytics/getClickPositions.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getClickPositions.json rename to tests/CTS/methods/requests/analytics/getClickPositions.json diff --git a/tests/CTS/clients/analytics/requests/getClickThroughRate.json b/tests/CTS/methods/requests/analytics/getClickThroughRate.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getClickThroughRate.json rename to tests/CTS/methods/requests/analytics/getClickThroughRate.json diff --git a/tests/CTS/clients/analytics/requests/getConversationRate.json b/tests/CTS/methods/requests/analytics/getConversationRate.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getConversationRate.json rename to tests/CTS/methods/requests/analytics/getConversationRate.json diff --git a/tests/CTS/clients/analytics/requests/getNoClickRate.json b/tests/CTS/methods/requests/analytics/getNoClickRate.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getNoClickRate.json rename to tests/CTS/methods/requests/analytics/getNoClickRate.json diff --git a/tests/CTS/clients/analytics/requests/getNoResultsRate.json b/tests/CTS/methods/requests/analytics/getNoResultsRate.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getNoResultsRate.json rename to tests/CTS/methods/requests/analytics/getNoResultsRate.json diff --git a/tests/CTS/clients/analytics/requests/getSearchesCount.json b/tests/CTS/methods/requests/analytics/getSearchesCount.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getSearchesCount.json rename to tests/CTS/methods/requests/analytics/getSearchesCount.json diff --git a/tests/CTS/clients/analytics/requests/getSearchesNoClicks.json b/tests/CTS/methods/requests/analytics/getSearchesNoClicks.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getSearchesNoClicks.json rename to tests/CTS/methods/requests/analytics/getSearchesNoClicks.json diff --git a/tests/CTS/clients/analytics/requests/getSearchesNoResults.json b/tests/CTS/methods/requests/analytics/getSearchesNoResults.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getSearchesNoResults.json rename to tests/CTS/methods/requests/analytics/getSearchesNoResults.json diff --git a/tests/CTS/clients/analytics/requests/getStatus.json b/tests/CTS/methods/requests/analytics/getStatus.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getStatus.json rename to tests/CTS/methods/requests/analytics/getStatus.json diff --git a/tests/CTS/clients/analytics/requests/getTopCountries.json b/tests/CTS/methods/requests/analytics/getTopCountries.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getTopCountries.json rename to tests/CTS/methods/requests/analytics/getTopCountries.json diff --git a/tests/CTS/clients/analytics/requests/getTopFilterAttributes.json b/tests/CTS/methods/requests/analytics/getTopFilterAttributes.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getTopFilterAttributes.json rename to tests/CTS/methods/requests/analytics/getTopFilterAttributes.json diff --git a/tests/CTS/clients/analytics/requests/getTopFilterForAttribute.json b/tests/CTS/methods/requests/analytics/getTopFilterForAttribute.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getTopFilterForAttribute.json rename to tests/CTS/methods/requests/analytics/getTopFilterForAttribute.json diff --git a/tests/CTS/clients/analytics/requests/getTopFiltersNoResults.json b/tests/CTS/methods/requests/analytics/getTopFiltersNoResults.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getTopFiltersNoResults.json rename to tests/CTS/methods/requests/analytics/getTopFiltersNoResults.json diff --git a/tests/CTS/clients/analytics/requests/getTopHits.json b/tests/CTS/methods/requests/analytics/getTopHits.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getTopHits.json rename to tests/CTS/methods/requests/analytics/getTopHits.json diff --git a/tests/CTS/clients/analytics/requests/getTopSearches.json b/tests/CTS/methods/requests/analytics/getTopSearches.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getTopSearches.json rename to tests/CTS/methods/requests/analytics/getTopSearches.json diff --git a/tests/CTS/clients/analytics/requests/getUsersCount.json b/tests/CTS/methods/requests/analytics/getUsersCount.json similarity index 100% rename from tests/CTS/clients/analytics/requests/getUsersCount.json rename to tests/CTS/methods/requests/analytics/getUsersCount.json diff --git a/tests/CTS/clients/insights/requests/pushEvents.json b/tests/CTS/methods/requests/insights/pushEvents.json similarity index 100% rename from tests/CTS/clients/insights/requests/pushEvents.json rename to tests/CTS/methods/requests/insights/pushEvents.json diff --git a/tests/CTS/clients/personalization/requests/deleteUserProfile.json b/tests/CTS/methods/requests/personalization/deleteUserProfile.json similarity index 100% rename from tests/CTS/clients/personalization/requests/deleteUserProfile.json rename to tests/CTS/methods/requests/personalization/deleteUserProfile.json diff --git a/tests/CTS/clients/personalization/requests/getPersonalizationStrategy.json b/tests/CTS/methods/requests/personalization/getPersonalizationStrategy.json similarity index 100% rename from tests/CTS/clients/personalization/requests/getPersonalizationStrategy.json rename to tests/CTS/methods/requests/personalization/getPersonalizationStrategy.json diff --git a/tests/CTS/clients/personalization/requests/getUserTokenProfile.json b/tests/CTS/methods/requests/personalization/getUserTokenProfile.json similarity index 100% rename from tests/CTS/clients/personalization/requests/getUserTokenProfile.json rename to tests/CTS/methods/requests/personalization/getUserTokenProfile.json diff --git a/tests/CTS/clients/personalization/requests/setPersonalizationStrategy.json b/tests/CTS/methods/requests/personalization/setPersonalizationStrategy.json similarity index 100% rename from tests/CTS/clients/personalization/requests/setPersonalizationStrategy.json rename to tests/CTS/methods/requests/personalization/setPersonalizationStrategy.json diff --git a/tests/CTS/clients/query-suggestions/requests/createConfig.json b/tests/CTS/methods/requests/query-suggestions/createConfig.json similarity index 100% rename from tests/CTS/clients/query-suggestions/requests/createConfig.json rename to tests/CTS/methods/requests/query-suggestions/createConfig.json diff --git a/tests/CTS/clients/query-suggestions/requests/deleteConfig.json b/tests/CTS/methods/requests/query-suggestions/deleteConfig.json similarity index 100% rename from tests/CTS/clients/query-suggestions/requests/deleteConfig.json rename to tests/CTS/methods/requests/query-suggestions/deleteConfig.json diff --git a/tests/CTS/clients/query-suggestions/requests/getAllConfigs.json b/tests/CTS/methods/requests/query-suggestions/getAllConfigs.json similarity index 100% rename from tests/CTS/clients/query-suggestions/requests/getAllConfigs.json rename to tests/CTS/methods/requests/query-suggestions/getAllConfigs.json diff --git a/tests/CTS/clients/query-suggestions/requests/getConfig.json b/tests/CTS/methods/requests/query-suggestions/getConfig.json similarity index 100% rename from tests/CTS/clients/query-suggestions/requests/getConfig.json rename to tests/CTS/methods/requests/query-suggestions/getConfig.json diff --git a/tests/CTS/clients/query-suggestions/requests/getConfigStatus.json b/tests/CTS/methods/requests/query-suggestions/getConfigStatus.json similarity index 100% rename from tests/CTS/clients/query-suggestions/requests/getConfigStatus.json rename to tests/CTS/methods/requests/query-suggestions/getConfigStatus.json diff --git a/tests/CTS/clients/query-suggestions/requests/getLogFile.json b/tests/CTS/methods/requests/query-suggestions/getLogFile.json similarity index 100% rename from tests/CTS/clients/query-suggestions/requests/getLogFile.json rename to tests/CTS/methods/requests/query-suggestions/getLogFile.json diff --git a/tests/CTS/clients/query-suggestions/requests/updateConfig.json b/tests/CTS/methods/requests/query-suggestions/updateConfig.json similarity index 100% rename from tests/CTS/clients/query-suggestions/requests/updateConfig.json rename to tests/CTS/methods/requests/query-suggestions/updateConfig.json diff --git a/tests/CTS/clients/recommend/requests/getRecommendations.json b/tests/CTS/methods/requests/recommend/getRecommendations.json similarity index 100% rename from tests/CTS/clients/recommend/requests/getRecommendations.json rename to tests/CTS/methods/requests/recommend/getRecommendations.json diff --git a/tests/CTS/clients/search/requests/addApiKey.json b/tests/CTS/methods/requests/search/addApiKey.json similarity index 100% rename from tests/CTS/clients/search/requests/addApiKey.json rename to tests/CTS/methods/requests/search/addApiKey.json diff --git a/tests/CTS/clients/search/requests/addOrUpdateObject.json b/tests/CTS/methods/requests/search/addOrUpdateObject.json similarity index 100% rename from tests/CTS/clients/search/requests/addOrUpdateObject.json rename to tests/CTS/methods/requests/search/addOrUpdateObject.json diff --git a/tests/CTS/clients/search/requests/appendSource.json b/tests/CTS/methods/requests/search/appendSource.json similarity index 100% rename from tests/CTS/clients/search/requests/appendSource.json rename to tests/CTS/methods/requests/search/appendSource.json diff --git a/tests/CTS/clients/search/requests/assignUserId.json b/tests/CTS/methods/requests/search/assignUserId.json similarity index 100% rename from tests/CTS/clients/search/requests/assignUserId.json rename to tests/CTS/methods/requests/search/assignUserId.json diff --git a/tests/CTS/clients/search/requests/batch.json b/tests/CTS/methods/requests/search/batch.json similarity index 100% rename from tests/CTS/clients/search/requests/batch.json rename to tests/CTS/methods/requests/search/batch.json diff --git a/tests/CTS/clients/search/requests/batchAssignUserIds.json b/tests/CTS/methods/requests/search/batchAssignUserIds.json similarity index 100% rename from tests/CTS/clients/search/requests/batchAssignUserIds.json rename to tests/CTS/methods/requests/search/batchAssignUserIds.json diff --git a/tests/CTS/clients/search/requests/batchDictionaryEntries.json b/tests/CTS/methods/requests/search/batchDictionaryEntries.json similarity index 100% rename from tests/CTS/clients/search/requests/batchDictionaryEntries.json rename to tests/CTS/methods/requests/search/batchDictionaryEntries.json diff --git a/tests/CTS/clients/search/requests/batchRules.json b/tests/CTS/methods/requests/search/batchRules.json similarity index 100% rename from tests/CTS/clients/search/requests/batchRules.json rename to tests/CTS/methods/requests/search/batchRules.json diff --git a/tests/CTS/clients/search/requests/browse.json b/tests/CTS/methods/requests/search/browse.json similarity index 100% rename from tests/CTS/clients/search/requests/browse.json rename to tests/CTS/methods/requests/search/browse.json diff --git a/tests/CTS/clients/search/requests/clearAllSynonyms.json b/tests/CTS/methods/requests/search/clearAllSynonyms.json similarity index 100% rename from tests/CTS/clients/search/requests/clearAllSynonyms.json rename to tests/CTS/methods/requests/search/clearAllSynonyms.json diff --git a/tests/CTS/clients/search/requests/clearObjects.json b/tests/CTS/methods/requests/search/clearObjects.json similarity index 100% rename from tests/CTS/clients/search/requests/clearObjects.json rename to tests/CTS/methods/requests/search/clearObjects.json diff --git a/tests/CTS/clients/search/requests/clearRules.json b/tests/CTS/methods/requests/search/clearRules.json similarity index 100% rename from tests/CTS/clients/search/requests/clearRules.json rename to tests/CTS/methods/requests/search/clearRules.json diff --git a/tests/CTS/clients/search/requests/deleteApiKey.json b/tests/CTS/methods/requests/search/deleteApiKey.json similarity index 100% rename from tests/CTS/clients/search/requests/deleteApiKey.json rename to tests/CTS/methods/requests/search/deleteApiKey.json diff --git a/tests/CTS/clients/search/requests/deleteBy.json b/tests/CTS/methods/requests/search/deleteBy.json similarity index 100% rename from tests/CTS/clients/search/requests/deleteBy.json rename to tests/CTS/methods/requests/search/deleteBy.json diff --git a/tests/CTS/clients/search/requests/deleteIndex.json b/tests/CTS/methods/requests/search/deleteIndex.json similarity index 100% rename from tests/CTS/clients/search/requests/deleteIndex.json rename to tests/CTS/methods/requests/search/deleteIndex.json diff --git a/tests/CTS/clients/search/requests/deleteObject.json b/tests/CTS/methods/requests/search/deleteObject.json similarity index 100% rename from tests/CTS/clients/search/requests/deleteObject.json rename to tests/CTS/methods/requests/search/deleteObject.json diff --git a/tests/CTS/clients/search/requests/deleteRule.json b/tests/CTS/methods/requests/search/deleteRule.json similarity index 100% rename from tests/CTS/clients/search/requests/deleteRule.json rename to tests/CTS/methods/requests/search/deleteRule.json diff --git a/tests/CTS/clients/search/requests/deleteSource.json b/tests/CTS/methods/requests/search/deleteSource.json similarity index 100% rename from tests/CTS/clients/search/requests/deleteSource.json rename to tests/CTS/methods/requests/search/deleteSource.json diff --git a/tests/CTS/clients/search/requests/deleteSynonym.json b/tests/CTS/methods/requests/search/deleteSynonym.json similarity index 100% rename from tests/CTS/clients/search/requests/deleteSynonym.json rename to tests/CTS/methods/requests/search/deleteSynonym.json diff --git a/tests/CTS/clients/search/requests/getApiKey.json b/tests/CTS/methods/requests/search/getApiKey.json similarity index 100% rename from tests/CTS/clients/search/requests/getApiKey.json rename to tests/CTS/methods/requests/search/getApiKey.json diff --git a/tests/CTS/clients/search/requests/getDictionaryLanguages.json b/tests/CTS/methods/requests/search/getDictionaryLanguages.json similarity index 100% rename from tests/CTS/clients/search/requests/getDictionaryLanguages.json rename to tests/CTS/methods/requests/search/getDictionaryLanguages.json diff --git a/tests/CTS/clients/search/requests/getDictionarySettings.json b/tests/CTS/methods/requests/search/getDictionarySettings.json similarity index 100% rename from tests/CTS/clients/search/requests/getDictionarySettings.json rename to tests/CTS/methods/requests/search/getDictionarySettings.json diff --git a/tests/CTS/clients/search/requests/getLogs.json b/tests/CTS/methods/requests/search/getLogs.json similarity index 100% rename from tests/CTS/clients/search/requests/getLogs.json rename to tests/CTS/methods/requests/search/getLogs.json diff --git a/tests/CTS/clients/search/requests/getObject.json b/tests/CTS/methods/requests/search/getObject.json similarity index 100% rename from tests/CTS/clients/search/requests/getObject.json rename to tests/CTS/methods/requests/search/getObject.json diff --git a/tests/CTS/clients/search/requests/getObjects.json b/tests/CTS/methods/requests/search/getObjects.json similarity index 100% rename from tests/CTS/clients/search/requests/getObjects.json rename to tests/CTS/methods/requests/search/getObjects.json diff --git a/tests/CTS/clients/search/requests/getRule.json b/tests/CTS/methods/requests/search/getRule.json similarity index 100% rename from tests/CTS/clients/search/requests/getRule.json rename to tests/CTS/methods/requests/search/getRule.json diff --git a/tests/CTS/clients/search/requests/getSettings.json b/tests/CTS/methods/requests/search/getSettings.json similarity index 100% rename from tests/CTS/clients/search/requests/getSettings.json rename to tests/CTS/methods/requests/search/getSettings.json diff --git a/tests/CTS/clients/search/requests/getSources.json b/tests/CTS/methods/requests/search/getSources.json similarity index 100% rename from tests/CTS/clients/search/requests/getSources.json rename to tests/CTS/methods/requests/search/getSources.json diff --git a/tests/CTS/clients/search/requests/getSynonym.json b/tests/CTS/methods/requests/search/getSynonym.json similarity index 100% rename from tests/CTS/clients/search/requests/getSynonym.json rename to tests/CTS/methods/requests/search/getSynonym.json diff --git a/tests/CTS/clients/search/requests/getTask.json b/tests/CTS/methods/requests/search/getTask.json similarity index 100% rename from tests/CTS/clients/search/requests/getTask.json rename to tests/CTS/methods/requests/search/getTask.json diff --git a/tests/CTS/clients/search/requests/getTopUserIds.json b/tests/CTS/methods/requests/search/getTopUserIds.json similarity index 100% rename from tests/CTS/clients/search/requests/getTopUserIds.json rename to tests/CTS/methods/requests/search/getTopUserIds.json diff --git a/tests/CTS/clients/search/requests/getUserId.json b/tests/CTS/methods/requests/search/getUserId.json similarity index 100% rename from tests/CTS/clients/search/requests/getUserId.json rename to tests/CTS/methods/requests/search/getUserId.json diff --git a/tests/CTS/clients/search/requests/hasPendingMappings.json b/tests/CTS/methods/requests/search/hasPendingMappings.json similarity index 100% rename from tests/CTS/clients/search/requests/hasPendingMappings.json rename to tests/CTS/methods/requests/search/hasPendingMappings.json diff --git a/tests/CTS/clients/search/requests/listApiKeys.json b/tests/CTS/methods/requests/search/listApiKeys.json similarity index 100% rename from tests/CTS/clients/search/requests/listApiKeys.json rename to tests/CTS/methods/requests/search/listApiKeys.json diff --git a/tests/CTS/clients/search/requests/listClusters.json b/tests/CTS/methods/requests/search/listClusters.json similarity index 100% rename from tests/CTS/clients/search/requests/listClusters.json rename to tests/CTS/methods/requests/search/listClusters.json diff --git a/tests/CTS/clients/search/requests/listIndices.json b/tests/CTS/methods/requests/search/listIndices.json similarity index 100% rename from tests/CTS/clients/search/requests/listIndices.json rename to tests/CTS/methods/requests/search/listIndices.json diff --git a/tests/CTS/clients/search/requests/listUserIds.json b/tests/CTS/methods/requests/search/listUserIds.json similarity index 100% rename from tests/CTS/clients/search/requests/listUserIds.json rename to tests/CTS/methods/requests/search/listUserIds.json diff --git a/tests/CTS/clients/search/requests/multipleBatch.json b/tests/CTS/methods/requests/search/multipleBatch.json similarity index 100% rename from tests/CTS/clients/search/requests/multipleBatch.json rename to tests/CTS/methods/requests/search/multipleBatch.json diff --git a/tests/CTS/clients/search/requests/multipleQueries.json b/tests/CTS/methods/requests/search/multipleQueries.json similarity index 100% rename from tests/CTS/clients/search/requests/multipleQueries.json rename to tests/CTS/methods/requests/search/multipleQueries.json diff --git a/tests/CTS/clients/search/requests/operationIndex.json b/tests/CTS/methods/requests/search/operationIndex.json similarity index 100% rename from tests/CTS/clients/search/requests/operationIndex.json rename to tests/CTS/methods/requests/search/operationIndex.json diff --git a/tests/CTS/clients/search/requests/partialUpdateObject.json b/tests/CTS/methods/requests/search/partialUpdateObject.json similarity index 100% rename from tests/CTS/clients/search/requests/partialUpdateObject.json rename to tests/CTS/methods/requests/search/partialUpdateObject.json diff --git a/tests/CTS/clients/search/requests/removeUserId.json b/tests/CTS/methods/requests/search/removeUserId.json similarity index 100% rename from tests/CTS/clients/search/requests/removeUserId.json rename to tests/CTS/methods/requests/search/removeUserId.json diff --git a/tests/CTS/clients/search/requests/replaceSources.json b/tests/CTS/methods/requests/search/replaceSources.json similarity index 100% rename from tests/CTS/clients/search/requests/replaceSources.json rename to tests/CTS/methods/requests/search/replaceSources.json diff --git a/tests/CTS/clients/search/requests/restoreApiKey.json b/tests/CTS/methods/requests/search/restoreApiKey.json similarity index 100% rename from tests/CTS/clients/search/requests/restoreApiKey.json rename to tests/CTS/methods/requests/search/restoreApiKey.json diff --git a/tests/CTS/clients/search/requests/saveObject.json b/tests/CTS/methods/requests/search/saveObject.json similarity index 100% rename from tests/CTS/clients/search/requests/saveObject.json rename to tests/CTS/methods/requests/search/saveObject.json diff --git a/tests/CTS/clients/search/requests/saveRule.json b/tests/CTS/methods/requests/search/saveRule.json similarity index 100% rename from tests/CTS/clients/search/requests/saveRule.json rename to tests/CTS/methods/requests/search/saveRule.json diff --git a/tests/CTS/clients/search/requests/saveSynonym.json b/tests/CTS/methods/requests/search/saveSynonym.json similarity index 100% rename from tests/CTS/clients/search/requests/saveSynonym.json rename to tests/CTS/methods/requests/search/saveSynonym.json diff --git a/tests/CTS/clients/search/requests/saveSynonyms.json b/tests/CTS/methods/requests/search/saveSynonyms.json similarity index 100% rename from tests/CTS/clients/search/requests/saveSynonyms.json rename to tests/CTS/methods/requests/search/saveSynonyms.json diff --git a/tests/CTS/clients/search/requests/search.json b/tests/CTS/methods/requests/search/search.json similarity index 100% rename from tests/CTS/clients/search/requests/search.json rename to tests/CTS/methods/requests/search/search.json diff --git a/tests/CTS/clients/search/requests/searchDictionaryEntries.json b/tests/CTS/methods/requests/search/searchDictionaryEntries.json similarity index 100% rename from tests/CTS/clients/search/requests/searchDictionaryEntries.json rename to tests/CTS/methods/requests/search/searchDictionaryEntries.json diff --git a/tests/CTS/clients/search/requests/searchForFacetValues.json b/tests/CTS/methods/requests/search/searchForFacetValues.json similarity index 100% rename from tests/CTS/clients/search/requests/searchForFacetValues.json rename to tests/CTS/methods/requests/search/searchForFacetValues.json diff --git a/tests/CTS/clients/search/requests/searchRules.json b/tests/CTS/methods/requests/search/searchRules.json similarity index 100% rename from tests/CTS/clients/search/requests/searchRules.json rename to tests/CTS/methods/requests/search/searchRules.json diff --git a/tests/CTS/clients/search/requests/searchSynonyms.json b/tests/CTS/methods/requests/search/searchSynonyms.json similarity index 100% rename from tests/CTS/clients/search/requests/searchSynonyms.json rename to tests/CTS/methods/requests/search/searchSynonyms.json diff --git a/tests/CTS/clients/search/requests/searchUserIds.json b/tests/CTS/methods/requests/search/searchUserIds.json similarity index 100% rename from tests/CTS/clients/search/requests/searchUserIds.json rename to tests/CTS/methods/requests/search/searchUserIds.json diff --git a/tests/CTS/clients/search/requests/setDictionarySettings.json b/tests/CTS/methods/requests/search/setDictionarySettings.json similarity index 100% rename from tests/CTS/clients/search/requests/setDictionarySettings.json rename to tests/CTS/methods/requests/search/setDictionarySettings.json diff --git a/tests/CTS/clients/search/requests/setSettings.json b/tests/CTS/methods/requests/search/setSettings.json similarity index 100% rename from tests/CTS/clients/search/requests/setSettings.json rename to tests/CTS/methods/requests/search/setSettings.json diff --git a/tests/CTS/clients/search/requests/updateApiKey.json b/tests/CTS/methods/requests/search/updateApiKey.json similarity index 100% rename from tests/CTS/clients/search/requests/updateApiKey.json rename to tests/CTS/methods/requests/search/updateApiKey.json diff --git a/tests/CTS/methods/responses/.gitkeep b/tests/CTS/methods/responses/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/CTS/methods/templates/java/requests.mustache b/tests/CTS/methods/templates/java/requests.mustache new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/CTS/templates/javascript/requests.mustache b/tests/CTS/methods/templates/javascript/requests.mustache similarity index 100% rename from tests/CTS/templates/javascript/requests.mustache rename to tests/CTS/methods/templates/javascript/requests.mustache diff --git a/tests/src/methods/requests/cts.ts b/tests/src/methods/requests/cts.ts index 9f7efad24cc..1ab4af46389 100644 --- a/tests/src/methods/requests/cts.ts +++ b/tests/src/methods/requests/cts.ts @@ -19,7 +19,7 @@ async function loadRequestsCTS(client: string): Promise { const ctsClient: CTSBlock[] = []; - for await (const file of walk(`./CTS/clients/${client}/requests`)) { + for await (const file of walk(`./CTS/methods/requests/${client}`)) { if (!file.name.endsWith('json')) { continue; } diff --git a/tests/src/methods/requests/templates.ts b/tests/src/methods/requests/templates.ts index 859db5999c7..32258be39e7 100644 --- a/tests/src/methods/requests/templates.ts +++ b/tests/src/methods/requests/templates.ts @@ -2,6 +2,6 @@ import fsp from 'fs/promises'; export async function loadRequestsTemplate(language: string): Promise { return ( - await fsp.readFile(`CTS/templates/${language}/requests.mustache`) + await fsp.readFile(`CTS/methods/templates/${language}/requests.mustache`) ).toString(); }