You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2021/10/28 09:38:59 UTC
[jspwiki] branch master updated (6d76b0b -> a179edb)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from 6d76b0b added missing translation de/german
new c968d41 Update Selenide to 6.0.3 - closes #148
new 5eb84be Update dependencies' licenses
new b055815 fix issues raised by SonarQube
new e96bf3c simplify VERSTR constant
new d4e7a1b leftovers from #141
new a179edb 2.11.0-git-12
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog.md | 27 ++++++++++++----
LICENSE | 36 ++++++++++++++-------
.../src/main/java/org/apache/wiki/api/Release.java | 14 ++++----
.../jspwiki_logo_s.png | Bin
.../jspwiki_logo_s.png | Bin
.../jspwiki_logo_s.png | Bin
.../java/org/apache/wiki/its/AnonymousViewIT.java | 5 +--
.../src/main/java/org/apache/wiki/its/EditIT.java | 5 +--
.../src/main/java/org/apache/wiki/its/LoginIT.java | 5 +--
.../main/java/org/apache/wiki/its/SearchIT.java | 5 +--
.../apache/wiki/its/WithIntegrationTestSetup.java | 16 +++++++++
.../java/org/apache/wiki/its/environment/Env.java | 15 +++++++--
.../java/org/apache/wiki/pages/PageBuilder.java | 8 ++---
jspwiki-it-tests/pom.xml | 2 +-
.../src/main/java/org/apache/wiki/WikiSession.java | 10 +++---
.../htmltowiki/XHtmlElementToWikiTranslator.java | 8 +++--
.../org/apache/wiki/ui/DefaultCommandResolver.java | 2 +-
.../java/org/apache/wiki/plugin/DenounceTest.java | 22 +++++++------
pom.xml | 2 +-
19 files changed, 114 insertions(+), 68 deletions(-)
copy {jspwiki-war/src/main/webapp/images => jspwiki-it-tests/jspwiki-it-test-cma-jdbc/build/downloads/3eee9646-1af7-425e-a117-bd7399416182}/jspwiki_logo_s.png (100%)
mode change 100644 => 100755
copy {jspwiki-war/src/main/webapp/images => jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/build/downloads/3eeaa04b-0306-4b81-b98a-28e20a23221b}/jspwiki_logo_s.png (100%)
mode change 100644 => 100755
copy {jspwiki-war/src/main/webapp/images => jspwiki-it-tests/jspwiki-it-test-custom-jdbc/build/downloads/b5b76078-fa77-4aac-bcf6-c4633a2e2bbf}/jspwiki_logo_s.png (100%)
mode change 100644 => 100755
create mode 100755 jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/WithIntegrationTestSetup.java
copy jspwiki-api/src/test/java/org/apache/wiki/api/core/ContextEnumTest.java => jspwiki-main/src/test/java/org/apache/wiki/plugin/DenounceTest.java (56%)
mode change 100644 => 100755
[jspwiki] 02/06: Update dependencies' licenses
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 5eb84be12a842bd2082b541761a26073790b784b
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Oct 28 11:32:50 2021 +0200
Update dependencies' licenses
---
LICENSE | 36 ++++++++++++++++++++++++------------
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/LICENSE b/LICENSE
index f99d92a..fda952f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -209,6 +209,7 @@ LIBRARY LICENSE FILE
=============================================================================================================
activation-1.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.cddl
akismet-java-1.02.jar ./jspwiki-war/src/main/config/doc/LICENSE.akismet
+annotations-15.0.jar LICENSE
aws-java-sdk-core-1.12.59.jar LICENSE
aws-java-sdk-kendra-1.12.59.jar LICENSE
commons-codec-1.3.jar LICENSE
@@ -223,8 +224,18 @@ ehcache-2.10.9.2.jar LICENSE
flexmark-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-footnotes-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-toc-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-formatter-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-util-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-ast-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-builder-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-collection-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-data-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-dependency-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-format-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-html-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-misc-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-options-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-sequence-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-visitor-0.62.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
freshcookies-security-0.60.jar LICENSE
gson-2.8.8 LICENSE
httpclient-4.5.13 LICENSE
@@ -243,13 +254,14 @@ log4j-1.2-api-2.14.1.jar LICENSE
log4j-api-2.14.1.jar LICENSE
log4j-core-2.14.1.jar LICENSE
log4j-slf4j-impl-2.14.1 LICENSE
-lucene-analyzers-common-8.9.0.jar LICENSE
-lucene-core-8.9.0.jar LICENSE
-lucene-highlighter-8.9.0.jar LICENSE
-lucene-memory-8.9.0.jar LICENSE
-lucene-queries-8.9.0.jar LICENSE
-lucene-queryparser-8.9.0.jar LICENSE
-lucene-sandbox-8.9.0.jar LICENSE
+lucene-analyzers-common-8.10.0.jar LICENSE
+lucene-backward-codecs-8.10.0.jar LICENSE
+lucene-core-8.10.0.jar LICENSE
+lucene-highlighter-8.10.0.jar LICENSE
+lucene-memory-8.10.0.jar LICENSE
+lucene-queries-8.10.0.jar LICENSE
+lucene-queryparser-8.10.0.jar LICENSE
+lucene-sandbox-8.10.0.jar LICENSE
mail-1.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.cddl
nekohtml-1.9.22.jar LICENSE
org.suigeneris.jrcs.diff-0.4.2 LICENSE
@@ -270,10 +282,10 @@ commons-el-1.0.jar LICENSE
custom_rhino-0.4.3.jar ./jspwiki-war/src/main/config/doc/LICENSE.mpl
hsqldb-2.6.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
sqltool-2.6.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
-jetty-all-9.4.43.v20210629.jar LICENSE
+jetty-all-9.4.44.v20210927.jar LICENSE
junit-5.7.2 ./jspwiki-war/src/main/config/doc/LICENSE.cpl
-mockito-core-3.12.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
-selenide-5.24.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
+mockito-core-4.0.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
+selenide-6.0.3.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
stripes-1.7.0-async.jar LICENSE
yuicompressor-2.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.yui
@@ -289,7 +301,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI
RESOURCES LICENSE FILE
=============================================================================================================
-Apache Tomcat 9.0.52 LICENSE
+Apache Tomcat 9.0.54 LICENSE
Font Awesome (CSS & LESS files) ./jspwiki-war/src/main/config/doc/LICENSE.mit
Font Awesome (Fonts) ./jspwiki-war/src/main/config/doc/LICENSE.ofl
SilkIconSet ./jspwiki-war/src/main/config/doc/LICENSE.SilkIconSet
[jspwiki] 04/06: simplify VERSTR constant
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit e96bf3c66690900940e193358273d10ed473fd00
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Oct 28 11:34:25 2021 +0200
simplify VERSTR constant
---
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index ce27cf7..d4cf450 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -45,12 +45,12 @@ public final class Release {
public static final String APPNAME = "JSPWiki";
/**
- * This should be empty when doing a release - otherwise keep it as "cvs" so that whenever someone checks out the code, they know
+ * This should be empty when doing a release - otherwise keep it as "-git-" so that whenever someone checks out the code, they know
* it is a bleeding-edge version. Other possible values are "alpha" and "beta" for alpha and beta versions, respectively.
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "";
+ private static final String POSTFIX = "-git-";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -62,14 +62,14 @@ public final class Release {
public static final int MINORREVISION = 0;
/** The build number/identifier. This is a String as opposed to an integer, just so that people can add other identifiers to it.
- * The build number is incremented every time a committer checks in code, and reset when the a release is made.
+ * The build number is incremented every time a committer checks in code, and reset when a release is made.
* <p>
* If you are a person who likes to build his own releases, we recommend that you add your initials to this
- * identifier (e.g. "13-jj", or 49-aj").
+ * identifier (e.g. "13-jj", or "49-aj").
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "git-11";
+ public static final String BUILD = "12";
/**
* This is the generic version string you should use when printing out the version. It is of
@@ -78,8 +78,8 @@ public final class Release {
public static final String VERSTR = VERSION + "." +
REVISION + "." +
MINORREVISION +
- ( POSTFIX.length() != 0 ? "-" + POSTFIX : "" ) +
- ( BUILD.length() != 0 ? "-" + BUILD : "" );
+ POSTFIX +
+ BUILD;
/** Private constructor prevents instantiation. */
private Release() {
[jspwiki] 06/06: 2.11.0-git-12
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit a179edbde5e895980a53866ec4024fb1481ec922
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Oct 28 11:38:36 2021 +0200
2.11.0-git-12
---
ChangeLog.md | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 47f123b..130a97b 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,21 @@ specific language governing permissions and limitations
under the License.
-->
+**2021-10-28 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.11.0-git-12_
+
+* [#148](https://github.com/apache/jspwiki/pull/148) - Added missing translation de/german - Thanks to [Peter Hormanns](https://github.com/phormanns)!
+
+* Several code improvements, all relevant PRs provided by [Arturo Bernal](https://github.com/arturobernalg), thanks!
+ * [JSPWIKI-1155](https://issues.apache.org/jira/browse/JSPWIKI-1155) - String concat in StringBuilder [#140](https://github.com/apache/jspwiki/pull/140)
+ * [JSPWIKI-1156](https://issues.apache.org/jira/browse/JSPWIKI-1156) - Remove `protected` member in `final` class [#141](https://github.com/apache/jspwiki/pull/141)
+ * [JSPWIKI-1157](https://issues.apache.org/jira/browse/JSPWIKI-1157) - Remove redundant String [#142](https://github.com/apache/jspwiki/pull/142)
+ * [JSPWIKI-1158](https://issues.apache.org/jira/browse/JSPWIKI-1158) - Remove unnecessary ToString [#147](https://github.com/apache/jspwiki/pull/147)
+
+* Dependency updates
+ * Selenide to 6.0.3 [#145](https://github.com/apache/jspwiki/pull/145)
+
**2021-10-16 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.11.0-git-11_
@@ -38,7 +53,7 @@ under the License.
* _2.11.0-git-10_
-* Several code improvements, all relevant PRs provided by Arturo Bernal, thanks!
+* Several code improvements, all relevant PRs provided by [Arturo Bernal](https://github.com/arturobernalg), thanks!
* [JSPWIKI-1148](https://issues.apache.org/jira/browse/JSPWIKI-1148) - Avoid File Stream [#47](https://github.com/apache/jspwiki/pull/47)
* [JSPWIKI-1151](https://issues.apache.org/jira/browse/JSPWIKI-1151) - Simplify assertion with simpler and equivalent calls [#134](https://github.com/apache/jspwiki/pull/134)
* [JSPWIKI-1152](https://issues.apache.org/jira/browse/JSPWIKI-1152) - Make final variable when is possible [#135](https://github.com/apache/jspwiki/pull/135)
@@ -162,7 +177,7 @@ under the License.
* Merged [PR #46](https://github.com/apache/jspwiki/pull/46), contributed by Julien Masnada, thanks!
* [JSPWIKI-1144](https://issues.apache.org/jira/browse/JSPWIKI-1144) - Minor performance improvement
- * Merged [PR #36](https://github.com/apache/jspwiki/pull/36), contributed by Arturo Bernal, thanks!
+ * Merged [PR #36](https://github.com/apache/jspwiki/pull/36), contributed by [Arturo Bernal](https://github.com/arturobernalg), thanks!
* [JSPWIKI-1147](https://issues.apache.org/jira/browse/JSPWIKI-1147) - The button "Clear user preferences"
doesn't clear user preferences
@@ -172,7 +187,7 @@ doesn't clear user preferences
* _2.11.0-git-03_
* [JSPWIKI-1142](https://issues.apache.org/jira/browse/JSPWIKI-1142) - Minor performance improvements
- * Merged [PR #32](https://github.com/apache/jspwiki/pull/32), contributed by Arturo Bernal, thanks!
+ * Merged [PR #32](https://github.com/apache/jspwiki/pull/32), contributed by [Arturo Bernal](https://github.com/arturobernalg), thanks!
* `PropertyReader` logs stacktrace if unable to load the `jspwiki.properties` file
@@ -203,13 +218,13 @@ using a `TestEngine` could end up processing events using managers registered by
* _2.11.0-git-01_
* [JSPWIKI-1135](https://issues.apache.org/jira/browse/JSPWIKI-1135) - Add dependabot config file
- * Merged [PR #15](https://github.com/apache/jspwiki/pull/15), contributed by Arturo Bernal, thanks!
+ * Merged [PR #15](https://github.com/apache/jspwiki/pull/15), contributed by [Arturo Bernal](https://github.com/arturobernalg), thanks!
* [JSPWIKI-1136](https://issues.apache.org/jira/browse/JSPWIKI-1136) - Refine Class member fields
- * Merged [PR #16](https://github.com/apache/jspwiki/pull/16), contributed by Arturo Bernal, thanks!
+ * Merged [PR #16](https://github.com/apache/jspwiki/pull/16), contributed by [Arturo Bernal](https://github.com/arturobernalg), thanks!
* [JSPWIKI-1137](https://issues.apache.org/jira/browse/JSPWIKI-1137) - Minor Improvement
- * Merged [PR #17](https://github.com/apache/jspwiki/pull/17), contributed by Arturo Bernal, thanks!
+ * Merged [PR #17](https://github.com/apache/jspwiki/pull/17), contributed by [Arturo Bernal](https://github.com/arturobernalg), thanks!
* Dependency updates
* Gson to 2.8.6
[jspwiki] 03/06: fix issues raised by SonarQube
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit b05581533bd2dcb39f776ab8de78e60a33fbc673
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Oct 28 11:33:13 2021 +0200
fix issues raised by SonarQube
---
.../org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
index 78ffbf7..cee0013 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
@@ -510,7 +510,7 @@ public class XHtmlElementToWikiTranslator {
final String cssClass = a.getAttributeValue( "class" );
if( StringUtils.isNotEmpty( cssClass )
&& !cssClass.matches( "wikipage|createpage|external|interwiki|attachment" ) ) {
- attributesMap.put( "class", cssClass.replaceAll( "'", "\"" ) );
+ attributesMap.put( "class", cssClass.replace( "'", "\"" ) );
}
addAttributeIfPresent( a, attributesMap, "accesskey" );
addAttributeIfPresent( a, attributesMap, "charset" );
@@ -531,7 +531,7 @@ public class XHtmlElementToWikiTranslator {
private void addAttributeIfPresent( final Element a, final Map< String, String > attributesMap, final String attribute ) {
final String attr = a.getAttributeValue( attribute );
if( StringUtils.isNotEmpty( attr ) ) {
- attributesMap.put( attribute, attr.replaceAll( "'", "\"" ) );
+ attributesMap.put( attribute, attr.replace( "'", "\"" ) );
}
}
@@ -881,13 +881,15 @@ public class XHtmlElementToWikiTranslator {
private class PreStack extends Stack< String > {
+ @Override
public String push( final String item ) {
final String push = super.push( item );
outTrimmer.setWhitespaceTrimMode( isEmpty() );
return push;
}
- public String pop() {
+ @Override
+ public synchronized String pop() {
final String pop = super.pop();
outTrimmer.setWhitespaceTrimMode( isEmpty() );
return pop;
[jspwiki] 05/06: leftovers from #141
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit d4e7a1bb0c98751871b6eb7568fd22135ec29092
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Oct 28 11:38:20 2021 +0200
leftovers from #141
---
.../src/main/java/org/apache/wiki/WikiSession.java | 10 +++---
.../org/apache/wiki/ui/DefaultCommandResolver.java | 2 +-
.../java/org/apache/wiki/plugin/DenounceTest.java | 40 ++++++++++++++++++++++
3 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
index b59445e..424f2b2 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
@@ -220,10 +220,10 @@ public class WikiSession implements Session {
public Principal[] getRoles() {
final Set< Principal > roles = new HashSet<>();
- // Add all of the Roles possessed by the Subject directly
+ // Add all the Roles possessed by the Subject directly
roles.addAll( m_subject.getPrincipals( Role.class ) );
- // Add all of the GroupPrincipals possessed by the Subject directly
+ // Add all the GroupPrincipals possessed by the Subject directly
roles.addAll( m_subject.getPrincipals( GroupPrincipal.class ) );
// Return a defensive copy
@@ -388,7 +388,7 @@ public class WikiSession implements Session {
* This method should generally be called after a user's {@link org.apache.wiki.auth.user.UserProfile} is saved. If the wiki session
* is null, or there is no matching user profile, the method returns silently.
*/
- void injectGroupPrincipals() {
+ protected void injectGroupPrincipals() {
// Flush the existing GroupPrincipals
m_subject.getPrincipals().removeAll( m_subject.getPrincipals(GroupPrincipal.class) );
@@ -406,7 +406,7 @@ public class WikiSession implements Session {
* and login name. These Principals will be WikiPrincipals, and they will replace all other WikiPrincipals in the Subject. <em>Note:
* this method is never called during anonymous or asserted sessions.</em>
*/
- void injectUserProfilePrincipals() {
+ protected void injectUserProfilePrincipals() {
// Search for the user profile
final String searchId = m_loginPrincipal.getName();
if ( searchId == null ) {
@@ -460,7 +460,7 @@ public class WikiSession implements Session {
* logout process.
*
* @param engine the wiki engine
- * @param request the users's HTTP request
+ * @param request the user's HTTP request
*/
public static void removeWikiSession( final Engine engine, final HttpServletRequest request ) {
if ( engine == null || request == null ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
index 57a5ad9..71dda83 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
@@ -325,7 +325,7 @@ public class DefaultCommandResolver implements CommandResolver {
* @throws ProviderException if the underlyng page provider that locates pages
* throws an exception
*/
- boolean simplePageExists( final String page ) throws ProviderException {
+ protected boolean simplePageExists( final String page ) throws ProviderException {
if ( m_specialPages.containsKey( page ) ) {
return true;
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/DenounceTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/DenounceTest.java
new file mode 100755
index 0000000..4d2c41b
--- /dev/null
+++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/DenounceTest.java
@@ -0,0 +1,40 @@
+/*
+ Copyright (C) 2003 Janne Jalkanen (Janne.Jalkanen@iki.fi)
+
+ 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.
+ */
+package org.apache.wiki.plugin;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class DenounceTest {
+
+ @Test
+ void shouldCheckLinkIsValid() {
+ final Denounce d = new Denounce();
+ Assertions.assertFalse( d.isLinkValid( "javascript:alert( 'boohoo' )" ) );
+ Assertions.assertFalse( d.isLinkValid( "http://" ) );
+ Assertions.assertTrue( d.isLinkValid( "https://www.google.com" ) );
+ Assertions.assertFalse( d.isLinkValid( ":/www.google.com" ) );
+ Assertions.assertFalse( d.isLinkValid( "htptp://www.google.com" ) );
+ //Assertions.assertFalse( d.isLinkValid( "mailto:server" ) );
+ Assertions.assertFalse( d.isLinkValid( "http://www.google.com:asd" ) );
+ }
+
+}
[jspwiki] 01/06: Update Selenide to 6.0.3 - closes #148
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit c968d415ed12f17e59e896462c4f04271b1b3a26
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Oct 28 11:31:57 2021 +0200
Update Selenide to 6.0.3 - closes #148
---
.../jspwiki_logo_s.png | Bin 0 -> 5694 bytes
.../jspwiki_logo_s.png | Bin 0 -> 5694 bytes
.../jspwiki_logo_s.png | Bin 0 -> 5694 bytes
.../main/java/org/apache/wiki/its/AnonymousViewIT.java | 5 +----
.../src/main/java/org/apache/wiki/its/EditIT.java | 5 +----
.../src/main/java/org/apache/wiki/its/LoginIT.java | 5 +----
.../src/main/java/org/apache/wiki/its/SearchIT.java | 5 +----
.../org/apache/wiki/its/WithIntegrationTestSetup.java | 16 ++++++++++++++++
.../main/java/org/apache/wiki/its/environment/Env.java | 15 +++++++++++++--
.../main/java/org/apache/wiki/pages/PageBuilder.java | 8 +++-----
jspwiki-it-tests/pom.xml | 2 +-
pom.xml | 2 +-
12 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/build/downloads/3eee9646-1af7-425e-a117-bd7399416182/jspwiki_logo_s.png b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/build/downloads/3eee9646-1af7-425e-a117-bd7399416182/jspwiki_logo_s.png
new file mode 100755
index 0000000..df50b59
Binary files /dev/null and b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/build/downloads/3eee9646-1af7-425e-a117-bd7399416182/jspwiki_logo_s.png differ
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/build/downloads/3eeaa04b-0306-4b81-b98a-28e20a23221b/jspwiki_logo_s.png b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/build/downloads/3eeaa04b-0306-4b81-b98a-28e20a23221b/jspwiki_logo_s.png
new file mode 100755
index 0000000..df50b59
Binary files /dev/null and b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/build/downloads/3eeaa04b-0306-4b81-b98a-28e20a23221b/jspwiki_logo_s.png differ
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/build/downloads/b5b76078-fa77-4aac-bcf6-c4633a2e2bbf/jspwiki_logo_s.png b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/build/downloads/b5b76078-fa77-4aac-bcf6-c4633a2e2bbf/jspwiki_logo_s.png
new file mode 100755
index 0000000..df50b59
Binary files /dev/null and b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/build/downloads/b5b76078-fa77-4aac-bcf6-c4633a2e2bbf/jspwiki_logo_s.png differ
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java
index 44061b6..e9e318c 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java
@@ -18,12 +18,10 @@
*/
package org.apache.wiki.its;
-import com.codeborne.selenide.junit5.ScreenShooterExtension;
import org.apache.wiki.pages.Page;
import org.apache.wiki.pages.haddock.ViewWikiPage;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
import java.io.File;
@@ -34,8 +32,7 @@ import static com.codeborne.selenide.Condition.not;
/**
* Anonymous view related tests for Apache JSPWiki
*/
-@ExtendWith( ScreenShooterExtension.class )
-public class AnonymousViewIT {
+public class AnonymousViewIT extends WithIntegrationTestSetup {
@Test
void anonymousView() {
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java
index 0630b2d..2a16cc0 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java
@@ -18,18 +18,15 @@
*/
package org.apache.wiki.its;
-import com.codeborne.selenide.junit5.ScreenShooterExtension;
import org.apache.wiki.pages.haddock.EditWikiPage;
import org.apache.wiki.pages.haddock.ViewWikiPage;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
/**
* Edit-related tests for Apache JSPWiki
*/
-@ExtendWith( ScreenShooterExtension.class )
-public class EditIT {
+public class EditIT extends WithIntegrationTestSetup {
@Test
void createPageAndTestEditPermissions() {
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java
index 77521b9..65880b8 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java
@@ -18,19 +18,16 @@
*/
package org.apache.wiki.its;
-import com.codeborne.selenide.junit5.ScreenShooterExtension;
import org.apache.wiki.pages.haddock.LoginPage;
import org.apache.wiki.pages.haddock.ViewWikiPage;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
/**
* Login-related tests for Apache JSPWiki
*/
-@ExtendWith( ScreenShooterExtension.class )
-public class LoginIT {
+public class LoginIT extends WithIntegrationTestSetup {
@Test
void loginAndLogout() {
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/SearchIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/SearchIT.java
index 3d4d3d6..95c696b 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/SearchIT.java
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/SearchIT.java
@@ -18,18 +18,15 @@
*/
package org.apache.wiki.its;
-import com.codeborne.selenide.junit5.ScreenShooterExtension;
import org.apache.wiki.its.environment.Env;
import org.apache.wiki.pages.haddock.ViewWikiPage;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
/**
* Search-related tests for Apache JSPWiki
*/
-@ExtendWith( ScreenShooterExtension.class )
-public class SearchIT {
+public class SearchIT extends WithIntegrationTestSetup {
@Test
void performSearches() throws Exception {
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/WithIntegrationTestSetup.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/WithIntegrationTestSetup.java
new file mode 100755
index 0000000..f9ed7fa
--- /dev/null
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/WithIntegrationTestSetup.java
@@ -0,0 +1,16 @@
+package org.apache.wiki.its;
+
+import com.codeborne.selenide.junit5.ScreenShooterExtension;
+import org.apache.wiki.its.environment.Env;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@ExtendWith( ScreenShooterExtension.class )
+public class WithIntegrationTestSetup {
+
+ @BeforeAll
+ public static void setUp() {
+ Env.setUp();
+ }
+
+}
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java
index 90951d8..5a80544 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java
@@ -19,6 +19,8 @@
package org.apache.wiki.its.environment;
+import com.codeborne.selenide.Configuration;
+
/**
* Tests' environment values that can be overwritten through System properties.
*/
@@ -39,8 +41,8 @@ public class Env {
/** Amount of time, in milliseconds, to wait for the search index tasks to complete. Default value is {@code 1200}. */
public static final long TESTS_CONFIG_SEARCH_INDEX_WAIT = Long.parseLong( System.getProperty( "it-jspwiki.config.search-index-wait", "1200" ) );
- /** Should the browser start maximized?. Default value is {@code true}. */
- public static final boolean TESTS_CONFIG_START_MAXIMIZED = Boolean.parseBoolean( System.getProperty( "it-jspwiki.config.start-maximized", "true" ) );
+ /** Which size should start the browser with?. Default value is {@code 1366x768}. */
+ public static final String TESTS_CONFIG_BROWSER_SIZE = System.getProperty( "it-jspwiki.config.browser-size", "1366x768" );
/** Folder where the WebDriver will be downloaded. Default value is {@code ./target/wdm}. */
public static final String TESTS_CONFIG_WDM_TARGET_PATH = System.getProperty( "it-jspwiki.config.wdm.target-path", "./target/wdm" );
@@ -51,4 +53,13 @@ public class Env {
/** Janne's password. Default value is {@code myP@5sw0rd}. */
public static final String LOGIN_JANNE_PASSWORD = System.getProperty( "it-jspwiki.login.janne.password", "myP@5sw0rd" );
+ public static void setUp() {
+ Configuration.headless = Env.TESTS_CONFIG_HEADLESS;
+ Configuration.fastSetValue = true; // default value seems to not send `[` or `{` characters to input controls. weird.
+ Configuration.reportsFolder = Env.TESTS_CONFIG_REPORTS_FOLDER;
+ Configuration.browserSize = Env.TESTS_CONFIG_BROWSER_SIZE;
+ Configuration.downloadsFolder = Env.TESTS_CONFIG_DOWNLOADS_FOLDER;
+ System.setProperty( "wdm.targetPath", Env.TESTS_CONFIG_WDM_TARGET_PATH );
+ }
+
}
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java
index 22d4bd2..f9dfb62 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java
@@ -18,9 +18,7 @@
*/
package org.apache.wiki.pages;
-import com.codeborne.selenide.Configuration;
import com.codeborne.selenide.Selenide;
-import org.apache.wiki.its.environment.Env;
/**
@@ -43,12 +41,12 @@ public class PageBuilder {
* @return {@link Page} instance given on the {@link PageBuilder} constructor.
*/
public < T extends Page > T openAs( final T page ) {
- Configuration.headless = Env.TESTS_CONFIG_HEADLESS;
+ /* Configuration.headless = Env.TESTS_CONFIG_HEADLESS;
Configuration.fastSetValue = true; // default value seems to not send `[` or `{` characters to input controls. weird.
Configuration.reportsFolder = Env.TESTS_CONFIG_REPORTS_FOLDER;
- Configuration.startMaximized = Env.TESTS_CONFIG_START_MAXIMIZED;
+ Configuration.browserSize = Env.TESTS_CONFIG_BROWSER_SIZE;
Configuration.downloadsFolder = Env.TESTS_CONFIG_DOWNLOADS_FOLDER;
- System.setProperty( "wdm.targetPath", Env.TESTS_CONFIG_WDM_TARGET_PATH );
+ System.setProperty( "wdm.targetPath", Env.TESTS_CONFIG_WDM_TARGET_PATH ); */
Selenide.open( url );
return page;
diff --git a/jspwiki-it-tests/pom.xml b/jspwiki-it-tests/pom.xml
index 32bfe05..9b3a8fb 100644
--- a/jspwiki-it-tests/pom.xml
+++ b/jspwiki-it-tests/pom.xml
@@ -106,10 +106,10 @@
</dependenciesToScan>
<systemPropertyVariables>
<it-jspwiki.base.url>http://localhost:8080/${it-jspwiki.context}</it-jspwiki.base.url>
+ <it-jspwiki.config.browser-size>1366x768</it-jspwiki.config.browser-size>
<it-jspwiki.config.download-folder>./target/downloads</it-jspwiki.config.download-folder>
<it-jspwiki.config.headless>false</it-jspwiki.config.headless>
<it-jspwiki.config.reports-folder>${project.basedir}/target/selenide</it-jspwiki.config.reports-folder>
- <it-jspwiki.config.start-maximized>true</it-jspwiki.config.start-maximized>
<it-jspwiki.config.wdm.target-path>${project.basedir}/target/wdm</it-jspwiki.config.wdm.target-path>
<it-jspwiki.login.janne.username>janne</it-jspwiki.login.janne.username>
<it-jspwiki.login.janne.password>myP@5sw0rd</it-jspwiki.login.janne.password>
diff --git a/pom.xml b/pom.xml
index 6769430..ae3b2e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
<nekohtml.version>1.9.22</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
- <selenide.version>5.25.0</selenide.version>
+ <selenide.version>6.0.3</selenide.version>
<slf4j.version>1.7.32</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>2.1.0</tika.version>