You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/02/18 16:27:06 UTC
svn commit: r1660655 - in /continuum/trunk/continuum-webapp-test/src/test:
example-svn/db/ example-svn/db/revprops/ example-svn/db/revs/ resources/
testng/org/apache/continuum/web/test/
Author: batkinson
Date: Wed Feb 18 15:27:05 2015
New Revision: 1660655
URL: http://svn.apache.org/r1660655
Log:
Added web test for CONTINUUM-1837
Added:
continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/7
continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/8
continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/9
continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/7
continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/8
continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/9
continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/IvyJUnitProjectTest.java
Modified:
continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current
continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties
Modified: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current?rev=1660655&r1=1660654&r2=1660655&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current (original)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current Wed Feb 18 15:27:05 2015
@@ -1 +1 @@
-6 7z 1
+9 8l 1
Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/7
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/7?rev=1660655&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/7 (added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/7 Wed Feb 18 15:27:05 2015
@@ -0,0 +1,14 @@
+K 10
+svn:author
+V 9
+batkinson
+K 8
+svn:date
+V 27
+2015-02-18T13:46:39.275095Z
+K 7
+svn:log
+V 56
+Added directory for ivy project to test CONTINUUM-1837.
+
+END
Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/8
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/8?rev=1660655&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/8 (added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/8 Wed Feb 18 15:27:05 2015
@@ -0,0 +1,13 @@
+K 10
+svn:author
+V 9
+batkinson
+K 8
+svn:date
+V 27
+2015-02-18T13:48:14.852351Z
+K 7
+svn:log
+V 27
+Importing ivy test project.
+END
Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/9
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/9?rev=1660655&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/9 (added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/9 Wed Feb 18 15:27:05 2015
@@ -0,0 +1,13 @@
+K 10
+svn:author
+V 9
+batkinson
+K 8
+svn:date
+V 27
+2015-02-18T13:50:57.992340Z
+K 7
+svn:log
+V 29
+Ignoring generated resources.
+END
Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/7
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/7?rev=1660655&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/7 (added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/7 Wed Feb 18 15:27:05 2015
@@ -0,0 +1,84 @@
+id: 80.0.r7/0
+type: dir
+count: 0
+cpath: /trunk/ivy-junit
+copyroot: 0 /
+
+PLAIN
+K 3
+ant
+V 17
+dir 1l.0.r1/40993
+K 22
+continuum-2437-example
+V 17
+dir 43.0.r1/55881
+K 31
+continuum-build-queue-test-data
+V 17
+dir 2n.0.r1/47692
+K 25
+continuum-failing-project
+V 16
+dir 6j.0.r3/5047
+K 12
+flat-example
+V 16
+dir 3.0.r1/40570
+K 9
+ivy-junit
+V 13
+dir 80.0.r7/0
+K 18
+maven-one-projects
+V 17
+dir 57.0.r1/58103
+K 18
+maven-two-projects
+V 17
+dir 3b.0.r1/51960
+K 5
+shell
+V 15
+dir 51.0.r4/328
+K 14
+simple-example
+V 17
+dir 1p.0.r1/44766
+K 11
+tail-output
+V 16
+dir 7k.0.r6/2578
+END
+ENDREP
+id: 1.0.r7/564
+type: dir
+pred: 1.0.r6/3181
+count: 5
+text: 7 72 479 0 a539eb77569458a6ff1466b21740c9fc
+cpath: /trunk
+copyroot: 0 /
+
+PLAIN
+K 4
+tags
+V 16
+dir 5h.0.r2/5880
+K 5
+trunk
+V 14
+dir 1.0.r7/564
+END
+ENDREP
+id: 0.0.r7/773
+type: dir
+pred: 0.0.r6/3393
+count: 7
+text: 7 695 65 0 26d443cc6b5370432af5a8b17934ec9a
+cpath: /
+copyroot: 0 /
+
+_1.0.t6-1 add false false /trunk/ivy-junit
+
+
+773 899
Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/8
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/8?rev=1660655&view=auto
==============================================================================
Binary files continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/8 (added) and continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/8 Wed Feb 18 15:27:05 2015 differ
Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/9
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/9?rev=1660655&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/9 (added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/9 Wed Feb 18 15:27:05 2015
@@ -0,0 +1,98 @@
+PLAIN
+K 10
+svn:ignore
+V 22
+ivy
+build
+test-build
+
+
+END
+ENDREP
+id: 80.0.r9/61
+type: dir
+pred: 80.0.r8/6078
+count: 2
+text: 8 5959 106 0 40a082b4041e9b745fe7a0e8f5550aed
+props: 9 0 48 0 9f31677dba14534c5492d9bb9cc64396
+cpath: /trunk/ivy-junit
+copyroot: 0 /
+
+PLAIN
+K 3
+ant
+V 17
+dir 1l.0.r1/40993
+K 22
+continuum-2437-example
+V 17
+dir 43.0.r1/55881
+K 31
+continuum-build-queue-test-data
+V 17
+dir 2n.0.r1/47692
+K 25
+continuum-failing-project
+V 16
+dir 6j.0.r3/5047
+K 12
+flat-example
+V 16
+dir 3.0.r1/40570
+K 9
+ivy-junit
+V 14
+dir 80.0.r9/61
+K 18
+maven-one-projects
+V 17
+dir 57.0.r1/58103
+K 18
+maven-two-projects
+V 17
+dir 3b.0.r1/51960
+K 5
+shell
+V 15
+dir 51.0.r4/328
+K 14
+simple-example
+V 17
+dir 1p.0.r1/44766
+K 11
+tail-output
+V 16
+dir 7k.0.r6/2578
+END
+ENDREP
+id: 1.0.r9/747
+type: dir
+pred: 1.0.r8/6716
+count: 7
+text: 9 254 480 0 3ba9dae8bf0374139ca6045e7e78b894
+cpath: /trunk
+copyroot: 0 /
+
+PLAIN
+K 4
+tags
+V 16
+dir 5h.0.r2/5880
+K 5
+trunk
+V 14
+dir 1.0.r9/747
+END
+ENDREP
+id: 0.0.r9/957
+type: dir
+pred: 0.0.r8/6928
+count: 9
+text: 9 879 65 0 2f4d4bd1c806c03e7be9949287e4829c
+cpath: /
+copyroot: 0 /
+
+80.0.t8-1 modify false true /trunk/ivy-junit
+
+
+957 1083
Modified: continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties?rev=1660655&r1=1660654&r2=1660655&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties (original)
+++ continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties Wed Feb 18 15:27:05 2015
@@ -74,6 +74,14 @@ ANT_SCM_URL=${sampleProjectsUrl}/example
ANT_SCM_USERNAME=
ANT_SCM_PASSWORD=
+IVYJU_NAME=Ivy JUnit Project
+IVYJU_DESCRIPTION=This is a sample Ivy project used for testing
+IVYJU_VERSION=1
+IVYJU_TAG=
+IVYJU_SCM_URL=scm:svn:${svn.base.url}/trunk/ivy-junit
+IVYJU_SCM_USERNAME=
+IVYJU_SCM_PASSWORD=
+
# Maven 1 projects to load
MAVEN1_POM_URL=${sampleProjectsUrl}/example-projects/maven-one-projects/valid-project.xml
Added: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/IvyJUnitProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/IvyJUnitProjectTest.java?rev=1660655&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/IvyJUnitProjectTest.java (added)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/IvyJUnitProjectTest.java Wed Feb 18 15:27:05 2015
@@ -0,0 +1,96 @@
+package org.apache.continuum.web.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import org.apache.continuum.web.test.parent.AbstractAdminTest;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@Test( groups = { "antProject" } )
+public class IvyJUnitProjectTest
+ extends AbstractAdminTest
+{
+ private String projectName;
+
+ private String projectDescription;
+
+ private String projectVersion;
+
+ private String projectTag;
+
+ private String scmUrl;
+
+ private String scmUsername;
+
+ private String scmPassword;
+
+ private String projectGroupName;
+
+ private String projectGroupId;
+
+ private String projectGroupDescription;
+
+ @BeforeMethod
+ protected void setUp()
+ throws Exception
+ {
+ projectName = getProperty( "IVYJU_NAME" );
+ projectDescription = getProperty( "IVYJU_DESCRIPTION" );
+ projectVersion = getProperty( "IVYJU_VERSION" );
+ projectTag = getProperty( "IVYJU_TAG" );
+ scmUrl = getProperty( "IVYJU_SCM_URL" );
+ scmUsername = getProperty( "IVYJU_SCM_USERNAME" );
+ scmPassword = getProperty( "IVYJU_SCM_PASSWORD" );
+
+ projectGroupName = getProperty( "ANT_PROJECT_GROUP_NAME" );
+ projectGroupId = getProperty( "ANT_PROJECT_GROUP_ID" );
+ projectGroupDescription = getProperty( "ANT_PROJECT_GROUP_DESCRIPTION" );
+
+ // create project group, if it doesn't exist
+ addProjectGroup( projectGroupName, projectGroupId, projectGroupDescription, true, false );
+ }
+
+ @AfterMethod
+ public void tearDown()
+ throws Throwable
+ {
+ removeProjectGroup( projectGroupName, false );
+ }
+
+ public void testJUnitReportsArchived()
+ throws Exception
+ {
+ goToAddAntProjectPage();
+ addProject( projectName, projectDescription, projectVersion, scmUrl, scmUsername, scmPassword, projectTag,
+ projectGroupName, true, "ant" );
+ assertProjectGroupSummaryPage( projectGroupName, projectGroupId, projectGroupDescription );
+ clickAndWait( "css=img[alt=\"Build Now\"]" );
+ clickAndWait( "link=" + projectName );
+ clickAndWait( "link=Builds" );
+ clickAndWait( "css=img[alt=\"Building\"]" );
+ waitForElementPresent( "css=img[alt=\"Failed\"]" );
+ clickAndWait( "link=Surefire Report" );
+ assertCellValueFromTable( "2", "id=ec_table", 1, 0 );
+ assertCellValueFromTable( "1", "id=ec_table", 1, 2 );
+ assertCellValueFromTable( "50.0", "id=ec_table", 1, 3 );
+ }
+
+}