git://wamblee.org
/
utils
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9626446
)
(no commit message)
author
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Sat, 28 Aug 2010 19:33:57 +0000
(19:33 +0000)
committer
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Sat, 28 Aug 2010 19:33:57 +0000
(19:33 +0000)
wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryHeaderContributorTest.java
[moved from
wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryBehaviorTest.java
with 83% similarity]
patch
|
blob
|
history
wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryUtilsTest.java
patch
|
blob
|
history
diff --git
a/wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryBehaviorTest.java
b/wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryHeaderContributorTest.java
similarity index 83%
rename from
wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryBehaviorTest.java
rename to
wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryHeaderContributorTest.java
index ed971c82f445a31e9738a50ccfc0e93feff9c3e8..6aaeb35905c8d7d5fed5aa6dbc77b30570c2dff3 100644
(file)
--- a/
wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryBehaviorTest.java
+++ b/
wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryHeaderContributorTest.java
@@
-25,7
+25,7
@@
import org.junit.Before;
import org.junit.Test;
import org.wamblee.wicket.MyPage;
import org.junit.Test;
import org.wamblee.wicket.MyPage;
-public class JQuery
Behavi
orTest {
+public class JQuery
HeaderContribut
orTest {
private WicketTester wicket;
@Before
private WicketTester wicket;
@Before
@@
-41,17
+41,18
@@
public class JQueryBehaviorTest {
@Test
public void testJQueryDevelopmentMode() throws Exception {
MyPage page = new MyPage();
@Test
public void testJQueryDevelopmentMode() throws Exception {
MyPage page = new MyPage();
- page.add(new JQuery
Behavi
or());
+ page.add(new JQuery
HeaderContribut
or());
wicket.startPage(page);
wicket.assertRenderedPage(MyPage.class);
assertTrue(wicket.getServletResponse().getDocument().contains(
wicket.startPage(page);
wicket.assertRenderedPage(MyPage.class);
assertTrue(wicket.getServletResponse().getDocument().contains(
- JQueryBehavior.JQUERY_DEVELOPMENT));
+ JQueryHeaderContributor.JQUERY_DEVELOPMENT));
+ //System.out.println(wicket.getServletResponse().getDocument());
}
@Test
public void testJQueryDeploymentMode() throws Exception {
wicket.destroy();
}
@Test
public void testJQueryDeploymentMode() throws Exception {
wicket.destroy();
- JQuery
Behavi
or.clear();
+ JQuery
HeaderContribut
or.clear();
wicket = new WicketTester(new DummyWebApplication() {
@Override
public String getConfigurationType() {
wicket = new WicketTester(new DummyWebApplication() {
@Override
public String getConfigurationType() {
@@
-59,11
+60,11
@@
public class JQueryBehaviorTest {
}
});
MyPage page = new MyPage();
}
});
MyPage page = new MyPage();
- page.add(new JQuery
Behavi
or());
+ page.add(new JQuery
HeaderContribut
or());
wicket.startPage(page);
wicket.assertRenderedPage(MyPage.class);
assertTrue(wicket.getServletResponse().getDocument().contains(
wicket.startPage(page);
wicket.assertRenderedPage(MyPage.class);
assertTrue(wicket.getServletResponse().getDocument().contains(
- JQuery
Behavi
or.JQUERY_DEPLOYMENT));
+ JQuery
HeaderContribut
or.JQUERY_DEPLOYMENT));
}
}
}
}
diff --git
a/wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryUtilsTest.java
b/wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryUtilsTest.java
index c368c7662f1a34cfbc1b740064e599bc44d2641b..4045a5119ab3c55e38098ba148cbe1a324ba616c 100644
(file)
--- a/
wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryUtilsTest.java
+++ b/
wicket/components/src/test/java/org/wamblee/wicket/jquery/JQueryUtilsTest.java
@@
-42,14
+42,14
@@
public class JQueryUtilsTest {
public void testCreateReadyJavascript() {
Component component = new Label("label");
component.setOutputMarkupId(true);
public void testCreateReadyJavascript() {
Component component = new Label("label");
component.setOutputMarkupId(true);
- String readyHandler =
JQueryUtils
.createReadyFunction("myfunc", component);
- assertEquals("
$
(function(){org.wamblee.myfunc(\"#" + component.getMarkupId() + "\");});", readyHandler);
+ String readyHandler =
AbstractJQueryBehavior
.createReadyFunction("myfunc", component);
+ assertEquals("
jQuery
(function(){org.wamblee.myfunc(\"#" + component.getMarkupId() + "\");});", readyHandler);
}
@Test(expected = IllegalStateException.class)
public void testCreateReadyJavascriptNoMarkupId() {
Component component = new Label("label");
}
@Test(expected = IllegalStateException.class)
public void testCreateReadyJavascriptNoMarkupId() {
Component component = new Label("label");
- String readyHandler =
JQueryUtils
.createReadyFunction("myfunc", component);
+ String readyHandler =
AbstractJQueryBehavior
.createReadyFunction("myfunc", component);
}
}
}
}