continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1661280 - in /continuum/trunk/continuum-webapp-test/src/test: example-projects/continuum-2094-example/ example-projects/continuum-2094-example/module/ example-projects/continuum-2094-example/module/src/ example-projects/continuum-2094-exam...
Date Sat, 21 Feb 2015 05:04:44 GMT
Author: batkinson
Date: Sat Feb 21 05:04:44 2015
New Revision: 1661280

URL: http://svn.apache.org/r1661280
Log:
Added test case for CONTINUUM-2094.

Added:
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/pom.xml
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/main/
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/main/java/
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/main/java/module/
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/main/java/module/App.java
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/test/
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/test/java/
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/test/java/module/
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/test/java/module/AppTest.java
    continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/pom.xml
    continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/10
    continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/11
    continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/10
    continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/11
    continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MvnProjectBuilderReleaseTest.java
Modified:
    continuum/trunk/continuum-webapp-test/src/test/example-svn/db/current
    continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties

Added: continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/pom.xml?rev=1661280&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/pom.xml
(added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/pom.xml
Sat Feb 21 05:04:44 2015
@@ -0,0 +1,23 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>example.com</groupId>
+    <artifactId>mmvars-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>example.com</groupId>
+  <artifactId>mmvars-module</artifactId>
+  <packaging>jar</packaging>
+  <version>${module.version}</version>
+  <name>Multi-Module With Variables :: Child</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Added: continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/main/java/module/App.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/main/java/module/App.java?rev=1661280&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/main/java/module/App.java
(added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/main/java/module/App.java
Sat Feb 21 05:04:44 2015
@@ -0,0 +1,13 @@
+package module;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

Added: continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/test/java/module/AppTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/test/java/module/AppTest.java?rev=1661280&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/test/java/module/AppTest.java
(added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/module/src/test/java/module/AppTest.java
Sat Feb 21 05:04:44 2015
@@ -0,0 +1,38 @@
+package module;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}

Added: continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/pom.xml?rev=1661280&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/pom.xml
(added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-projects/continuum-2094-example/pom.xml
Sat Feb 21 05:04:44 2015
@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>example.com</groupId>
+  <artifactId>mmvars-parent</artifactId>
+  <name>Multi-Module With Variables :: Parent</name>
+  <packaging>pom</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <url>http://maven.apache.org</url>
+  <scm>
+    <connection>scm:svn:${svn.base.url}/trunk/continuum-2094-example</connection>
+    <developerConnection>scm:svn:${svn.base.url}/trunk/continuum-2094-example</developerConnection>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <modules>
+    <module>module</module>
+  </modules>
+  <properties>
+    <module.version>1.0-SNAPSHOT</module.version>
+  </properties>
+</project>

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=1661280&r1=1661279&r2=1661280&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 Sat Feb 21 05:04:44
2015
@@ -1 +1 @@
-9 8l 1
+11 9f 1

Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/10
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/10?rev=1661280&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/10 (added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/10 Sat Feb 21 05:04:44
2015
@@ -0,0 +1,14 @@
+K 10
+svn:author
+V 9
+batkinson
+K 8
+svn:date
+V 27
+2015-02-21T02:13:01.001004Z
+K 7
+svn:log
+V 51
+Created directory for CONTINUUM-2094 test project.
+
+END

Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/11
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/11?rev=1661280&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/11 (added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revprops/11 Sat Feb 21 05:04:44
2015
@@ -0,0 +1,13 @@
+K 10
+svn:author
+V 9
+batkinson
+K 8
+svn:date
+V 27
+2015-02-21T02:14:09.316346Z
+K 7
+svn:log
+V 37
+Imported CONTINUUM-2094 test project.
+END

Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/10
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/10?rev=1661280&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/10 (added)
+++ continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/10 Sat Feb 21 05:04:44
2015
@@ -0,0 +1,88 @@
+id: 8m.0.r10/0
+type: dir
+count: 0
+cpath: /trunk/continuum-2094-example
+copyroot: 0 /
+
+PLAIN
+K 3
+ant
+V 17
+dir 1l.0.r1/40993
+K 22
+continuum-2094-example
+V 14
+dir 8m.0.r10/0
+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.r10/627
+type: dir
+pred: 1.0.r9/747
+count: 8
+text: 10 86 528 0 9561fe9ec9de6dfffc95abe2b6729168
+cpath: /trunk
+copyroot: 0 /
+
+PLAIN
+K 4
+tags
+V 16
+dir 5h.0.r2/5880
+K 5
+trunk
+V 15
+dir 1.0.r10/627
+END
+ENDREP
+id: 0.0.r10/838
+type: dir
+pred: 0.0.r9/957
+count: 10
+text: 10 759 66 0 2d86fdd98d9527cbb2a7173fff048379
+cpath: /
+copyroot: 0 /
+
+_1.0.t9-1 add false false /trunk/continuum-2094-example
+
+
+838 966

Added: continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/11
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/11?rev=1661280&view=auto
==============================================================================
Binary files continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/11 (added)
and continuum/trunk/continuum-webapp-test/src/test/example-svn/db/revs/11 Sat Feb 21 05:04:44
2015 differ

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=1661280&r1=1661279&r2=1661280&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties (original)
+++ continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties Sat Feb 21
05:04:44 2015
@@ -50,6 +50,12 @@ MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_GROU
 MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_GROUP_ID=org.apache.continuum.examples
 MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_GROUP_DESCRIPTION=
 
+MAVEN2_MODULES_WITH_VARS_PROJECT_NAME=Multi-Module With Variables :: Parent
+MAVEN2_MODULES_WITH_VARS_PROJECT_URL=${sampleProjectsUrl}/example-projects/continuum-2094-example/pom.xml
+MAVEN2_MODULES_WITH_VARS_TAG=continuum-2094-example-1.0
+MAVEN2_MODULES_WITH_VARS_VERSION=1.0
+MAVEN2_MODULES_WITH_VARS_DEVELOPMENT_VERSION=1.1-SNAPSHOT
+
 MAVEN2_FAILING_PROJECT_POM_URL=${sampleProjectsUrl}/example-projects/continuum-failing-project/pom.xml
 # values used for "Defined by POM" - tests should clean up this group afterwards if added
 MAVEN2_FAILING_PROJECT_POM_PROJECT_GROUP_NAME=Continuum Sample Failing Project

Added: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MvnProjectBuilderReleaseTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MvnProjectBuilderReleaseTest.java?rev=1661280&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MvnProjectBuilderReleaseTest.java
(added)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MvnProjectBuilderReleaseTest.java
Sat Feb 21 05:04:44 2015
@@ -0,0 +1,94 @@
+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.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+
+/**
+ * This tests that a project that requires variable interpolation in the pom can successfully
be prepared for release.
+ * This was originally reported as CONTINUUM-2094.
+ */
+@Test( groups = { "release" } )
+public class MvnProjectBuilderReleaseTest
+    extends AbstractReleaseTest
+{
+    private String projectGroupName;
+
+    private String projectGroupId;
+
+    private String tagBase;
+
+    private String tag;
+
+    private String releaseVersion;
+
+    private String developmentVersion;
+
+    @BeforeClass
+    public void createAndBuildProject()
+    {
+        projectGroupName = getProperty( "RELEASE_PROJECT_GROUP_NAME" );
+        projectGroupId = getProperty( "RELEASE_PROJECT_GROUP_ID" );
+        String description = "Release test projects";
+
+        loginAsAdmin();
+
+        String pomUrl = getProperty( "MAVEN2_MODULES_WITH_VARS_PROJECT_URL" );
+        String pomUsername = getProperty( "MAVEN2_POM_USERNAME" );
+        String pomPassword = getProperty( "MAVEN2_POM_PASSWORD" );
+        String projectName = getProperty( "MAVEN2_MODULES_WITH_VARS_PROJECT_NAME" );
+
+        addProjectGroup( projectGroupName, projectGroupId, description, true, false );
+        clickLinkWithText( projectGroupName );
+
+        if ( !isLinkPresent( projectName ) )
+        {
+            addMavenTwoProject( pomUrl, pomUsername, pomPassword, projectGroupName, true
);
+
+            buildProjectGroup( projectGroupName, projectGroupId, "", projectName, true );
+        }
+    }
+
+    @BeforeMethod
+    public void setUp()
+        throws IOException
+    {
+        tagBase = getProperty( "RELEASE_PROJECT_TAGBASE" );
+        tag = getProperty( "MAVEN2_MODULES_WITH_VARS_TAG" );
+        releaseVersion = getProperty( "MAVEN2_MODULES_WITH_VARS_VERSION" );
+        developmentVersion = getProperty( "MAVEN2_MODULES_WITH_VARS_DEVELOPMENT_VERSION"
);
+    }
+
+    public void testReleasePrepareProjectWithVersionExpression()
+        throws Exception
+    {
+        showProjectGroup( projectGroupName, projectGroupId, projectGroupId );
+
+        clickButtonWithValue( RELEASE_BUTTON_TEXT );
+        assertReleaseChoicePage();
+        releasePrepareProject( "", "", tagBase, tag, releaseVersion, developmentVersion,
"" );
+
+        assertReleasePhaseSuccess();
+    }
+}



Mime
View raw message