[jboss-cvs] jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test ...
Gavin King
gavin.king at jboss.com
Wed Nov 1 20:09:41 EST 2006
User: gavin
Date: 06/11/01 20:09:41
Modified: examples/dvdstore/src/com/jboss/dvd/seam/test
BestSellersTest.java ProductUnitTest.java
SearchTest.java StoreManagerTest.java
Removed: examples/dvdstore/src/com/jboss/dvd/seam/test
BaseTest.java
Log:
updated tests
Revision Changes Path
1.4 +14 -9 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test/BestSellersTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BestSellersTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test/BestSellersTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- BestSellersTest.java 10 Jun 2006 07:16:41 -0000 1.3
+++ BestSellersTest.java 2 Nov 2006 01:09:41 -0000 1.4
@@ -9,6 +9,7 @@
import javax.faces.model.ListDataModel;
+import org.jboss.seam.mock.SeamTest;
import org.testng.annotations.Test;
import com.jboss.dvd.seam.BestSellers;
@@ -16,14 +17,15 @@
import com.jboss.dvd.seam.ShoppingCart;
public class BestSellersTest
- extends BaseTest
+ extends SeamTest
{
@Test
public void testTopProducts()
throws Exception
{
- String id = new Script() {
+ new NonFacesRequest() {
+ @Override
protected void renderResponse()
{
ListDataModel model = (ListDataModel) getInstance("topProducts");
@@ -57,7 +59,8 @@
public void testAddToCart()
throws Exception
{
- String id = new Script() {
+ String id = new FacesRequest() {
+ @Override
protected void invokeApplication() {
ListDataModel model = (ListDataModel) getInstance("topProducts");
model.setRowIndex(1);
@@ -67,7 +70,7 @@
BestSellers best = (BestSellers) getInstance("bestsellers");
best.addToCart();
}
-
+ @Override
protected void renderResponse() {
ShoppingCart cart = (ShoppingCart) getInstance("cart");
@@ -80,7 +83,8 @@
}
}.run();
- id = new Script(id) {
+ id = new FacesRequest(null, id) {
+ @Override
protected void invokeApplication() {
ListDataModel model = (ListDataModel) getInstance("topProducts");
model.setRowIndex(2);
@@ -88,7 +92,7 @@
BestSellers best = (BestSellers) getInstance("bestsellers");
best.addToCart();
}
-
+ @Override
protected void renderResponse() {
ShoppingCart cart = (ShoppingCart) getInstance("cart");
@@ -100,7 +104,8 @@
}
}.run();
- id = new Script(id) {
+ id = new FacesRequest(null, id) {
+ @Override
protected void invokeApplication() {
ListDataModel model = (ListDataModel) getInstance("topProducts");
model.setRowIndex(1);
@@ -108,7 +113,7 @@
BestSellers best = (BestSellers) getInstance("bestsellers");
best.addToCart();
}
-
+ @Override
protected void renderResponse() {
ShoppingCart cart = (ShoppingCart) getInstance("cart");
1.3 +2 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test/ProductUnitTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProductUnitTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test/ProductUnitTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ProductUnitTest.java 10 Jun 2006 07:16:41 -0000 1.2
+++ ProductUnitTest.java 2 Nov 2006 01:09:41 -0000 1.3
@@ -11,12 +11,13 @@
import javax.persistence.Persistence;
import javax.persistence.PersistenceException;
+import org.jboss.seam.mock.SeamTest;
import org.testng.annotations.Test;
import com.jboss.dvd.seam.Product;
public class ProductUnitTest
- extends BaseTest
+ extends SeamTest
{
EntityManager em() {
EntityManagerFactory emf = Persistence.createEntityManagerFactory("dvdDatabase");
1.4 +7 -6 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test/SearchTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SearchTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test/SearchTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SearchTest.java 10 Jun 2006 07:16:41 -0000 1.3
+++ SearchTest.java 2 Nov 2006 01:09:41 -0000 1.4
@@ -5,37 +5,38 @@
import javax.faces.model.ListDataModel;
+import org.jboss.seam.mock.SeamTest;
import org.testng.annotations.Test;
import com.jboss.dvd.seam.Search;
public class SearchTest
- extends BaseTest
+ extends SeamTest
{
@Test
public void testNoParamSearch()
throws Exception
{
- String id = new Script() {
+ new FacesRequest() {
Search search;
-
+ @Override
protected void updateModelValues()
{
search = (Search) getInstance("search");
}
-
+ @Override
protected void invokeApplication()
{
String outcome = search.doSearch();
assertEquals("search outcome", "browse", outcome);
}
-
+ @Override
protected void renderResponse()
{
ListDataModel model = (ListDataModel) lookup("searchResults");
assertEquals("page size", 15, model.getRowCount());
- assertTrue("in conversation", inConversation());
+ assertTrue("in conversation", isLongRunningConversation());
}
}.run();
}
1.3 +5 -5 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test/StoreManagerTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StoreManagerTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test/StoreManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- StoreManagerTest.java 10 Jun 2006 07:16:41 -0000 1.2
+++ StoreManagerTest.java 2 Nov 2006 01:09:41 -0000 1.3
@@ -2,27 +2,27 @@
import static org.testng.AssertJUnit.assertEquals;
+import org.jboss.seam.mock.SeamTest;
import org.testng.annotations.Test;
import com.jboss.dvd.seam.StoreManager;
public class StoreManagerTest
- extends BaseTest
+ extends SeamTest
{
@Test
public void testTopProducts()
throws Exception
{
- String id = new Script() {
+ new FacesRequest() {
StoreManager manager;
-
+ @Override
protected void updateModelValues()
{
manager = (StoreManager) getInstance("stats");
}
-
-
+ @Override
protected void renderResponse()
{
// these are from order instances -
More information about the jboss-cvs-commits
mailing list