Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WICKET-7072] wicket tester and core tests #660

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache Wicket
Copyright 2006-2016 The Apache Software Foundation
Copyright 2006-2023 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Expand All @@ -15,7 +15,7 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE
src/./wicket-guice
---------------------------------------------------------------------------
Apache Wicket
Copyright 2006-2012 Apache Software Foundation
Copyright 2006-2023 Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Expand All @@ -26,7 +26,7 @@ src/./wicket-guice
src/./wicket-examples
---------------------------------------------------------------------------
Apache Wicket Examples
Copyright 2006-2012 Apache Software Foundation
Copyright 2006-2023 Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Expand Down Expand Up @@ -66,7 +66,7 @@ src/./wicket-examples
src/./wicket-core
---------------------------------------------------------------------------
Apache Wicket
Copyright 2006-2012 Apache Software Foundation
Copyright 2006-2023 Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Expand Down Expand Up @@ -102,7 +102,7 @@ src/./wicket-metrics
---------------------------------------------------------------------------

Apache Wicket Metrics
Copyright 2006-2016 Apache Software Foundation
Copyright 2006-2023 Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Expand Down
16 changes: 15 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@
<!-- wicket-eclipse-settings is separate released -->
<module>wicket</module>
<module>wicket-core</module>
<module>wicket-tester</module>
<module>wicket-core-tests</module>
<module>wicket-util</module>
<module>wicket-request</module>
<module>wicket-devutils</module>
Expand Down Expand Up @@ -184,7 +186,7 @@
<maven-archetype-plugin.version>3.2.1</maven-archetype-plugin.version>
<maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-deploy-plugin.version>3.1.0</maven-deploy-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
Expand Down Expand Up @@ -374,6 +376,12 @@
<version>10.0.0-M2-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core-tests</artifactId>
<version>10.0.0-M2-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-devutils</artifactId>
Expand Down Expand Up @@ -580,6 +588,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-tester</artifactId>
<version>10.0.0-M2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion testing/wicket-js-tests/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ module.exports = function(grunt) {
server: {
options: {
port: 38887,
// debug: true,
debug: true,
middleware: function(connect, options, middlewares) {
middlewares.unshift(function(req, res, next) {
if (req.url.indexOf('submitNestedForm') > 0) {
Expand Down
4 changes: 4 additions & 0 deletions wicket-auth-roles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-tester</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions wicket-bean-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-tester</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions wicket-cdi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
<osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",*</osgi.import.package>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-tester</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
Expand Down
1 change: 1 addition & 0 deletions wicket-core-tests/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
99 changes: 99 additions & 0 deletions wicket-core-tests/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<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>
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
<version>10.0.0-M2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-core-tests</artifactId>
<packaging>jar</packaging>
<name>Wicket Core Tests</name>
<description>
Internal JUnit Tests for Wicket Core (and Tester).
</description>
<properties>
<osgi.export.package>org.apache.wicket.core.tests*;-noimport:=true</osgi.export.package>
<osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",*</osgi.import.package>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-tester</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<!--
WICKET-7072:
To run this project successfully we need two things:
(1) no module-info,
otherwise error "The package org.apache.wicket conflicts with a package accessible from another module")
(2) useModulePath=false for maven-compiler plugin available for 3.11+ (see also WICKET-7019),
otherwise error "Can't compile test sources when main sources are missing a module descriptor")
see https://maven.apache.org/plugins/maven-compiler-plugin/plugin-info.html
-->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>test-compile</id>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<useModulePath>false</useModulePath>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This file's name contains spaces to ensure proper decoding of MockServletContext#getRealPath()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// static test resource
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.wicket.filetype.TestFileTypeDetector
Loading