Repository: wicket Updated Branches: refs/heads/wicket-8.x 58c0dcf6c -> dfe9cf011
fixed wicket-threadtest Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/06295eb8 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/06295eb8 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/06295eb8 Branch: refs/heads/wicket-8.x Commit: 06295eb810995d70efdb947a5c76506be9003bd4 Parents: 58c0dcf Author: Sven Meier <svenme...@apache.org> Authored: Tue Jul 17 21:27:34 2018 +0200 Committer: Sven Meier <svenme...@apache.org> Committed: Tue Jul 17 21:27:34 2018 +0200 ---------------------------------------------------------------------- testing/wicket-threadtest/pom.xml | 28 +++++++++++++++++--- .../org/apache/wicket/threadtest/App1Test1.java | 13 +++++++-- .../org/apache/wicket/threadtest/App1Test3.java | 2 +- .../wicket/threadtest/apps/app1/Home.java | 20 +++----------- .../wicket/threadtest/apps/app1/TestApp1.java | 4 +-- .../wicket/threadtest/apps/app2/TestApp2.java | 2 +- .../threadtest/tester/AbstractGetCommand.java | 18 ++++++++++--- .../apache/wicket/threadtest/tester/Tester.java | 1 + 8 files changed, 58 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/06295eb8/testing/wicket-threadtest/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-threadtest/pom.xml b/testing/wicket-threadtest/pom.xml index a1f594f..6367c17 100644 --- a/testing/wicket-threadtest/pom.xml +++ b/testing/wicket-threadtest/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>8.0.0-SNAPSHOT</version> + <version>8.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>wicket-threadtest</artifactId> @@ -42,16 +42,36 @@ <artifactId>wicket-extensions</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-all-server</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <scope>compile</scope> </dependency> <dependency> - <groupId>httpunit</groupId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.httpunit</groupId> <artifactId>httpunit</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/wicket/blob/06295eb8/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java ---------------------------------------------------------------------- diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java index d954612..413e887 100644 --- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java +++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java @@ -36,12 +36,21 @@ public class App1Test1 List<String> gets = Arrays.asList( "/app1/wicket/bookmarkable/org.apache.wicket.threadtest.apps.app1.Home", - "/app1/wicket/page?0-${iteration}.ILinkListener-link"); + "/app1/wicket/page?${id}-1.-link"); // you can turn this on if you e.g. want to attach to a profiler // Thread.sleep(5000); - SimpleGetCommand getCmd = new SimpleGetCommand(gets, 10); + SimpleGetCommand getCmd = new SimpleGetCommand(gets, 10) { + @Override + protected String getValue(String name, int iteration) { + if ("id".equals(name)) { + // page id increases by one on each render + return "" + (iteration * 2); + } + return super.getValue(name, iteration); + } + }; // getCmd.setPrintResponse(true); Tester tester = new Tester(getCmd, 100, true); tester.run(); http://git-wip-us.apache.org/repos/asf/wicket/blob/06295eb8/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java ---------------------------------------------------------------------- diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java index ec562f3..244c9d4 100644 --- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java +++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java @@ -39,7 +39,7 @@ public class App1Test3 gets.add("/app1/wicket/bookmarkable/org.apache.wicket.threadtest.apps.app1.ResourceTestPage"); for (int i = 0; i < ResourceTestPage.IMAGES_PER_PAGE; i++) { - gets.add("/app1/wicket/page?0-IResourceListener-listView-${iteration}-image"); + gets.add("/app1/wicket/page?${iteration}--listView-${iteration}-image"); } SimpleGetCommand getCmd = new SimpleGetCommand(gets, 5); http://git-wip-us.apache.org/repos/asf/wicket/blob/06295eb8/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java ---------------------------------------------------------------------- diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java index da31448..7f2c186 100644 --- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java +++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java @@ -34,6 +34,7 @@ import org.apache.wicket.markup.html.form.CheckGroup; import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.FormComponentUpdatingBehavior; import org.apache.wicket.markup.html.form.ListMultipleChoice; import org.apache.wicket.markup.html.form.Radio; import org.apache.wicket.markup.html.form.RadioChoice; @@ -318,23 +319,8 @@ public class Home extends WebPage { super(id, LOCALES, new LocaleChoiceRenderer()); setDefaultModel(new PropertyModel<Locale>(Home.this, "locale")); - } - - /** - * @see org.apache.wicket.markup.html.form.DropDownChoice#onSelectionChanged(java.lang.Object) - */ - @Override - public void onSelectionChanged(Locale newSelection) - { - } - - /** - * @see org.apache.wicket.markup.html.form.DropDownChoice#wantOnSelectionChangedNotifications() - */ - @Override - protected boolean wantOnSelectionChangedNotifications() - { - return true; + + add(new FormComponentUpdatingBehavior()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/06295eb8/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java ---------------------------------------------------------------------- diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java index 8fdb5cf..a9c75a9 100644 --- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java +++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java @@ -75,10 +75,10 @@ public class TestApp1 extends WebApplication setPageManagerProvider(new DefaultPageManagerProvider(this) { @Override - public IPageManager get(IPageManagerContext pageManagerContext) + public IPageManager apply(IPageManagerContext pageManagerContext) { IDataStore dataStore = new HttpSessionDataStore(pageManagerContext, - new PageNumberEvictionStrategy(100)); + new PageNumberEvictionStrategy(500)); IPageStore pageStore = new DefaultPageStore( new JavaSerializer(getApplicationKey()), dataStore, getStoreSettings().getInmemoryCacheSize()); http://git-wip-us.apache.org/repos/asf/wicket/blob/06295eb8/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java ---------------------------------------------------------------------- diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java index f18a4dc..d702087 100644 --- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java +++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestApp2.java @@ -63,7 +63,7 @@ public class TestApp2 extends WebApplication setPageManagerProvider(new DefaultPageManagerProvider(this) { @Override - public IPageManager get(IPageManagerContext pageManagerContext) + public IPageManager apply(IPageManagerContext pageManagerContext) { IDataStore dataStore = new HttpSessionDataStore(pageManagerContext, new PageNumberEvictionStrategy(100)); http://git-wip-us.apache.org/repos/asf/wicket/blob/06295eb8/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/AbstractGetCommand.java ---------------------------------------------------------------------- diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/AbstractGetCommand.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/AbstractGetCommand.java index 89b928d..d7c0387 100644 --- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/AbstractGetCommand.java +++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/AbstractGetCommand.java @@ -20,6 +20,7 @@ import java.util.List; import org.apache.commons.httpclient.HttpClient; import org.apache.wicket.util.string.Strings; +import org.apache.wicket.util.string.interpolator.VariableInterpolator; /** * TODO javadoc @@ -52,14 +53,25 @@ public abstract class AbstractGetCommand extends AbstractCommand List<String> urls = getUrls(); for (String url : urls) { - - String modUrl = Strings.replaceAll(url, "${iteration}", String.valueOf(i)) - .toString(); + final int iteration = i; + String modUrl = new VariableInterpolator(url, false) { + @Override + protected String getValue(String variableName) { + return AbstractGetCommand.this.getValue(variableName, iteration); + } + }.toString(); doGet(runner.getClient(), modUrl); } } } + protected String getValue(String name, int iteration) { + if ("iteration".equals(name)) { + return String.valueOf(iteration); + } + return null; + } + /** * Execute a GET request using the provided url. * http://git-wip-us.apache.org/repos/asf/wicket/blob/06295eb8/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java ---------------------------------------------------------------------- diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java index 03512d0..6ef6b80 100644 --- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java +++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java @@ -31,6 +31,7 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + /** * @author eelcohillenius */
