From 6c65ba572e841354e1a395782017400270a010ae Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 19 Oct 2016 13:23:11 +0100 Subject: [PATCH 1/4] RM-4127 Backport UI tests to V2.3. --- pom.xml | 18 ++ rm-automation/pom.xml | 648 ++++++++++++++++++++++-------------------- rm-server/pom.xml | 1 - 3 files changed, 365 insertions(+), 302 deletions(-) diff --git a/pom.xml b/pom.xml index e5f5f35ebe..67608dce87 100644 --- a/pom.xml +++ b/pom.xml @@ -60,9 +60,27 @@ + + + + org.alfresco + alfresco-platform-distribution + 5.0.3.9 + pom + import + + + org.reflections + reflections + 0.9.10 + + + + rm-server rm-share + rm-automation diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 40d6f5cf74..8033657e41 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -1,312 +1,358 @@ - - org.alfresco - alfresco-rm-parent - 2.3.1-SNAPSHOT - - 4.0.0 - alfresco-rm-automation - - 2.43.1 - 4.0.5.RELEASE - - - - + + 4.0.0 + alfresco-rm-automation + Alfresco Records Management Automation + + + org.alfresco + alfresco-rm-parent + 2.3.1-SNAPSHOT + + + + 2.45.0 + 4.0.5.RELEASE + 1.8 + testng.xml + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-test-source + + add-test-source + + + + src/unit-test/java + + + + + + + maven-surefire-plugin + + false + + ${project.build.testOutputDirectory}/${suiteXmlFile} + + ${skip.automationtests} + + + + maven-antrun-plugin + + + default-cli + + + Stopping Alfresco... + + + + + + + + + + org.codehaus.mojo + license-maven-plugin + + alfresco_enterprise + file:${project.parent.basedir}/license + ${project.parent.basedir}/license/description.ftl + + + + + - org.codehaus.mojo - build-helper-maven-plugin - - - add-test-source + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + license-maven-plugin + [1.8,) + + update-file-header + + + + + + + + + + + + + + + + + org.alfresco.test + dataprep + 1.8 + + + org.alfresco.test + alfresco-testng + 1.1 + + + org.alfresco + selenium-grid + 1.8 + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + test + + + org.springframework + spring-test + ${spring.version} + test + + + org.testng + testng + 6.8.8 + + + ru.yandex.qatools.htmlelements + htmlelements-all + 1.15 + + + ru.yandex.qatools.properties + properties-loader + 1.5 + test + + + com.github.tomakehurst + wiremock + 1.56 + + + org.mockito + mockito-all + test + + + org.slf4j + slf4j-log4j12 + test + + + org.slf4j + jul-to-slf4j + 1.7.21 + test + + + + + + install-alfresco + + + + maven-antrun-plugin + + + fetch-installer + generate-test-resources - add-test-source + run - - src/unit-test/java - + + Recreating database... + drop database if exists alfresco; create database alfresco + Downloading Alfresco installer... + + + Installing Alfresco... + + + + - - - - - maven-surefire-plugin - - false - - - usedefaultlisteners - false - - - listener - org.uncommons.reportng.HTMLReporter, org.uncommons.reportng.JUnitXMLReporter - - - - ${project.build.testOutputDirectory}/testng.xml - - - - - - maven-antrun-plugin - - - default-cli + + + + + org.apache.ant + ant-jsch + 1.8.2 + + + postgresql + postgresql + 9.1-901-1.jdbc4 + + + + + maven-dependency-plugin + + + fetch-amps + process-test-resources + + copy + - - Stopping Alfresco... - - - - + + + org.alfresco + alfresco-rm-enterprise-share + ${project.version} + amp + + + org.alfresco + alfresco-rm-enterprise-repo + ${project.version} + amp + + + ${project.build.directory}/amps + true - - - - - - - - org.alfresco - webdrone - 2.6.1 - - - org.seleniumhq.selenium - selenium-java - ${selenium.version} - - - org.seleniumhq.selenium - selenium-server - ${selenium.version} - test - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.testng - testng - 6.8.8 - test - - - org.uncommons - reportng - 1.1.4 - test - - - ru.yandex.qatools.htmlelements - htmlelements-all - 1.12 - - - ru.yandex.qatools.properties - properties-loader - 1.5 - test - - - - - install-alfresco - - - - - maven-antrun-plugin - - - fetch-installer - generate-test-resources - - run - - - - Recreating database... - drop database if exists alfresco; create database alfresco - Downloading Alfresco installer... - - - - Installing Alfresco... - - - - - - - - - - org.apache.ant - ant-jsch - 1.8.2 - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - - - maven-dependency-plugin - - - fetch-amps - process-test-resources - - copy - - - - - org.alfresco - alfresco-rm-share - ${project.version} - amp - amp - - - org.alfresco - alfresco-rm-server - ${project.version} - amp - amp - - - ${project.build.directory}/amps - true - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - true - - - install-server-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-server-${project.version}-amp.amp - ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war - amp - - - - install-share-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-share-${project.version}-amp.amp - ${project.build.directory}/alf-installation/tomcat/webapps/share.war - amp - - - - - - - - - run-alfresco - - - - - org.jacoco - jacoco-maven-plugin - 0.6.3.201306030806 - - - prepare-jacoco - - prepare-agent - - - + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + true + + + install-enterprise-repo-amp + + install + + process-test-resources - - org.alfresco.* - + true + ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war - - - - maven-antrun-plugin - - - start-alfresco - process-test-classes - - run - - - - Starting Alfresco... - - - - - - - - - - stop-alfresco - post-integration-test - - run - - - - Stopping Alfresco... - - - - - - - - - - - - - \ No newline at end of file + + + install-enterprise-share-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/share.war + + + + + + + + + run-alfresco + + + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946 + + + prepare-jacoco + + prepare-agent + + + + + + org.alfresco.* + + + + + maven-antrun-plugin + + + start-alfresco + process-test-classes + + run + + + + Starting Alfresco... + + + + + + + + + + stop-alfresco + post-integration-test + + run + + + + Stopping Alfresco... + + + + + + + + + + + + + diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 3f8f1443f7..7d347cf2a7 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -231,7 +231,6 @@ org.mockito mockito-all - 1.9.5 test From 8d0d513b9bf8d62f3841c0c8ab122bc1cfdec6d8 Mon Sep 17 00:00:00 2001 From: Oana Nechiforescu Date: Fri, 21 Oct 2016 11:03:18 +0300 Subject: [PATCH 2/4] Trying to fix the poms. Have no idea if that will work. --- pom.xml | 2 +- rm-automation/pom.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 67608dce87..7d56dd2c18 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ org.alfresco alfresco-platform-distribution - 5.0.3.9 + 5.0.2 pom import diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 8033657e41..90c55c3ab4 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -241,13 +241,13 @@ org.alfresco - alfresco-rm-enterprise-share + alfresco-rm-share ${project.version} amp org.alfresco - alfresco-rm-enterprise-repo + alfresco-rm-server ${project.version} amp @@ -264,26 +264,26 @@ true - install-enterprise-repo-amp + install-server-amp install process-test-resources true - ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp + ${project.build.directory}/amps/alfresco-rm-server-${project.version}.amp ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war - install-enterprise-share-amp + install-share-amp install process-test-resources true - ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp + ${project.build.directory}/amps/alfresco-rm-share-${project.version}.amp ${project.build.directory}/alf-installation/tomcat/webapps/share.war From ee807117b0647d7b7ba099ccc5200e13f0c0a4ea Mon Sep 17 00:00:00 2001 From: Oana Nechiforescu Date: Fri, 21 Oct 2016 13:11:27 +0300 Subject: [PATCH 3/4] Updates to pom --- rm-automation/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 90c55c3ab4..8c5d1800db 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -244,12 +244,14 @@ alfresco-rm-share ${project.version} amp + amp org.alfresco alfresco-rm-server ${project.version} amp + amp ${project.build.directory}/amps From 2f23f488db54f8e133552a8fc9eea6959cdeb52f Mon Sep 17 00:00:00 2001 From: Oana Nechiforescu Date: Fri, 21 Oct 2016 13:29:24 +0300 Subject: [PATCH 4/4] Updates to amps names. --- rm-automation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 8c5d1800db..e88c8062f1 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -273,7 +273,7 @@ process-test-resources true - ${project.build.directory}/amps/alfresco-rm-server-${project.version}.amp + ${project.build.directory}/amps/alfresco-rm-server-${project.version}-amp.amp ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war @@ -285,7 +285,7 @@ process-test-resources true - ${project.build.directory}/amps/alfresco-rm-share-${project.version}.amp + ${project.build.directory}/amps/alfresco-rm-share-${project.version}-amp.amp ${project.build.directory}/alf-installation/tomcat/webapps/share.war