From 9447118f44fc38789ffb1c86966499a71fa92984 Mon Sep 17 00:00:00 2001 From: Bartek Date: Thu, 1 Aug 2019 09:01:26 +0200 Subject: [PATCH 1/7] fix url rerun --- .../src/main/webapp/app/layout/toolbar/toolbarBottom.view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html b/report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html index 73377e355..ba94a565e 100644 --- a/report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html +++ b/report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html @@ -35,7 +35,7 @@

data-content="Rerun current URL" data-trigger="hover" data-container="body" - data-ng-click="toolbarBottom.rerunURL(toolbarBottom.model.url)"> + data-ng-click="toolbarBottom.rerunURL(toolbarBottom.model.name)">
Date: Thu, 1 Aug 2019 09:38:50 +0200 Subject: [PATCH 2/7] changelog update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09fb5e29d..72e34ac73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to AET will be documented in this file. - [PR-489](https://github.com/Cognifide/aet/pull/489) Cleaner integration tests - [PR-480](https://github.com/Cognifide/aet/pull/480) Test summary stats on the main report page. ([#474](https://github.com/Cognifide/aet/issues/474)) - [PR-459](https://github.com/Cognifide/aet/pull/459) Print more meaningful error messages when suite.xml is malformed ([#436](https://github.com/Cognifide/aet/issues/436)) +- [PR-517](https://github.com/Cognifide/aet/pull/517) Angular sends a URL name instead of a URL to RerunServlet ([#487](https://github.com/Cognifide/aet/issues/487)) ## Version 3.2.2 From 75560815ad370058279ca31894c3d33cb0ecf835 Mon Sep 17 00:00:00 2001 From: Bartek Date: Thu, 1 Aug 2019 11:13:25 +0200 Subject: [PATCH 3/7] Bad-request status when cannot rerun test --- .../cognifide/aet/executor/SuiteRerunServlet.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerunServlet.java b/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerunServlet.java index b001e5887..fd50242e1 100644 --- a/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerunServlet.java +++ b/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerunServlet.java @@ -22,12 +22,6 @@ import com.cognifide.aet.rest.Helper; import com.cognifide.aet.vs.MetadataDAO; import com.google.gson.Gson; -import java.io.IOException; -import java.net.HttpURLConnection; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.CharEncoding; import org.apache.http.HttpStatus; import org.osgi.service.component.annotations.Activate; @@ -39,6 +33,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.HttpURLConnection; + @Component(immediate = true) public class SuiteRerunServlet extends HttpServlet { @@ -83,6 +84,8 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) } catch (javax.jms.JMSException | ValidatorException e) { e.printStackTrace(); } + } else { + response.setStatus(HttpURLConnection.HTTP_BAD_REQUEST); } } catch (ValidatorException e) { LOGGER.error("Validation problem!", e); From 27e255cf02e8917dd80a8f78a63f47ef3d20c6a6 Mon Sep 17 00:00:00 2001 From: Bartek Date: Wed, 7 Aug 2019 09:35:04 +0200 Subject: [PATCH 4/7] Finding Url object by url --- .../com/cognifide/aet/communication/api/metadata/Test.java | 6 ++++++ .../main/webapp/app/layout/toolbar/toolbarBottom.view.html | 2 +- .../main/java/com/cognifide/aet/executor/SuiteRerun.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/communication-api/src/main/java/com/cognifide/aet/communication/api/metadata/Test.java b/api/communication-api/src/main/java/com/cognifide/aet/communication/api/metadata/Test.java index a2d5a5c34..510ab3a67 100644 --- a/api/communication-api/src/main/java/com/cognifide/aet/communication/api/metadata/Test.java +++ b/api/communication-api/src/main/java/com/cognifide/aet/communication/api/metadata/Test.java @@ -123,6 +123,12 @@ public Optional getUrl(String urlName) { .findFirst(); } + public Optional findUrl(String url) { + return this.urls.stream() + .filter(u -> u.getUrl().equals(url)) + .findFirst(); + } + public void setUrls(Set urls) { this.urls = urls; } diff --git a/report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html b/report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html index ba94a565e..73377e355 100644 --- a/report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html +++ b/report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html @@ -35,7 +35,7 @@

data-content="Rerun current URL" data-trigger="hover" data-container="body" - data-ng-click="toolbarBottom.rerunURL(toolbarBottom.model.name)"> + data-ng-click="toolbarBottom.rerunURL(toolbarBottom.model.url)">

test = suite.getTest(testName); if(test.isPresent()){ - Optional url = test.get().getUrl(urlName); + Optional url = test.get().findUrl(data.getTestUrl()); if(url.isPresent()){ UrlRunWrapper urlRunWrapper = new UrlRunWrapper(url.get(), test.get()); urlRunWrapper.setReran(); From 7dac4cecf290da186514ad03ed1b8b39be09db61 Mon Sep 17 00:00:00 2001 From: Bartek Date: Wed, 7 Aug 2019 09:41:34 +0200 Subject: [PATCH 5/7] fixup! Finding Url object by url --- .../src/main/java/com/cognifide/aet/executor/SuiteRerun.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerun.java b/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerun.java index 021155a3c..0dc8a32c4 100644 --- a/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerun.java +++ b/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerun.java @@ -64,7 +64,7 @@ static Run getAndPrepareObject(MetadataDAO metadataDAO, DBKey dbKey, String corr } else if (isUrlRerun(testName, urlName)) { Optional test = suite.getTest(testName); if(test.isPresent()){ - Optional url = test.get().findUrl(data.getTestUrl()); + Optional url = test.get().findUrl(urlName); if(url.isPresent()){ UrlRunWrapper urlRunWrapper = new UrlRunWrapper(url.get(), test.get()); urlRunWrapper.setReran(); From 2312f50021a9e3b5ed6b41e94c2c35a27481573c Mon Sep 17 00:00:00 2001 From: Bartek Date: Wed, 7 Aug 2019 09:46:48 +0200 Subject: [PATCH 6/7] Add sending post data in body --- .../main/webapp/app/services/rerun.service.js | 33 +++--- .../java/com/cognifide/aet/rest/Helper.java | 6 ++ .../cognifide/aet/executor/SuiteRerun.java | 18 ++-- .../aet/executor/SuiteRerunServlet.java | 53 +++++---- .../aet/executor/http/RerunDataWrapper.java | 102 ++++++++++++++++++ 5 files changed, 164 insertions(+), 48 deletions(-) create mode 100644 test-executor/src/main/java/com/cognifide/aet/executor/http/RerunDataWrapper.java diff --git a/report/src/main/webapp/app/services/rerun.service.js b/report/src/main/webapp/app/services/rerun.service.js index cd8506dc0..51d9f821f 100644 --- a/report/src/main/webapp/app/services/rerun.service.js +++ b/report/src/main/webapp/app/services/rerun.service.js @@ -47,10 +47,12 @@ function rerunSuite() { $rootScope.rerunInProgress = true; var suiteInfo = suiteInfoService.getInfo(); - var rerunParams = 'company=' + suiteInfo.company + '&' + 'project=' + suiteInfo.project + '&' + - 'suite=' + suiteInfo.name; - var url = endpointConfiguration.getEndpoint().getUrl + 'suite-rerun?' + rerunParams; - $http.post(url, {}).then(function successCallback(response) { + var url = endpointConfiguration.getEndpoint().getUrl + 'suite-rerun'; + $http.post(url, { + company: suiteInfo.company, + project: suiteInfo.project, + suite: suiteInfo.name, + }).then(function successCallback(response) { $rootScope.rerunMsg = 'Suite rerun initialized'; $rootScope.rerunInProgressSuccessful = true; localStorage.setItem('currentRerunEndpointUrl', response.data.statusUrl); @@ -64,10 +66,13 @@ function rerunTest(testName) { $rootScope.rerunInProgress = true; var suiteInfo = suiteInfoService.getInfo(); - var rerunParams = 'company=' + suiteInfo.company + '&' + 'project=' + suiteInfo.project + '&' + - 'suite=' + suiteInfo.name + '&' + 'testName=' + testName; - var url = endpointConfiguration.getEndpoint().getUrl + 'suite-rerun?' + rerunParams; - $http.post(url, {}).then(function successCallback(response) { + var url = endpointConfiguration.getEndpoint().getUrl + 'suite-rerun'; + $http.post(url, { + company: suiteInfo.company, + project: suiteInfo.project, + suite: suiteInfo.name, + testName: testName + }).then(function successCallback(response) { $rootScope.rerunMsg = 'Test rerun initialized'; $rootScope.rerunProgress = 0; $rootScope.rerunInProgressSuccessful = true; @@ -81,10 +86,14 @@ function rerunURL(testName, testUrl) { $rootScope.rerunInProgress = true; var suiteInfo = suiteInfoService.getInfo(); - var rerunParams = 'company=' + suiteInfo.company + '&' + 'project=' + suiteInfo.project + '&' + - 'suite=' + suiteInfo.name + '&' + 'testUrl=' + testUrl + '&' + 'testName=' + testName; - var url = endpointConfiguration.getEndpoint().getUrl + 'suite-rerun?' + rerunParams; - $http.post(url, {}).then(function successCallback(response) { + var url = endpointConfiguration.getEndpoint().getUrl + 'suite-rerun'; + $http.post(url, { + company: suiteInfo.company, + project: suiteInfo.project, + suite: suiteInfo.name, + testUrl: testUrl, + testName: testName + }).then(function successCallback(response) { $rootScope.rerunMsg = 'URL rerun initialized'; $rootScope.rerunProgress = 0; $rootScope.rerunInProgressSuccessful = true; diff --git a/rest-endpoint/src/main/java/com/cognifide/aet/rest/Helper.java b/rest-endpoint/src/main/java/com/cognifide/aet/rest/Helper.java index 18944fa9a..d16ea2a72 100644 --- a/rest-endpoint/src/main/java/com/cognifide/aet/rest/Helper.java +++ b/rest-endpoint/src/main/java/com/cognifide/aet/rest/Helper.java @@ -95,6 +95,12 @@ public static DBKey getDBKeyFromRequest(HttpServletRequest req) throws Validator return dbKey; } + public static DBKey getDBKey(String company, String project) throws ValidatorException { + SimpleDBKey dbKey = new SimpleDBKey(company, project); + dbKey.validate(null); + return dbKey; + } + public static boolean isValidName(String suiteName) { return ValidatorProvider.getValidator().validateValue(Suite.class, "name", suiteName).isEmpty(); } diff --git a/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerun.java b/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerun.java index 0dc8a32c4..386217a9a 100644 --- a/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerun.java +++ b/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerun.java @@ -27,6 +27,7 @@ import com.cognifide.aet.communication.api.wrappers.SuiteRunWrapper; import com.cognifide.aet.communication.api.wrappers.TestRunWrapper; import com.cognifide.aet.communication.api.wrappers.UrlRunWrapper; +import com.cognifide.aet.executor.http.RerunDataWrapper; import com.cognifide.aet.executor.model.CorrelationIdGenerator; import com.cognifide.aet.vs.DBKey; import com.cognifide.aet.vs.MetadataDAO; @@ -42,29 +43,28 @@ class SuiteRerun { private SuiteRerun() { } - static Run getAndPrepareObject(MetadataDAO metadataDAO, DBKey dbKey, String correlationId, - String suiteName, String testName, String urlName) { + static Run getAndPrepareObject(MetadataDAO metadataDAO, DBKey dbKey, RerunDataWrapper data) { Suite suite = null; try { - suite = getSuiteFromMetadata(metadataDAO, dbKey, correlationId, suiteName); + suite = getSuiteFromMetadata(metadataDAO, dbKey, data.getCorrelationId(), data.getSuite()); suite.setRunTimestamp(new Timestamp(System.currentTimeMillis())); } catch (StorageException e) { LOGGER.error("Read metadata from DB problem!", e); } Run objectToRunWrapper = null; - if (isSuiteRerun(testName, urlName)) { + if (isSuiteRerun(data.getTestName(), data.getTestUrl())) { prepareSuiteToRerun(suite); objectToRunWrapper = new SuiteRunWrapper(suite); - } else if (isTestRerun(testName, urlName)) { - Optional test = suite.getTest(testName); + } else if (isTestRerun(data.getTestName(), data.getTestUrl())) { + Optional test = suite.getTest(data.getTestName()); test.get().setRerunUrls(); if(test.isPresent()){ objectToRunWrapper = new MetadataRunDecorator(new TestRunWrapper(test.get()), suite); } - } else if (isUrlRerun(testName, urlName)) { - Optional test = suite.getTest(testName); + } else if (isUrlRerun(data.getTestName(), data.getTestUrl())) { + Optional test = suite.getTest(data.getTestName()); if(test.isPresent()){ - Optional url = test.get().findUrl(urlName); + Optional url = test.get().findUrl(data.getTestUrl()); if(url.isPresent()){ UrlRunWrapper urlRunWrapper = new UrlRunWrapper(url.get(), test.get()); urlRunWrapper.setReran(); diff --git a/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerunServlet.java b/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerunServlet.java index fd50242e1..a8c28904e 100644 --- a/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerunServlet.java +++ b/test-executor/src/main/java/com/cognifide/aet/executor/SuiteRerunServlet.java @@ -19,10 +19,13 @@ import com.cognifide.aet.communication.api.metadata.ValidatorException; import com.cognifide.aet.communication.api.wrappers.Run; import com.cognifide.aet.executor.http.HttpSuiteExecutionResultWrapper; +import com.cognifide.aet.executor.http.RerunDataWrapper; import com.cognifide.aet.rest.Helper; +import com.cognifide.aet.vs.DBKey; import com.cognifide.aet.vs.MetadataDAO; +import com.google.common.base.Charsets; import com.google.gson.Gson; -import org.apache.commons.lang3.CharEncoding; +import com.google.gson.JsonSyntaxException; import org.apache.http.HttpStatus; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -33,6 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.jms.JMSException; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -58,44 +62,40 @@ public class SuiteRerunServlet extends HttpServlet { private static final Gson GSON = new Gson(); - private SuiteExecutionResult suiteExecutionResult; - - private HttpSuiteExecutionResultWrapper resultWrapper = null; + @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws IOException { + throws IOException { addCors(response); - String correlationId = request.getParameter(Helper.CORRELATION_ID_PARAM); - String suiteName = request.getParameter(Helper.SUITE_PARAM); - String testName = request.getParameter(Helper.TEST_RERUN_PARAM); - String urlName = request.getParameter(Helper.URL_RERUN_PARAM); - - Run objectToRunWrapper = null; try { - objectToRunWrapper = SuiteRerun - .getAndPrepareObject(metadataDAO, Helper.getDBKeyFromRequest(request), correlationId, suiteName, - testName, urlName); - if(objectToRunWrapper != null) { - try { - resultWrapper = suiteExecutor.executeSuite(objectToRunWrapper); - createResponse(resultWrapper, response); - } catch (javax.jms.JMSException | ValidatorException e) { - e.printStackTrace(); + RerunDataWrapper rerunDataWrapper = GSON.fromJson(request.getReader(), RerunDataWrapper.class); + + if (rerunDataWrapper != null) { + DBKey dbKey = Helper.getDBKey(rerunDataWrapper.getCompany(), rerunDataWrapper.getProject()); + Run objectToRunWrapper = SuiteRerun + .getAndPrepareObject(metadataDAO, dbKey, rerunDataWrapper); + + if (objectToRunWrapper != null) { + createResponse(objectToRunWrapper, response); + } else { + response.setStatus(HttpURLConnection.HTTP_NOT_FOUND); } } else { response.setStatus(HttpURLConnection.HTTP_BAD_REQUEST); } - } catch (ValidatorException e) { + } catch (ValidatorException | JsonSyntaxException | JMSException e) { LOGGER.error("Validation problem!", e); response.setStatus(HttpURLConnection.HTTP_BAD_REQUEST); } } - private void createResponse(HttpSuiteExecutionResultWrapper resultWrapper, - HttpServletResponse response) throws IOException { - suiteExecutionResult = resultWrapper.getExecutionResult(); + private void createResponse(Run objectToRunWrapper, HttpServletResponse response) + throws IOException, ValidatorException, JMSException { + + HttpSuiteExecutionResultWrapper resultWrapper = suiteExecutor.executeSuite(objectToRunWrapper); + SuiteExecutionResult suiteExecutionResult = resultWrapper.getExecutionResult(); String responseBody = GSON.toJson(suiteExecutionResult); if (resultWrapper.hasError()) { @@ -103,14 +103,13 @@ private void createResponse(HttpSuiteExecutionResultWrapper resultWrapper, } else { response.setStatus(HttpStatus.SC_OK); response.setContentType("application/json"); - response.setCharacterEncoding(CharEncoding.UTF_8); + response.setCharacterEncoding(Charsets.UTF_8.name()); response.getWriter().write(responseBody); } } @Override - protected void doOptions(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { + protected void doOptions(HttpServletRequest req, HttpServletResponse resp) { addCors(resp); } diff --git a/test-executor/src/main/java/com/cognifide/aet/executor/http/RerunDataWrapper.java b/test-executor/src/main/java/com/cognifide/aet/executor/http/RerunDataWrapper.java new file mode 100644 index 000000000..3d8b644e5 --- /dev/null +++ b/test-executor/src/main/java/com/cognifide/aet/executor/http/RerunDataWrapper.java @@ -0,0 +1,102 @@ +/** + * AET + * + * Copyright (C) 2013 Cognifide Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package com.cognifide.aet.executor.http; + +import com.google.common.base.Objects; + +public class RerunDataWrapper { + + private String correlationId; + private String company; + private String project; + private String suite; + private String testUrl; + private String testName; + + public RerunDataWrapper(String correlationId, String company, String project, String suite, String testUrl, String testName) { + this.correlationId = correlationId; + this.company = company; + this.project = project; + this.suite = suite; + this.testUrl = testUrl; + this.testName = testName; + } + + public String getCorrelationId() { + return correlationId; + } + + public void setCorrelationId(String correlationId) { + this.correlationId = correlationId; + } + + public String getCompany() { + return company; + } + + public void setCompany(String company) { + this.company = company; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getSuite() { + return suite; + } + + public void setSuite(String suite) { + this.suite = suite; + } + + public String getTestUrl() { + return testUrl; + } + + public void setTestUrl(String testUrl) { + this.testUrl = testUrl; + } + + public String getTestName() { + return testName; + } + + public void setTestName(String testName) { + this.testName = testName; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + RerunDataWrapper that = (RerunDataWrapper) o; + return Objects.equal(company, that.company) && + Objects.equal(project, that.project) && + Objects.equal(suite, that.suite) && + Objects.equal(testUrl, that.testUrl) && + Objects.equal(testName, that.testName); + } + + @Override + public int hashCode() { + return Objects.hashCode(company, project, suite, testUrl, testName); + } +} From d674df982f7487adce4b399205f9b71e504f4876 Mon Sep 17 00:00:00 2001 From: Bartek Jackowiak Date: Thu, 8 Aug 2019 14:09:22 +0200 Subject: [PATCH 7/7] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72e34ac73..123260aff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ All notable changes to AET will be documented in this file. - [PR-489](https://github.com/Cognifide/aet/pull/489) Cleaner integration tests - [PR-480](https://github.com/Cognifide/aet/pull/480) Test summary stats on the main report page. ([#474](https://github.com/Cognifide/aet/issues/474)) - [PR-459](https://github.com/Cognifide/aet/pull/459) Print more meaningful error messages when suite.xml is malformed ([#436](https://github.com/Cognifide/aet/issues/436)) -- [PR-517](https://github.com/Cognifide/aet/pull/517) Angular sends a URL name instead of a URL to RerunServlet ([#487](https://github.com/Cognifide/aet/issues/487)) +- [PR-517](https://github.com/Cognifide/aet/pull/517) Single URL rerun fixed for named URLs ([#487](https://github.com/Cognifide/aet/issues/487)) ## Version 3.2.2