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 2015/01/29 08:32:29 UTC
[3/3] wicket git commit: WICKET-5808 Add more unit tests
WICKET-5808 Add more unit tests
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3a36b0a2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3a36b0a2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3a36b0a2
Branch: refs/heads/master
Commit: 3a36b0a234a559f952ac0893a9de5326c86059de
Parents: 4b62ed0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jan 29 09:30:08 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jan 29 09:30:08 2015 +0200
----------------------------------------------------------------------
.../annot/SpringBeanWithGenericsTest.java | 76 +++++++++++++++++++-
1 file changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3a36b0a2/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
index 245cf90..f5e57e1 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
@@ -17,6 +17,7 @@
package org.apache.wicket.spring.injection.annot;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
@@ -86,6 +87,21 @@ public class SpringBeanWithGenericsTest extends Assert
assertTrue(beans.contains(ctx.getBean("stringBean")));
assertTrue(beans.contains(ctx.getBean("integerBean")));
}
+
+ @Test
+ public void listOfStringGenerics() throws Exception
+ {
+ AnnotatedListOfBeanStringGenericQualifier page =
+ tester.startPage(new AnnotatedListOfBeanStringGenericQualifier());
+
+ List<BeanWithGeneric<String>> beans = page.getBeans();
+
+ assertThat(beans, is(notNullValue()));
+ assertThat(beans.size(), is(1));
+
+ BeanWithGeneric<String> stringBean = (BeanWithGeneric<String>) ctx.getBean("stringBean");
+ assertThat(beans, hasItem(stringBean));
+ }
@Test
public void mapOfGenerics() throws Exception
@@ -132,8 +148,20 @@ public class SpringBeanWithGenericsTest extends Assert
assertThat(arrayListStrings.get(0), is(equalTo("one")));
assertThat(arrayListStrings.get(1), is(equalTo("two")));
assertThat(arrayListStrings.get(2), is(equalTo("three")));
+
+ ArrayList<Integer> arrayListIntegers = page.getArrayListIntegers();
+ assertThat(arrayListIntegers, is(notNullValue()));
+ assertThat(arrayListIntegers.size(), is(3));
+ assertThat(arrayListIntegers.get(0), is(1));
+ assertThat(arrayListIntegers.get(1), is(2));
+ assertThat(arrayListIntegers.get(2), is(3));
+
+ MyList<String> myList = page.getMyList();
+ assertThat(myList, is(notNullValue()));
+ assertThat(myList.size(), is(1));
+ assertThat(myList.get(0), is("one"));
}
-
+
@Test
public void listOfTypedGenerics() throws Exception
{
@@ -155,6 +183,17 @@ public class SpringBeanWithGenericsTest extends Assert
}
}
+ class AnnotatedListOfBeanStringGenericQualifier extends DummyHomePage
+ {
+ @SpringBean
+ private List<BeanWithGeneric<String>> beans;
+
+ public List<BeanWithGeneric<String>> getBeans()
+ {
+ return beans;
+ }
+ }
+
class AnnotatedListOfBeanGenericQualifier extends DummyHomePage
{
@SpringBean
@@ -216,6 +255,22 @@ public class SpringBeanWithGenericsTest extends Assert
{
return arrayListStrings;
}
+
+ @SpringBean
+ private ArrayList<Integer> arrayListIntegers;
+
+ public ArrayList<Integer> getArrayListIntegers()
+ {
+ return arrayListIntegers;
+ }
+
+ @SpringBean
+ private MyList<String> myList;
+
+ public MyList<String> getMyList()
+ {
+ return myList;
+ }
}
@Configuration
@@ -248,5 +303,24 @@ public class SpringBeanWithGenericsTest extends Assert
arrayList.add("three");
return arrayList;
}
+
+ @Bean
+ public ArrayList<Integer> arrayListIntegers()
+ {
+ ArrayList<Integer> arrayList = new ArrayList();
+ arrayList.add(1);
+ arrayList.add(2);
+ arrayList.add(3);
+ return arrayList;
+ }
+
+ @Bean
+ public MyList<String> myList() {
+ MyList<String> myList = new MyList<>();
+ myList.add("one");
+ return myList;
+ }
}
+
+ public static class MyList<T> extends ArrayList<T> {}
}