maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1480280 - in /maven/plugins/trunk/maven-site-plugin/src/it: site-sd-2/ site-sd-stagingSiteURL/ site-sd-submodule/ site-sd-top-parent-different-site/ site-sd-top-parent-no-site/ site-sd/
Date Wed, 08 May 2013 14:04:16 GMT
Author: hboutemy
Date: Wed May  8 14:04:16 2013
New Revision: 1480280

URL: http://svn.apache.org/r1480280
Log:
replaced Beanshell verify scripts with Groovy ones: tests are a lot easier to read

Added:
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd-2/verify.groovy   (with props)
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd-stagingSiteURL/verify.groovy   (with
props)
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd-submodule/verify.groovy   (with props)
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/verify.groovy
  (with props)
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/verify.groovy
  (with props)
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd/verify.groovy   (with props)
Removed:
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd-2/verify.bsh
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd-stagingSiteURL/verify.bsh
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd-submodule/verify.bsh
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/verify.bsh
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/verify.bsh
    maven/plugins/trunk/maven-site-plugin/src/it/site-sd/verify.bsh

Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-2/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-2/verify.groovy?rev=1480280&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-2/verify.groovy (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-2/verify.groovy Wed May  8 14:04:16
2013
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+target = new File( basedir, 'target' );
+assert target.isDirectory();
+
+// deploy
+deployDirectory = new File( basedir, 'deploy' );
+assert deployDirectory.isDirectory();
+assert new File( deployDirectory, 'junk' ).isDirectory(); // junk directory (aggregator)
+pluginsDirectory = new File( deployDirectory, 'plugins' );
+assert pluginsDirectory.isDirectory();
+assert new File( pluginsDirectory, 'maven-rocks-plugin' ).isDirectory();
+
+// stage
+stageDirectory = new File( target, 'staging' );
+assert stageDirectory.isDirectory();
+pluginsDirectory = new File( stageDirectory, 'plugins' );
+assert pluginsDirectory.isDirectory();
+assert new File( pluginsDirectory, 'maven-rocks-plugin' ).isDirectory();
+
+// stage deploy
+stageDeployDirectory = new File( deployDirectory, 'staging' );
+assert stageDeployDirectory.isDirectory();
+pluginsDirectory = new File( stageDeployDirectory, 'plugins' );
+assert pluginsDirectory.isDirectory();
+assert new File( pluginsDirectory, 'maven-rocks-plugin' ).isDirectory();
+
+return true;
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-2/verify.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-2/verify.groovy
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-stagingSiteURL/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-stagingSiteURL/verify.groovy?rev=1480280&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-stagingSiteURL/verify.groovy (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-stagingSiteURL/verify.groovy Wed
May  8 14:04:16 2013
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+target = new File( basedir, 'target' );
+assert target.isDirectory();
+
+stageDeploy = new File( target, 'MSITE-649-1.0-SNAPSHOT' );
+assert stageDeploy.isDirectory();
+
+assert !new File( stageDeploy, 'MSITE-649' ).exists(); // a MSITE-649 subdirectory has been
created inside the staging directory
+
+return true;
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-stagingSiteURL/verify.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-stagingSiteURL/verify.groovy
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-submodule/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-submodule/verify.groovy?rev=1480280&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-submodule/verify.groovy (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-submodule/verify.groovy Wed May 
8 14:04:16 2013
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+target = new File( basedir, 'target' );
+assert target.isDirectory();
+
+stageDeploy = new File( target, 'site-deployed/staging' );
+assert stageDeploy.isDirectory();
+assert new File( stageDeploy, 'module' ).exists();
+
+return true;
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-submodule/verify.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-submodule/verify.groovy
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/verify.groovy?rev=1480280&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/verify.groovy
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/verify.groovy
Wed May  8 14:04:16 2013
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+target = new File( basedir, 'target' );
+assert target.isDirectory();
+
+// deploy
+deployDirectory = new File( basedir, 'deploy' );
+assert deployDirectory.isDirectory();
+assert new File( deployDirectory, 'module1' ).isDirectory();
+
+// stage
+stageDirectory = new File( target, 'staging' );
+assert stageDirectory.isDirectory();
+assert new File( stageDirectory, 'module1' ).isDirectory();
+
+// stage deploy
+stageDeployDirectory = new File( deployDirectory, 'staging' );
+assert stageDeployDirectory.isDirectory();
+assert new File( stageDeployDirectory, 'module1' ).isDirectory();
+
+return true;
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/verify.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-different-site/verify.groovy
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/verify.groovy?rev=1480280&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/verify.groovy
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/verify.groovy
Wed May  8 14:04:16 2013
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+target = new File( basedir, 'target' );
+assert target.isDirectory();
+
+// deploy
+deployDirectory = new File( basedir, 'deploy' );
+assert deployDirectory.isDirectory();
+assert new File( deployDirectory, 'module1' ).isDirectory();
+
+// stage
+stageDirectory = new File( target, 'staging' );
+assert stageDirectory.isDirectory();
+assert new File( stageDirectory, 'module1' ).isDirectory();
+
+// stage deploy
+stageDeployDirectory = new File( deployDirectory, 'staging' );
+assert stageDeployDirectory.isDirectory();
+assert new File( stageDeployDirectory, 'module1' ).isDirectory();
+
+return true;
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/verify.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-no-site/verify.groovy
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd/verify.groovy?rev=1480280&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd/verify.groovy (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd/verify.groovy Wed May  8 14:04:16
2013
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+target = new File( basedir, 'target' );
+assert target.isDirectory();
+
+// stage
+stagingDirectory = new File( target, 'staging' );
+assert stagingDirectory.isDirectory();
+assert new File( stagingDirectory, 'MSITE-304-child' ).isDirectory(); // notice: artifactId,
not module name
+
+// stage-deploy
+deployDirectory = new File( target, 'www.example.com/parent' );
+stageDeployDirectory = new File( deployDirectory, 'staging' );
+assert stageDeployDirectory.isDirectory();
+assert new File( stageDeployDirectory, 'MSITE-304-child' ).isDirectory();
+assert !new File( deployDirectory, 'MSITE-304-child/staging' ).exists();
+
+return true;
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd/verify.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd/verify.groovy
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message