|
1 | | -import { expect } from 'chai'; |
2 | | -import * as os from 'os'; |
3 | | -import { RSPServerProvider } from './server/ui/rspServerProvider'; |
4 | | -import { ServerState } from './common/enum/serverState'; |
5 | | -import { deploymentHasState, serverHasDeployment, serverHasPublishState, serverHasState } from './common/util/serverUtils'; |
6 | | -import { EditorView, InputBox, VSBrowser, WebDriver } from 'vscode-extension-tester'; |
7 | | -import { AdaptersConstants } from './common/constants/adaptersContants'; |
8 | | -import { PublishState } from './common/enum/publishState'; |
9 | | -import { downloadFile } from './common/util/downloadServerUtil'; |
10 | | -import { Deployment } from './server/ui/deployment'; |
11 | | -import { Logger } from 'tslog'; |
| 1 | +// import { expect } from 'chai'; |
| 2 | +// import * as os from 'os'; |
| 3 | +// import { RSPServerProvider } from './server/ui/rspServerProvider'; |
| 4 | +// import { ServerState } from './common/enum/serverState'; |
| 5 | +// import { deploymentHasState, serverHasDeployment, serverHasPublishState, serverHasState } from './common/util/serverUtils'; |
| 6 | +// import { EditorView, InputBox, VSBrowser, WebDriver } from 'vscode-extension-tester'; |
| 7 | +// import { AdaptersConstants } from './common/constants/adaptersContants'; |
| 8 | +// import { PublishState } from './common/enum/publishState'; |
| 9 | +// import { downloadFile } from './common/util/downloadServerUtil'; |
| 10 | +// import { Deployment } from './server/ui/deployment'; |
| 11 | +// import { Logger } from 'tslog'; |
12 | 12 |
|
13 | | -import path = require('path'); |
14 | | -import fs = require('fs'); |
15 | | -import { ServerTestOperator } from './serverTestOperator'; |
| 13 | +// import path = require('path'); |
| 14 | +// import fs = require('fs'); |
| 15 | +// import { ServerTestOperator } from './serverTestOperator'; |
16 | 16 | import { ServerTestType } from './common/constants/serverConstants'; |
17 | 17 |
|
18 | | -const log: Logger = new Logger({ name: 'advancedE2ETest'}); |
| 18 | +// const log: Logger = new Logger({ name: 'advancedE2ETest'}); |
19 | 19 | /** |
20 | 20 | * @author Ondrej Dockal <odockal@redhat.com> |
21 | 21 | */ |
22 | 22 | export function deploymentE2ETest(testServers: ServerTestType[]): void { |
23 | | - describe('Perform advanced E2E test scenario for server adapters - deployments', () => { |
| 23 | + // describe('Perform advanced E2E test scenario for server adapters - deployments', () => { |
24 | 24 |
|
25 | | - let driver: WebDriver; |
| 25 | + // let driver: WebDriver; |
26 | 26 |
|
27 | | - before(function() { |
28 | | - if (os.platform() === 'darwin') { |
29 | | - this.skip(); |
30 | | - } |
31 | | - driver = VSBrowser.instance.driver; |
32 | | - }); |
| 27 | + // before(function() { |
| 28 | + // if (os.platform() === 'darwin') { |
| 29 | + // this.skip(); |
| 30 | + // } |
| 31 | + // driver = VSBrowser.instance.driver; |
| 32 | + // }); |
33 | 33 |
|
34 | | - for (const testServer of testServers) { |
35 | | - describe(`Verify ${testServer.serverDownloadName} advanced features - deployments`, () => { |
| 34 | + // for (const testServer of testServers) { |
| 35 | + // describe(`Verify ${testServer.serverDownloadName} advanced features - deployments`, () => { |
36 | 36 |
|
37 | | - let serverProvider: RSPServerProvider; |
38 | | - const serverOperator = new ServerTestOperator(); |
39 | | - const appPath = path.join(__dirname, '../../../test/resources/java-webapp.war'); |
40 | | - const appName = 'java-webapp.war'; |
| 37 | + // let serverProvider: RSPServerProvider; |
| 38 | + // const serverOperator = new ServerTestOperator(); |
| 39 | + // const appPath = path.join(__dirname, '../../../test/resources/java-webapp.war'); |
| 40 | + // const appName = 'java-webapp.war'; |
41 | 41 |
|
42 | | - before(async function() { |
43 | | - this.timeout(240000); |
44 | | - await new EditorView().closeAllEditors(); |
45 | | - // start RSP Server provider |
46 | | - serverProvider = await serverOperator.startRSPServerProvider(driver); |
47 | | - // create server |
48 | | - await serverProvider.createServer(testServer); |
49 | | - const servers = await serverProvider.getServers(); |
50 | | - const serversNames = await Promise.all(servers.map(async item => await item.getServerName())); |
51 | | - expect(serversNames).to.include.members([testServer.serverName]); |
52 | | - const server = await serverProvider.getServer(testServer.serverName); |
53 | | - await server.start(); |
54 | | - await driver.wait(async () => await serverHasState(server, ServerState.Started), 3000); |
55 | | - }); |
| 42 | + // before(async function() { |
| 43 | + // this.timeout(240000); |
| 44 | + // await new EditorView().closeAllEditors(); |
| 45 | + // // start RSP Server provider |
| 46 | + // serverProvider = await serverOperator.startRSPServerProvider(driver); |
| 47 | + // // create server |
| 48 | + // await serverProvider.createServer(testServer); |
| 49 | + // const servers = await serverProvider.getServers(); |
| 50 | + // const serversNames = await Promise.all(servers.map(async item => await item.getServerName())); |
| 51 | + // expect(serversNames).to.include.members([testServer.serverName]); |
| 52 | + // const server = await serverProvider.getServer(testServer.serverName); |
| 53 | + // await server.start(); |
| 54 | + // await driver.wait(async () => await serverHasState(server, ServerState.Started), 3000); |
| 55 | + // }); |
56 | 56 |
|
57 | | - it(`Add new deployment to the ${testServer.serverDownloadName} server`, async function() { |
58 | | - this.timeout(30000); |
59 | | - const server = await serverProvider.getServer(testServer.serverName); |
60 | | - await server.addFileDeployment(appPath); |
61 | | - await driver.wait(async () => await serverHasDeployment(server, appName), 8000, |
62 | | - 'Deployment was not added to the server'); |
63 | | - const deployment = await server.getDeployment(appName); |
64 | | - expect(deployment).to.be.an.instanceof(Deployment); |
65 | | - expect(await deployment.getDeploymentPublishState()).to.be.oneOf([PublishState.PUBLISH_REQUIRED, PublishState.SYNCHRONIZED]); |
66 | | - await driver.wait(async () => |
67 | | - await deploymentHasState(deployment, ServerState.Unknown, ServerState.Started), |
68 | | - 3000, |
69 | | - 'Deployment was not in unknown or started state'); |
70 | | - expect(await server.getServerPublishState()).to.be.oneOf([PublishState.FULL_PUBLISH_REQUIRED, PublishState.SYNCHRONIZED]); |
71 | | - }); |
| 57 | + // it(`Add new deployment to the ${testServer.serverDownloadName} server`, async function() { |
| 58 | + // this.timeout(30000); |
| 59 | + // const server = await serverProvider.getServer(testServer.serverName); |
| 60 | + // await server.addFileDeployment(appPath); |
| 61 | + // await driver.wait(async () => await serverHasDeployment(server, appName), 8000, |
| 62 | + // 'Deployment was not added to the server'); |
| 63 | + // const deployment = await server.getDeployment(appName); |
| 64 | + // expect(deployment).to.be.an.instanceof(Deployment); |
| 65 | + // expect(await deployment.getDeploymentPublishState()).to.be.oneOf([PublishState.PUBLISH_REQUIRED, PublishState.SYNCHRONIZED]); |
| 66 | + // await driver.wait(async () => |
| 67 | + // await deploymentHasState(deployment, ServerState.Unknown, ServerState.Started), |
| 68 | + // 3000, |
| 69 | + // 'Deployment was not in unknown or started state'); |
| 70 | + // expect(await server.getServerPublishState()).to.be.oneOf([PublishState.FULL_PUBLISH_REQUIRED, PublishState.SYNCHRONIZED]); |
| 71 | + // }); |
72 | 72 |
|
73 | | - it('Perform full publish of the server', async function() { |
74 | | - this.timeout(15000); |
75 | | - const server = await serverProvider.getServer(testServer.serverName); |
76 | | - const deployment = await server.getDeployment(appName); |
77 | | - expect(deployment).to.be.an.instanceof(Deployment); |
78 | | - await server.publishFull(); |
79 | | - await driver.wait(async () => await serverHasPublishState(server, PublishState.SYNCHRONIZED), 3000); |
80 | | - expect(await deployment.getDeploymentState()).to.equal(ServerState.Started); |
81 | | - expect(await deployment.getDeploymentPublishState()).to.equal(PublishState.SYNCHRONIZED); |
82 | | - }); |
| 73 | + // it('Perform full publish of the server', async function() { |
| 74 | + // this.timeout(15000); |
| 75 | + // const server = await serverProvider.getServer(testServer.serverName); |
| 76 | + // const deployment = await server.getDeployment(appName); |
| 77 | + // expect(deployment).to.be.an.instanceof(Deployment); |
| 78 | + // await server.publishFull(); |
| 79 | + // await driver.wait(async () => await serverHasPublishState(server, PublishState.SYNCHRONIZED), 3000); |
| 80 | + // expect(await deployment.getDeploymentState()).to.equal(ServerState.Started); |
| 81 | + // expect(await deployment.getDeploymentPublishState()).to.equal(PublishState.SYNCHRONIZED); |
| 82 | + // }); |
83 | 83 |
|
84 | | - it('Verify deployment shows up in server actions - Show in browser', async function() { |
85 | | - this.timeout(20000); |
86 | | - const server = await serverProvider.getServer(testServer.serverName); |
87 | | - const actions = await Promise.all((await server.getServerActions())); |
88 | | - expect(actions).to.include(AdaptersConstants.SERVER_ACTION_SHOW_IN_BROWSER); |
89 | | - let inputShow; |
90 | | - try { |
91 | | - await server.callServerAction(AdaptersConstants.SERVER_ACTION_SHOW_IN_BROWSER); |
92 | | - inputShow = await InputBox.create(); |
93 | | - } catch (error) { |
94 | | - if (error.name === 'TimeoutError') { |
95 | | - log.warn('InputBox did not appear in given time, retrying to evoke server action'); |
96 | | - await server.callServerAction(AdaptersConstants.SERVER_ACTION_SHOW_IN_BROWSER); |
97 | | - inputShow = await InputBox.create(); |
98 | | - } |
99 | | - } |
100 | | - const urls = await Promise.all((await inputShow.getQuickPicks()).map(async item => await item.getText())); |
101 | | - await inputShow.cancel(); |
102 | | - expect(urls).to.include('http://localhost:8080/java-webapp'); |
103 | | - }); |
| 84 | + // it('Verify deployment shows up in server actions - Show in browser', async function() { |
| 85 | + // this.timeout(20000); |
| 86 | + // const server = await serverProvider.getServer(testServer.serverName); |
| 87 | + // const actions = await Promise.all((await server.getServerActions())); |
| 88 | + // expect(actions).to.include(AdaptersConstants.SERVER_ACTION_SHOW_IN_BROWSER); |
| 89 | + // let inputShow; |
| 90 | + // try { |
| 91 | + // await server.callServerAction(AdaptersConstants.SERVER_ACTION_SHOW_IN_BROWSER); |
| 92 | + // inputShow = await InputBox.create(); |
| 93 | + // } catch (error) { |
| 94 | + // if (error.name === 'TimeoutError') { |
| 95 | + // log.warn('InputBox did not appear in given time, retrying to evoke server action'); |
| 96 | + // await server.callServerAction(AdaptersConstants.SERVER_ACTION_SHOW_IN_BROWSER); |
| 97 | + // inputShow = await InputBox.create(); |
| 98 | + // } |
| 99 | + // } |
| 100 | + // const urls = await Promise.all((await inputShow.getQuickPicks()).map(async item => await item.getText())); |
| 101 | + // await inputShow.cancel(); |
| 102 | + // expect(urls).to.include('http://localhost:8080/java-webapp'); |
| 103 | + // }); |
104 | 104 |
|
105 | | - it('Verify deployed application', async function() { |
106 | | - this.timeout(30000); |
107 | | - const testFile = path.join(__dirname, 'my.out'); |
108 | | - await new Promise((resolve) => setTimeout(resolve, 15000)); |
109 | | - await downloadFile('http://localhost:8080/java-webapp', testFile); |
110 | | - const content = fs.readFileSync(testFile, 'utf-8'); |
111 | | - expect(content).to.include('Test Deployment App'); |
112 | | - }); |
| 105 | + // it('Verify deployed application', async function() { |
| 106 | + // this.timeout(30000); |
| 107 | + // const testFile = path.join(__dirname, 'my.out'); |
| 108 | + // await new Promise((resolve) => setTimeout(resolve, 15000)); |
| 109 | + // await downloadFile('http://localhost:8080/java-webapp', testFile); |
| 110 | + // const content = fs.readFileSync(testFile, 'utf-8'); |
| 111 | + // expect(content).to.include('Test Deployment App'); |
| 112 | + // }); |
113 | 113 |
|
114 | | - it('Remove deployment from the server', async function() { |
115 | | - this.timeout(20000); |
116 | | - let server = await serverProvider.getServer(testServer.serverName); |
117 | | - const deployment = await server.getDeployment(appName); |
118 | | - expect(deployment).to.be.an.instanceof(Deployment); |
119 | | - await deployment.removeDeployment(); |
120 | | - // refresh server |
121 | | - server = await serverProvider.getServer(testServer.serverName); |
122 | | - const serverPubState = await server.getServerPublishState(); |
123 | | - const deployment2 = await server.getDeployment(appName); |
124 | | - const deploymentPubState = deployment2 ? deployment2.getDeploymentPublishState() : undefined; |
125 | | - const serverFullPubRequired = serverPubState === PublishState.FULL_PUBLISH_REQUIRED; |
126 | | - const serverPubSynchronized = serverPubState === PublishState.SYNCHRONIZED; |
127 | | - const deploymentMissing = deploymentPubState === undefined; |
128 | | - expect(serverFullPubRequired || (serverPubSynchronized && deploymentMissing)).to.eq(true); |
129 | | - await driver.wait(async () => { return await serverHasDeployment(server, appName) === false; }, 12000); |
130 | | - }); |
| 114 | + // it('Remove deployment from the server', async function() { |
| 115 | + // this.timeout(20000); |
| 116 | + // let server = await serverProvider.getServer(testServer.serverName); |
| 117 | + // const deployment = await server.getDeployment(appName); |
| 118 | + // expect(deployment).to.be.an.instanceof(Deployment); |
| 119 | + // await deployment.removeDeployment(); |
| 120 | + // // refresh server |
| 121 | + // server = await serverProvider.getServer(testServer.serverName); |
| 122 | + // const serverPubState = await server.getServerPublishState(); |
| 123 | + // const deployment2 = await server.getDeployment(appName); |
| 124 | + // const deploymentPubState = deployment2 ? deployment2.getDeploymentPublishState() : undefined; |
| 125 | + // const serverFullPubRequired = serverPubState === PublishState.FULL_PUBLISH_REQUIRED; |
| 126 | + // const serverPubSynchronized = serverPubState === PublishState.SYNCHRONIZED; |
| 127 | + // const deploymentMissing = deploymentPubState === undefined; |
| 128 | + // expect(serverFullPubRequired || (serverPubSynchronized && deploymentMissing)).to.eq(true); |
| 129 | + // await driver.wait(async () => { return await serverHasDeployment(server, appName) === false; }, 12000); |
| 130 | + // }); |
131 | 131 |
|
132 | | - afterEach(async function() { |
133 | | - this.timeout(8000); |
134 | | - try { |
135 | | - const input = await InputBox.create(); |
136 | | - await input.cancel(); |
137 | | - } catch (error) { |
138 | | - // no input box, no need to close it |
139 | | - } |
140 | | - }); |
| 132 | + // afterEach(async function() { |
| 133 | + // this.timeout(8000); |
| 134 | + // try { |
| 135 | + // const input = await InputBox.create(); |
| 136 | + // await input.cancel(); |
| 137 | + // } catch (error) { |
| 138 | + // // no input box, no need to close it |
| 139 | + // } |
| 140 | + // }); |
141 | 141 |
|
142 | | - after(async function() { |
143 | | - this.timeout(30000); |
144 | | - await serverOperator.cleanUpAll(); |
145 | | - }); |
146 | | - }); |
147 | | - } |
148 | | - }); |
| 142 | + // after(async function() { |
| 143 | + // this.timeout(30000); |
| 144 | + // await serverOperator.cleanUpAll(); |
| 145 | + // }); |
| 146 | + // }); |
| 147 | + // } |
| 148 | + // }); |
149 | 149 | } |
0 commit comments