Author: michaelo Date: Sat Jul 20 20:04:48 2013 New Revision: 1505195 URL: http://svn.apache.org/r1505195 Log: Integration tests for - MSKSINS-75 - MSKSINS-76 - MSKSINS-75 topbar
fail on Windows due to Groovy's GString multiline \n terminator. Useful hint found on: http://evgeny-goldin.com/blog/groovy-multiline-strings/ Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-75/verify.groovy maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-75/verify.groovy URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-75/verify.groovy?rev=1505195&r1=1505194&r2=1505195&view=diff ============================================================================== --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-75/verify.groovy (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-75/verify.groovy Sat Jul 20 20:04:48 2013 @@ -1,7 +1,7 @@ File index = new File( basedir, "target/site/index.html" ) assert index.exists() assert 1 == index.getText().count( '''\ -<!-- Piwik --> + <!-- Piwik --> <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://example.org/piwik/" : "http://example.org/piwik/"); document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); @@ -13,4 +13,4 @@ assert 1 == index.getText().count( '''\ } catch( err ) {} </script><noscript><p><img src="http://example.org/piwik/piwik.php?idsite=1" style="border:0" alt=""/></p></noscript> <!-- End Piwik Tag --> -''' ) +'''.replace( "\n", System.getProperty( "line.separator" ) ) ) Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy?rev=1505195&r1=1505194&r2=1505195&view=diff ============================================================================== --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy Sat Jul 20 20:04:48 2013 @@ -10,9 +10,9 @@ assert 1 == index.getText().count( '''\ s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto'; t.parentNode.insertBefore(s, t); })(); - /* ]]> */</script>''' ) + /* ]]> */</script>'''.replace( "\n", System.getProperty( "line.separator" ) ) ) assert 1 == index.getText().count( '''\ <a class="FlattrButton" style="display:none;" href="http://opensource.org/"></a> <noscript><a href="http://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank"> - <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript>''' ) + <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript>'''.replace( "\n", System.getProperty( "line.separator" ) ) ) Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy?rev=1505195&r1=1505194&r2=1505195&view=diff ============================================================================== --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy Sat Jul 20 20:04:48 2013 @@ -10,9 +10,9 @@ assert 1 == index.getText().count( '''\ s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto'; t.parentNode.insertBefore(s, t); })(); - /* ]]> */</script>''' ) + /* ]]> */</script>'''.replace( "\n", System.getProperty( "line.separator" ) ) ) assert 1 == index.getText().count( '''\ <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://opensource.org/"></a> <noscript><a href="http://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank"> - <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript>''' ) + <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript>'''.replace( "\n", System.getProperty( "line.separator" ) ) )