You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/02/05 20:52:24 UTC
[1/3] wicket git commit: WICKET-6081 Add "assertNotRequired" to the
WicketTester
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 65eedbf84 -> e417c2727
WICKET-6081 Add "assertNotRequired" to the WicketTester
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1fcb3be7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1fcb3be7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1fcb3be7
Branch: refs/heads/wicket-6.x
Commit: 1fcb3be7a23802c5977b493444eefc9192ab88a1
Parents: 65eedbf
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 5 20:40:59 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 5 20:42:15 2016 +0100
----------------------------------------------------------------------
.../wicket/util/tester/BaseWicketTester.java | 71 +++++++++++++-------
.../apache/wicket/util/tester/WicketTester.java | 11 +++
2 files changed, 58 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1fcb3be7/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index b050829..67c85af 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -1660,11 +1660,7 @@ public class BaseWicketTester
*/
public <C extends Component> Result isComponent(String path, Class<C> expectedComponentClass)
{
- Component component = getComponentFromLastRenderedPage(path);
- if (component == null)
- {
- return Result.fail("Component not found: " + path);
- }
+ Component component = assertExists(path);
return isTrue("component '" + Classes.simpleName(component.getClass()) + "' is not type:" +
Classes.simpleName(expectedComponentClass),
@@ -1732,12 +1728,7 @@ public class BaseWicketTester
*/
public Result isEnabled(final String path)
{
- Component component = getComponentFromLastRenderedPage(path);
- if (component == null)
- {
- fail("path: '" + path + "' does no exist for page: " +
- Classes.simpleName(getLastRenderedPage().getClass()));
- }
+ Component component = assertExists(path);
return isTrue("component '" + path + "' is disabled", component.isEnabledInHierarchy());
}
@@ -1751,14 +1742,29 @@ public class BaseWicketTester
*/
public Result isDisabled(final String path)
{
+ Component component = assertExists(path);
+
+ return isFalse("component '" + path + "' is enabled", component.isEnabledInHierarchy());
+ }
+
+ private Component assertExists(final String path) {
Component component = getComponentFromLastRenderedPage(path);
if (component == null)
{
fail("path: '" + path + "' does no exist for page: " +
- Classes.simpleName(getLastRenderedPage().getClass()));
+ Classes.simpleName(getLastRenderedPage().getClass()));
}
+ return component;
+ }
- return isFalse("component '" + path + "' is enabled", component.isEnabledInHierarchy());
+ private FormComponent assertFormComponent(final String path) {
+ Component component = assertExists(path);
+
+ if (component instanceof FormComponent == false)
+ {
+ fail("path: '" + path + "' is not a form component");
+ }
+ return (FormComponent) component;
}
/**
@@ -1770,18 +1776,9 @@ public class BaseWicketTester
*/
public Result isRequired(String path)
{
- Component component = getComponentFromLastRenderedPage(path);
- if (component == null)
- {
- fail("path: '" + path + "' does no exist for page: " +
- Classes.simpleName(getLastRenderedPage().getClass()));
- }
- else if (component instanceof FormComponent == false)
- {
- fail("path: '" + path + "' is not a form component");
- }
+ FormComponent formComponent = assertFormComponent(path);
- return isRequired((FormComponent<?>)component);
+ return isRequired(formComponent);
}
/**
@@ -1797,6 +1794,32 @@ public class BaseWicketTester
}
/**
+ * Asserts that a component is not required.
+ *
+ * @param path
+ * path to component
+ * @return a <code>Result</code>
+ */
+ public Result isNotRequired(String path)
+ {
+ FormComponent formComponent = assertFormComponent(path);
+
+ return isNotRequired(formComponent);
+ }
+
+ /**
+ * Asserts that a component is not required.
+ *
+ * @param component
+ * a form component
+ * @return a <code>Result</code>
+ */
+ public Result isNotRequired(FormComponent<?> component)
+ {
+ return isFalse("component '" + component + "' is required", component.isRequired());
+ }
+
+ /**
* assert the content of last rendered page contains(matches) regex pattern.
*
* @param pattern
http://git-wip-us.apache.org/repos/asf/wicket/blob/1fcb3be7/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index bc61eea..09869d9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -679,6 +679,17 @@ public class WicketTester extends BaseWicketTester
}
/**
+ * assert form component is required.
+ *
+ * @param path
+ * path to form component
+ */
+ public void assertNotRequired(String path)
+ {
+ assertResult(isNotRequired(path));
+ }
+
+ /**
*
* @param result
*/
[2/3] wicket git commit: Use older version of maven-bundle-plugin
because otherwise it is not possible to build with Java 6:
Posted by mg...@apache.org.
Use older version of maven-bundle-plugin because otherwise it is not possible to build with Java 6:
[ERROR] Failed to execute goal org.apache.felix:maven-bundle-plugin:3.0.1:manifest (bundle-manifest) on project wicket-parent: Execution bundle-manifest of goal org.apache.felix:maven-bundle-plugin:3.0.1:manifest failed: An API incompatibility was encountered while executing org.apache.felix:maven-bundle-plugin:3.0.1:manifest: java.lang.UnsupportedClassVersionError: aQute/bnd/osgi/Analyzer : Unsupported major.minor version 51.0
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9cc57fb4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9cc57fb4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9cc57fb4
Branch: refs/heads/wicket-6.x
Commit: 9cc57fb4018cf62bfd20bf01de824dd2e26d7191
Parents: 1fcb3be
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 5 20:44:09 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 5 20:44:09 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9cc57fb4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a1fdd11..00232ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -878,7 +878,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
+ <version>2.3.7</version>
<executions>
<execution>
<id>bundle-manifest</id>
[3/3] wicket git commit: Fix the version for wicket-atmosphere
Posted by mg...@apache.org.
Fix the version for wicket-atmosphere
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e417c272
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e417c272
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e417c272
Branch: refs/heads/wicket-6.x
Commit: e417c2727b24c40983f09b60bbc025bb994daa82
Parents: 9cc57fb
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 5 20:52:08 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 5 20:52:08 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e417c272/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 00232ce..73f7c03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,7 +365,7 @@
<dependency>
<groupId>org.apache.wicket.experimental.wicket6</groupId>
<artifactId>wicket-atmosphere</artifactId>
- <version>0.24-SNAPSHOT</version>
+ <version>0.25-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>