inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-06-30 18:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

better retry strategy for query service e2e (#5626)

Browse Source 
* better retry API startegy

* better retry API startegy
This commit is contained in:
Eugenio Romano 2020-04-21 12:56:14 +01:00 committed by GitHub
parent 6462bbf35a
commit 53b01ae594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 87 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts
View File

@ -71,7 +71,6 @@ describe('Form Field Component - Dropdown Widget', () => {
runningProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);
queryService = new QueryService(apiService);
await browser.sleep(4000); // eventual consistency query
tasklist = await queryService.getProcessInstanceTasks(runningProcessInstance.entry.id, simpleApp);
task = await tasklist.list.entries[0];
tasksService = new TasksService(apiService);

1
e2e/process-services-cloud/process-custom-filters.e2e.ts
View File

@ -93,7 +93,6 @@ describe('Process list cloud', () => {
});
queryService = new QueryService(apiService);
await browser.sleep(4000); // eventual consistency query
const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp);
tasksService = new TasksService(apiService);
const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp);

1
e2e/process-services-cloud/process-filter-results.e2e.ts
View File

@ -123,7 +123,6 @@ describe('Process filters cloud', () => {
});
queryService = new QueryService(apiService);
await browser.sleep(4000); // eventual consistency query
const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp);
tasksService = new TasksService(apiService);
const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp);

1
e2e/process-services-cloud/process-filters-cloud.e2e.ts
View File

@ -83,7 +83,6 @@ describe('Process filters cloud', () => {
});
queryService = new QueryService(apiService);
await browser.sleep(4000); // eventual consistency query
const task = await queryService.getProcessInstanceTasks(completedProcess.entry.id, candidateBaseApp);
tasksService = new TasksService(apiService);
const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp);

1
e2e/process-services-cloud/tasks-custom-filters.e2e.ts
View File

@ -92,7 +92,6 @@ describe('Task filters cloud', () => {
queryService = new QueryService(apiService);
await browser.sleep(4000); // eventual consistency query
await queryService.getProcessInstanceTasks(secondProcessInstance.entry.id, simpleApp);
await processInstancesService.suspendProcessInstance(processInstance.entry.id, simpleApp);
await processInstancesService.deleteProcessInstance(secondProcessInstance.entry.id, simpleApp);

1
e2e/protractor.excludes.json
View File

@ -4,3 +4,4 @@
"C311290": "https://issues.alfresco.com/jira/browse/ADF-5118",
"C317658": "https://issues.alfresco.com/jira/browse/ADF-5118"
}

106
e2e/protractor/override-jasmine.js
View File

@ -1,106 +0,0 @@
function beforeAllRewrite() {
const originalBeforeAll = global.beforeAll;
// tslint:disable-next-line
global.beforeAll = function (beforeAllFunction, timeout) {
const wrapClbk = async (done) => {
try {
await beforeAllFunction(done);
} catch (error) {
console.log('Error Before all second attempt in 10 sec');
sleep(10000);
try {
await beforeAllFunction(done);
} catch (e) {
// tslint:disable-next-line:no-console
console.log('Error Before all second attempt fail all' + JSON.stringify(error));
await expect(true).toBe(false);
}
}
done();
};
originalBeforeAll(wrapClbk, timeout);
};
}
function afterAllRewrite() {
const originalAfterAll = global.afterAll;
// tslint:disable-next-line
global.afterAll = function (afterAllFunction, timeout) {
const wrapClbk = async (done) => {
try {
await afterAllFunction(done);
} catch (error) {
// tslint:disable-next-line:no-console
console.log('Error After all' + JSON.stringify(error));
}
done();
};
originalAfterAll(wrapClbk, timeout);
};
}
function beforeEachAllRewrite() {
const originalBeforeEach = global.beforeEach;
// tslint:disable-next-line
global.beforeEach = function (beforeEachFunction, timeout) {
const wrapClbk = async (done) => {
try {
await beforeEachFunction(done);
} catch (error) {
// tslint:disable-next-line:no-console
console.log('Error before Each' + JSON.stringify(error));
}
done();
};
originalBeforeEach(wrapClbk, timeout);
};
}
function afterEachAllRewrite() {
const originalAfterEach = global.afterEach;
// tslint:disable-next-line
global.afterEach = function (afterEachFunction, timeout) {
const wrapClbk = async (done) => {
try {
await afterEachFunction(done);
} catch (error) {
// tslint:disable-next-line:no-console
console.log('Error After each' + JSON.stringify(error));
}
done();
};
originalAfterEach(wrapClbk, timeout);
};
}
function sleep(delay) {
var start = new Date().getTime();
while (new Date().getTime() < start + delay) ;
}
module.exports = {
beforeAllRewrite: beforeAllRewrite,
afterAllRewrite: afterAllRewrite,
beforeEachAllRewrite: beforeEachAllRewrite,
afterEachAllRewrite: afterEachAllRewrite
};

131
lib/testing/src/lib/core/actions/identity/query.service.ts
View File

@ -17,6 +17,7 @@
import { ApiService } from '../api.service';
import { Logger } from '../../utils/logger';
import { ApiUtil } from '../../structure/api.util';
export class QueryService {
@ -27,74 +28,114 @@ export class QueryService {
}
async getProcessInstanceTasks(processInstanceId, appName): Promise<any> {
try {
const path = '/' + appName + '/query/v1/process-instances/' + processInstanceId + '/tasks';
const method = 'GET';
const predicate = (result: any) => {
return result.list && result.list.entries.length > 0;
};
const queryParams = {}, postBody = {};
const apiCall = async () => {
try {
const path = '/' + appName + '/query/v1/process-instances/' + processInstanceId + '/tasks';
const method = 'GET';
return this.api.performBpmOperation(path, method, queryParams, postBody);
} catch (error) {
Logger.error('get process-instances Service error');
}
const queryParams = {}, postBody = {};
return this.api.performBpmOperation(path, method, queryParams, postBody);
} catch (error) {
Logger.error('get process-instances tasks Service error');
}
};
return ApiUtil.waitForApi(apiCall, predicate);
}
async getProcessInstance(processInstanceId, appName): Promise<any> {
try {
const path = '/' + appName + '/query/v1/process-instances/' + processInstanceId;
const method = 'GET';
const predicate = (result: any) => {
return !!result;
};
const queryParams = {}, postBody = {};
const apiCall = async () => {
try {
const path = '/' + appName + '/query/v1/process-instances/' + processInstanceId;
const method = 'GET';
return this.api.performBpmOperation(path, method, queryParams, postBody);
} catch (error) {
Logger.error('get process-instance Service error');
}
const queryParams = {}, postBody = {};
return this.api.performBpmOperation(path, method, queryParams, postBody);
} catch (error) {
Logger.error('get process-instances Service error');
}
};
return ApiUtil.waitForApi(apiCall, predicate);
}
async getProcessInstanceSubProcesses(processInstanceId, appName): Promise<any> {
try {
const path = '/' + appName + '/query/v1/process-instances/' + processInstanceId + '/subprocesses';
const method = 'GET';
const predicate = (result: any) => {
return result.list && result.list.entries.length > 0;
};
const queryParams = {};
const apiCall = async () => {
try {
const path = '/' + appName + '/query/v1/process-instances/' + processInstanceId + '/subprocesses';
const method = 'GET';
return this.api.performBpmOperation(path, method, queryParams, {});
} catch (error) {
Logger.error('get subprocesses process-instances Service error');
}
const queryParams = {}, postBody = {};
return this.api.performBpmOperation(path, method, queryParams, postBody);
} catch (error) {
Logger.error('get subprocesses process-instances Service error');
}
};
return ApiUtil.waitForApi(apiCall, predicate);
}
async getTaskByName(taskName, processInstanceId, appName): Promise<any> {
try {
const path = '/' + appName + '/query/v1/process-instances/' + processInstanceId + '/tasks';
const method = 'GET';
const predicate = (result: any) => {
return !!result;
};
const queryParams = {}, postBody = {};
const apiCall = async () => {
try {
const path = '/' + appName + '/query/v1/process-instances/' + processInstanceId + '/tasks';
const method = 'GET';
const data = await this.api.performBpmOperation(path, method, queryParams, postBody);
for (let i = 0; i < data.list.entries.length; i++) {
if (data.list.entries[i].entry.name === taskName) {
return data.list.entries[i];
const queryParams = {}, postBody = {};
const data = await this.api.performBpmOperation(path, method, queryParams, postBody);
for (let i = 0; i < data.list.entries.length; i++) {
if (data.list.entries[i].entry.name === taskName) {
return data.list.entries[i];
}
}
} catch (error) {
Logger.error('Get Task By Name - Service error');
}
} catch (error) {
Logger.error('Get Task By Name - Service error');
}
};
return ApiUtil.waitForApi(apiCall, predicate);
}
async getProcessInstanceId(processName: string, appName: string): Promise<any> {
try {
const path = '/' + appName + '/query/v1/process-instances';
const method = 'GET';
const predicate = (result: any) => {
return !!result;
};
const queryParams = { name: processName }, postBody = {};
const apiCall = async () => {
try {
const path = '/' + appName + '/query/v1/process-instances';
const method = 'GET';
const data = await this.api.performBpmOperation(path, method, queryParams, postBody);
return data.list.entries && data.list.entries.length > 0 ? data.list.entries[0].entry.id : null;
} catch (error) {
Logger.error('Get Process Instance Id - Service error, Response: ', JSON.parse(JSON.stringify(error)).response.text);
}
const queryParams = { name: processName }, postBody = {};
const data = await this.api.performBpmOperation(path, method, queryParams, postBody);
return data.list.entries && data.list.entries.length > 0 ? data.list.entries[0].entry.id : null;
} catch (error) {
Logger.error('Get Process Instance Id - Service error, Response: ', JSON.parse(JSON.stringify(error)).response.text);
}
};
return ApiUtil.waitForApi(apiCall, predicate);
}
}

6
protractor.conf.ts
View File

@ -12,7 +12,6 @@ require('ts-node').register({
});
const ACTIVITI_CLOUD_APPS = require('./lib/testing').ACTIVITI_CLOUD_APPS;
const { beforeAllRewrite, afterAllRewrite, beforeEachAllRewrite, afterEachAllRewrite } = require('./e2e/protractor/override-jasmine');
const { uploadScreenshot, cleanReportFolder } = require('./e2e/protractor/save-remote');
const argv = require('yargs').argv;
@ -160,11 +159,6 @@ exports.config = {
},
onPrepare() {
afterEachAllRewrite();
beforeEachAllRewrite();
afterAllRewrite();
beforeAllRewrite();
retry.onPrepare();
jasmine.DEFAULT_TIMEOUT_INTERVAL = TIMEOUT;