Seam SVN: r11557 - branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen.
by seam-commits@lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2009-10-08 09:54:01 -0400 (Thu, 08 Oct 2009)
New Revision: 11557
Modified:
branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewProjectTest.java
branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java
branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/VehicleTest.java
Log:
JBQA-2234 Created automated test method in seamgen testsuite, method for testing difference between explode and restart
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewProjectTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewProjectTest.java 2009-10-07 14:45:50 UTC (rev 11556)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/NewProjectTest.java 2009-10-08 13:54:01 UTC (rev 11557)
@@ -75,4 +75,37 @@
assertTrue(browser.isElementPresent(LOGIN), "User should not be logged in.");
assertTrue(browser.getText(MESSAGES).contains(LOGIN_FAILED_MESSAGE), LOGIN_FAILED_MESSAGE + " expected.");
}
+
+ /**
+ * This method tests a difference between ./seam explode and ./seam restart . Calling the former
+ * one should not cause application redeploy.
+ *
+ */
+ @Test(groups = { "newProjectGroup" })
+ public void explodeAndRestartDifferenceTest()
+ {
+ login();
+ // verify login
+ assertTrue(browser.isElementPresent(LOGOUT), "Logout link expected.");
+ assertTrue(browser.getText(SIGNED_USER).contains(DEFAULT_USERNAME), "Username not found. " + browser.getText(SIGNED_USER) + " found instead.");
+ // logout
+
+ boolean explode = seamGen.isExplode();
+ seamGen.setExplode(true);
+ seamGen.hotDeploy();
+ seamGen.setExplode(explode);
+
+ try
+ {
+ Thread.sleep(HOTDEPLOY_TIMEOUT);
+ }
+ catch (InterruptedException ie)
+ {
+ throw new RuntimeException(ie);
+ }
+
+ browser.refreshAndWait();
+ assertTrue(browser.isElementPresent(LOGOUT),
+ "Logout link expected. This means that the application was redeployed and caused the user not to be logged in");
+ }
}
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java 2009-10-07 14:45:50 UTC (rev 11556)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java 2009-10-08 13:54:01 UTC (rev 11557)
@@ -54,6 +54,8 @@
public static final String DEFAULT_USERNAME = "admin";
public static final String DEFAULT_PASSWORD = "";
+
+ protected static Long HOTDEPLOY_TIMEOUT = 30000L;
public static SeamSelenium browser;
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/VehicleTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/VehicleTest.java 2009-10-07 14:45:50 UTC (rev 11556)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/VehicleTest.java 2009-10-08 13:54:01 UTC (rev 11557)
@@ -43,6 +43,9 @@
public static final String VIEW_MAKE = "xpath=id('make')/div/span[2]";
public static final String VIEW_MODEL = "xpath=id('model')/div/span[2]";
public static final String VIEW_YEAR = "xpath=id('year')/div/span[2]";
+
+ protected static String REGISTRATION_TEXT = "Registration";
+ protected static String ERROR_TEXT = "An Error Occurred";
@Test(groups = "generate-entitiesTest", dependsOnGroups = { "newProjectGroup" })
public void newVehicleTest()
@@ -139,14 +142,36 @@
assertTrue(browser.isElementPresent(String.format(VEHICLE_LIST_ROW_BY_OWNER_NAME, registration, username)), "Person not assigned to vehicle.");
}
+ /**
+ * This method verifies that JBSEAM3866 issue is already resolved
+ */
@Test(groups = "generate-entitiesTest", dependsOnGroups = { "newProjectGroup" })
- public void searchTest()
+ public void testForJBSEAM3866()
{
- final String searchString = "9999999"; // should return two Audis
-
login();
browser.clickAndWait(VEHICLE_LINK);
- assertEquals(search(searchString), 2, "Unexpected number of search results for " + searchString);
+ assertTrue(browser.isTextPresent(REGISTRATION_TEXT),
+ "Page should contain text Registration");
+
+ boolean explode = seamGen.isExplode();
+ seamGen.setExplode(true);
+ seamGen.hotDeploy();
+ seamGen.setExplode(explode);
+
+ try
+ {
+ Thread.sleep(HOTDEPLOY_TIMEOUT);
+ }
+ catch (InterruptedException ie)
+ {
+ throw new RuntimeException(ie);
+ }
+
+ browser.refreshAndWait();
+ assertTrue(browser.isTextPresent(REGISTRATION_TEXT),
+ "Page should contain text Registration, which indicates that the error JBSEAM3866 is not present anymore");
+ assertTrue(!browser.isTextPresent(ERROR_TEXT),
+ "Page contains \"ERROR_TEXT\" which means that JBSEAM3866 error still exists");
}
public int search(String pattern)
15 years, 1 month
Seam SVN: r11556 - branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-07 10:45:50 -0400 (Wed, 07 Oct 2009)
New Revision: 11556
Modified:
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeleniumTestListener.java
Log:
screenshot capturing in seam-gen tests fixed
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeleniumTestListener.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeleniumTestListener.java 2009-10-07 14:45:08 UTC (rev 11555)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeleniumTestListener.java 2009-10-07 14:45:50 UTC (rev 11556)
@@ -52,9 +52,13 @@
public void onTestFailure(ITestResult arg0)
{
String logPath = OUTPUT_DIR + APP_NAME + "/" + arg0.getName();
- browser.captureScreenshot(logPath + ".png");
- browser.logHTMLContext(logPath + ".html");
- stopBrowser();
+ try {
+ browser.logHTMLContext(logPath + ".html");
+ browser.captureScreenshot(logPath + ".png");
+ } catch (Exception e) {
+ } finally {
+ stopBrowser();
+ }
}
public void onTestSkipped(ITestResult arg0)
15 years, 1 month
Seam SVN: r11555 - branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-07 10:45:08 -0400 (Wed, 07 Oct 2009)
New Revision: 11555
Modified:
branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeleniumTestListener.java
Log:
screenshot capturing in seam-gen tests fixed
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeleniumTestListener.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeleniumTestListener.java 2009-10-07 14:37:23 UTC (rev 11554)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeleniumTestListener.java 2009-10-07 14:45:08 UTC (rev 11555)
@@ -52,9 +52,13 @@
public void onTestFailure(ITestResult arg0)
{
String logPath = OUTPUT_DIR + APP_NAME + "/" + arg0.getName();
- browser.captureScreenshot(logPath + ".png");
- browser.logHTMLContext(logPath + ".html");
- stopBrowser();
+ try {
+ browser.logHTMLContext(logPath + ".html");
+ browser.captureScreenshot(logPath + ".png");
+ } catch (Exception e) {
+ } finally {
+ stopBrowser();
+ }
}
public void onTestSkipped(ITestResult arg0)
15 years, 1 month
Seam SVN: r11554 - branches/community/Seam_2_2/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium.
by seam-commits@lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2009-10-07 10:37:23 -0400 (Wed, 07 Oct 2009)
New Revision: 11554
Modified:
branches/community/Seam_2_2/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/WicketSimpleBookingTest.java
branches/community/Seam_2_2/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties
Log:
Fix of functional test for wicket example
Modified: branches/community/Seam_2_2/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/WicketSimpleBookingTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/WicketSimpleBookingTest.java 2009-10-07 12:59:16 UTC (rev 11553)
+++ branches/community/Seam_2_2/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/WicketSimpleBookingTest.java 2009-10-07 14:37:23 UTC (rev 11554)
@@ -21,6 +21,11 @@
*/
package org.jboss.seam.example.wicket.test.selenium;
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.AssertJUnit.fail;
+
+import java.text.MessageFormat;
+
import org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest;
/**
@@ -39,4 +44,34 @@
"index=1");
browser.select(getProperty("HOTEL_CREDIT_CARD_EXPIRY_YEAR"), "index=1");
}
+
+ @Override
+ protected int bookHotel(String hotelName, int bed, int smoking,
+ String creditCard, String creditCardName) {
+ if (!isLoggedIn())
+ fail();
+ if (!browser.isElementPresent(getProperty("SEARCH_SUBMIT"))) {
+ browser.open(CONTEXT_PATH + getProperty("MAIN_PAGE"));
+ browser.waitForPageToLoad(TIMEOUT);
+ }
+ enterSearchQuery(hotelName);
+ browser.click(getProperty("SEARCH_RESULT_TABLE_FIRST_ROW_LINK"));
+ browser.waitForPageToLoad(TIMEOUT);
+ // booking page
+ browser.click(getProperty("BOOKING_BOOK"));
+ browser.waitForPageToLoad(TIMEOUT);
+ // hotel page
+ populateBookingFields(bed, smoking, creditCard, creditCardName);
+ browser.click(getProperty("HOTEL_PROCEED"));
+ browser.waitForPageToLoad(TIMEOUT);
+ // confirm page
+ browser.click(getProperty("HOTEL_CONFIRM"));
+ browser.waitForPageToLoad(TIMEOUT);
+ // main page
+ String message = browser.getText(MessageFormat.format(getProperty("ORDER_CONFIRMATION_NUMBER"), hotelName));
+
+ int confirmationNumber = Integer.parseInt(message);
+ return confirmationNumber;
+ }
+
}
Modified: branches/community/Seam_2_2/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties 2009-10-07 12:59:16 UTC (rev 11553)
+++ branches/community/Seam_2_2/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties 2009-10-07 14:37:23 UTC (rev 11554)
@@ -47,12 +47,12 @@
HOTEL_CHECKIN_DATE_MESSAGE xpath=//span[@id='message']//span
HOTEL_CHECKOUT_DATE_FIELD identifier=checkoutDateBorder:checkoutDate:date
HOTEL_CHECKOUT_DATE_MESSAGE xpath=//span[@id='message']//span
-HOTEL_SMOKING_1 id=smokingBorder:smoking_true
-HOTEL_SMOKING_2 id=smokingBorder:smoking_false
+HOTEL_SMOKING_1 xpath\=//span[@id\='smoking']/input[@value\='true']
+HOTEL_SMOKING_2 xpath\=//span[@id\='smoking']/input[@value\='false']
HOTEL_CREDIT_CARD identifier=creditCardBorder:creditCard
HOTEL_CREDIT_CARD_NAME identifier=creditCardNameBorder:creditCardName
-HOTEL_CREDIT_CARD_EXPIRY_MONTH identifier=creditCardExpiryBorder:creditCardExpiryMonth
-HOTEL_CREDIT_CARD_EXPIRY_YEAR identifier=creditCardExpiryBorder:creditCardExpiryYear
+HOTEL_CREDIT_CARD_EXPIRY_MONTH xpath\=//select[contains(@id,'creditCardExpiryMonth')]
+HOTEL_CREDIT_CARD_EXPIRY_YEAR xpath\=//select[contains(@id,'creditCardExpiryYear')]
HOTEL_PROCEED id=proceed
HOTEL_CANCEL id=cancel
HOTEL_CONFIRM id=confirm
@@ -82,4 +82,5 @@
SPINNER xpath=//span[contains(@id, 'ajax-indicator')]
# ajax is used in wicket example but search button has to be clicked
USE_AJAX_SEARCH TRUE
-USE_SEARCH_BUTTON TRUE
\ No newline at end of file
+USE_SEARCH_BUTTON TRUE
+ORDER_CONFIRMATION_NUMBER=xpath\=//table[@id\="bookings"]/tbody/tr[normalize-space(td[1]/span/text()) \= "{0}"]/td[6]/span
15 years, 1 month
Seam SVN: r11553 - in branches/community/Seam_2_2/examples/wiki: src/test/org/jboss/seam/wiki/test and 1 other directories.
by seam-commits@lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2009-10-07 08:59:16 -0400 (Wed, 07 Oct 2009)
New Revision: 11553
Modified:
branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml
branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml
branches/community/Seam_2_2/examples/wiki/view/userHome_d.xhtml
Log:
Minor
Modified: branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java 2009-10-07 04:57:01 UTC (rev 11552)
+++ branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java 2009-10-07 12:59:16 UTC (rev 11553)
@@ -146,7 +146,10 @@
if (forumInfoMap.containsKey((Long)result[0])) {
ForumInfo info = forumInfoMap.get( (Long)result[0] );
info.setTotalNumOfTopics((Long)result[1]);
- info.setTotalNumOfPosts(info.getTotalNumOfTopics() + (Long)result[2]);
+ info.setTotalNumOfPosts(info.getTotalNumOfTopics());
+ if (result[2] != null) {
+ info.setTotalNumOfPosts(info.getTotalNumOfPosts() + (Long)result[2]);
+ }
}
return null;
}
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml 2009-10-07 04:57:01 UTC (rev 11552)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml 2009-10-07 12:59:16 UTC (rev 11553)
@@ -139,4 +139,8 @@
LAST_COMMENT_CREATED_ON="2006-09-23 13:45:00"
LAST_COMMENT_ID="309"/>
+ <WIKI_DOCUMENT_COUNT_COMMENT
+ WIKI_DOCUMENT_ID="308"
+ COMMENT_COUNT="1"/>
+
</dataset>
\ No newline at end of file
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml 2009-10-07 04:57:01 UTC (rev 11552)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml 2009-10-07 12:59:16 UTC (rev 11553)
@@ -129,6 +129,10 @@
LAST_COMMENT_CREATED_ON="2007-04-10 10:00:00"
LAST_COMMENT_ID="106"/>
+ <WIKI_DOCUMENT_COUNT_COMMENT
+ WIKI_DOCUMENT_ID="104"
+ COMMENT_COUNT="2"/>
+
<!-- Second (sticky) posting -->
<WIKI_NODE
NODE_ID="107" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="102"
@@ -166,6 +170,10 @@
LAST_COMMENT_CREATED_ON="2007-04-04 08:01:00"
LAST_COMMENT_ID="108"/>
+ <WIKI_DOCUMENT_COUNT_COMMENT
+ WIKI_DOCUMENT_ID="107"
+ COMMENT_COUNT="1"/>
+
<!-- Third posting
<WIKI_NODE
NODE_ID="112" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="102"
Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2009-10-07 04:57:01 UTC (rev 11552)
+++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2009-10-07 12:59:16 UTC (rev 11553)
@@ -364,6 +364,10 @@
LAST_COMMENT_CREATED_ON="2006-09-28 13:49:00"
LAST_COMMENT_ID="15"/>
+ <WIKI_DOCUMENT_COUNT_COMMENT
+ WIKI_DOCUMENT_ID="6"
+ COMMENT_COUNT="6"/>
+
<WIKI_DOCUMENT_HISTORY
FILE_HISTORY_ID="1" FILE_ID="6" FILE_REVISION="0"
NAME="One" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USERNAME="admin" content="Original text of Testdocument One"/>
Modified: branches/community/Seam_2_2/examples/wiki/view/userHome_d.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/wiki/view/userHome_d.xhtml 2009-10-07 04:57:01 UTC (rev 11552)
+++ branches/community/Seam_2_2/examples/wiki/view/userHome_d.xhtml 2009-10-07 12:59:16 UTC (rev 11553)
@@ -116,7 +116,7 @@
<ui:param name="fieldId" value="password"/>
<ui:define name="label">#{messages['lacewiki.label.userHome.Password']}</ui:define>
<h:inputSecret styleClass="ajaxSupport" tabindex="1" size="15" maxlength="15"
- redisplay="true" value="#{userHome.password}"
+ redisplay="true" value="#{userHome.password}" autocomplete="off"
disabled="#{userHome.instance.username == guestUser.username}">
<a:support status="globalStatus" event="onchange" action="#{userHome.validatePassword}"
reRender="passwordDecorate" oncomplete="onAjaxRequestComplete()"/>
@@ -130,7 +130,7 @@
<ui:param name="fieldId" value="passwordControl"/>
<ui:define name="label">#{messages['lacewiki.label.userHome.RepeatPassword']}</ui:define>
<h:inputSecret styleClass="ajaxSupport" tabindex="1" size="15" maxlength="15"
- redisplay="true" value="#{userHome.passwordControl}"
+ redisplay="true" value="#{userHome.passwordControl}" autocomplete="off"
disabled="#{userHome.instance.username == guestUser.username}">
<a:support status="globalStatus" event="onchange" action="#{userHome.validatePasswordControl}"
reRender="passwordControlDecorate" oncomplete="onAjaxRequestComplete()"/>
15 years, 1 month
Seam SVN: r11552 - in branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core: model and 1 other directory.
by seam-commits@lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2009-10-07 00:57:01 -0400 (Wed, 07 Oct 2009)
New Revision: 11552
Modified:
branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java
branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentCountComment.java
Log:
Minor
Modified: branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java 2009-10-06 12:25:17 UTC (rev 11551)
+++ branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java 2009-10-07 04:57:01 UTC (rev 11552)
@@ -706,11 +706,16 @@
// Next, the denormalized "total comment count" data duplication
- Long commentCount = (Long)
- getSession(true).getNamedQuery("countCommentOfDocument")
- .setParameter("documentId", document.getId())
- .setComment("Counting comments of document: " + document.getId())
- .uniqueResult();
+ Long commentCount = 0l;
+ try {
+ commentCount = (Long)
+ getSession(true).getNamedQuery("countCommentOfDocument")
+ .setParameter("documentId", document.getId())
+ .setComment("Counting comments of document: " + document.getId())
+ .uniqueResult();
+ } catch (Exception ex) {
+ // Ugh
+ }
WikiDocumentCountComment existingCommentCount =
restrictedEntityManager.find(WikiDocumentCountComment.class, document.getId());
@@ -719,6 +724,7 @@
} else {
existingCommentCount = new WikiDocumentCountComment();
existingCommentCount.setDocumentId(document.getId());
+ existingCommentCount.setCommentCount(commentCount);
restrictedEntityManager.persist(existingCommentCount);
}
}
Modified: branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentCountComment.java
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentCountComment.java 2009-10-06 12:25:17 UTC (rev 11551)
+++ branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentCountComment.java 2009-10-07 04:57:01 UTC (rev 11552)
@@ -19,8 +19,8 @@
@Column(name = "WIKI_DOCUMENT_ID", nullable = false)
private Long documentId;
- @Column(name = "COMMENT_COUNT")
- protected Long commentCount;
+ @Column(name = "COMMENT_COUNT", nullable = false)
+ protected Long commentCount = 0l;
public WikiDocumentCountComment() {}
15 years, 1 month
Seam SVN: r11551 - branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-06 08:25:17 -0400 (Tue, 06 Oct 2009)
New Revision: 11551
Modified:
branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java
Log:
ant logging enabled again in seam-gen testsuite
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java 2009-10-06 12:06:37 UTC (rev 11550)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java 2009-10-06 12:25:17 UTC (rev 11551)
@@ -66,7 +66,7 @@
Project ant = new Project();
ant.init();
ProjectHelper.configureProject(ant, new File(buildfile));
- // ant.addBuildListener(log);
+ ant.addBuildListener(log);
return ant;
}
15 years, 1 month
Seam SVN: r11550 - in branches/enterprise/JBPAPP_5_0: src/test/ftest and 5 other directories.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-06 08:06:37 -0400 (Tue, 06 Oct 2009)
New Revision: 11550
Removed:
branches/enterprise/JBPAPP_5_0/src/test/ftest/lib/
Modified:
branches/enterprise/JBPAPP_5_0/build.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/build.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/ui/build.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java
branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
Log:
JBPAPP-2887 backported changes to Seam functional testsuite
Modified: branches/enterprise/JBPAPP_5_0/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build.xml 2009-10-06 11:37:26 UTC (rev 11549)
+++ branches/enterprise/JBPAPP_5_0/build.xml 2009-10-06 12:06:37 UTC (rev 11550)
@@ -1060,6 +1060,14 @@
<target name="eclipseclasspath" depends="init, jargen,antlr" description="Update eclipse classpath">
<path id="seam-gen.path" path="${seam.dir}/lib/gen/jboss-seam-gen.jar" />
+
+ <ant antfile="${seam.dir}/src/test/ftest/examples/build.xml" target="copy.selenium" />
+ <ant antfile="${seam.dir}/src/test/ftest/examples/build.xml" target="copy.htmlunit">
+ <property name="depends.htmlunit" value="true" />
+ </ant>
+ <path id="ftest.path">
+ <fileset dir="${seam.dir}/lib/ftest" includes="*.jar" />
+ </path>
<taskdef name="eclipseClasspath"
classname="org.jboss.seam.tool.EclipseClasspathTask"
@@ -1083,6 +1091,7 @@
<path refid="compile.excel.path" />
<path refid="compile.remoting.path" />
<path refid="compile.ui.path" />
+ <path refid="ftest.path" />
</eclipseClasspath>
</target>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml 2009-10-06 11:37:26 UTC (rev 11549)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml 2009-10-06 12:06:37 UTC (rev 11550)
@@ -33,7 +33,7 @@
<property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
<!-- TODO : should the libs be in seam/lib and managed with mvn? -->
- <property name="lib.dir" value="${ftest.dir}/lib" />
+ <property name="lib.dir" value="${seam.dir}/lib/ftest" />
<property name="log.dir" value="${ftest.dir}/log" />
<!-- Build resources -->
@@ -150,6 +150,7 @@
<cleanexample name="spring" />
<cleanexample name="todo" />
<cleanexample name="ui" />
+ <ant antfile="${ftest.dir}/seamgen/build.xml" target="clean" />
</target>
<target name="undeployall">
@@ -184,22 +185,11 @@
<undeployexample name="ui" />
</target>
- <!-- Target for declaring needed libraries for tests to run -->
- <target name="import.libraries">
- <copyInlineDependencies id="selenium.server" scope="compile" todir="${lib.dir}">
- <dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0-beta-2" classifier="standalone"/>
- <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0-beta-2">
- <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default"/>
- </dependency>
- <dependency groupId="org.jboss.test" artifactId="jboss-test" version="1.1.0.GA"/>
- <dependency groupId="org.testng" artifactId="testng" version="5.9"/>
- </copyInlineDependencies>
+ <target name="copy.selenium">
+ <ant antfile="${ftest.dir}/examples/build.xml" target="copy.selenium" />
</target>
-
- <target name="start.selenium.server">
- <!-- Added for downloading libraries -->
- <antcall target="import.libraries"> </antcall>
-
+
+ <target name="start.selenium.server" depends="copy.selenium">
<java classpathref="selenium.server.classpath" classname="org.openqa.selenium.server.SeleniumServer" fork="true" spawn="true">
<arg line="-port ${selenium.server.port}" />
<arg line="${selenium.server.cmd.args}" />
@@ -208,14 +198,14 @@
<waitfor maxwait="30" maxwaitunit="second">
<and>
<socket server="${selenium.host}" port="${selenium.server.port}" />
- <!-- this url will 403, so we say that it should start counting errors at 404 to skip -->
- <http url="http://${selenium.host}:${selenium.server.port}/selenium-server/core/index.html" errorsBeginAt="404" />
+ <!-- this url will start returning 404 once the server is up, we set errorsBeginAt to 405 for the 404 response to be considered correct -->
+ <http url="http://${selenium.host}:${selenium.server.port}/selenium-server/core/index.html" errorsBeginAt="405" />
</and>
</waitfor>
</target>
<target name="stop.selenium.server">
- <get taskname="selenium-shutdown" src="http://${selenium.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDown" dest="${log.dir}/server.shutdown.dest.log" ignoreerrors="true" />
+ <get taskname="selenium-shutdown" src="http://${selenium.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" dest="${log.dir}/server.shutdown.dest.log" ignoreerrors="true" />
<echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
</target>
@@ -250,36 +240,10 @@
</sequential>
</macrodef>
- <!-- Target for declaring needed libraries for ftest tests -->
- <target name="importlibraries">
- <copyInlineDependencies id="allexamples" scope="compile" todir="${lib.dir}">
- <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit" version="2.3"/>
- <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.1"/>
- <dependency groupId="org.w3c" artifactId="sac" version="1.3"/>
- <dependency groupId="commons-io" artifactId="commons-io" version="1.3.1"/>
- <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/>
- <dependency groupId="apache-xerces" artifactId="xercesImpl" version="2.9.0"/>
- <dependency groupId="commons-collections" artifactId="commons-collections" version="3.1"/>
- <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/>
- <dependency groupId="apache-xalan" artifactId="xalan" version="j_2.7.0"/>
- <dependency groupId="commons-codec" artifactId="commons-codec" version="1.3"/>
- <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
- <dependency groupId="net.sourceforge.cssparser" artifactId="cssparser" version="0.9.5"/>
- <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit-core-js" version="2.4"/>
- <dependency groupId="net.sourceforge.nekohtml" artifactId="nekohtml" version="1.9.9"/>
- <dependency groupId="apache-xalan" artifactId="serializer" version="j_2.7.0"/>
- <dependency groupId="xml-apis" artifactId="xml-apis" version="1.3.03"/>
- </copyInlineDependencies>
- </target>
-
<macrodef name="callExample">
<attribute name="path" />
<attribute name="target" />
<sequential>
-
- <!-- Added for downloading libraries -->
- <antcall target="importlibraries"> </antcall>
-
<ant dir="@{path}" target="@{target}" inheritall="false">
<property name="container" value="${container}">
</property>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/build.xml 2009-10-06 11:37:26 UTC (rev 11549)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/build.xml 2009-10-06 12:06:37 UTC (rev 11550)
@@ -31,10 +31,10 @@
<property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
<property name="src.dir" value="src" />
<property name="common.src.dir" value="${ftest.dir}/src/main" />
- <property name="build.dir" value="build" />
- <property name="classes.dir" value="${build.dir}/classes" />
+ <property name="local.build.dir" value="build" />
+ <property name="classes.dir" value="${local.build.dir}/classes" />
<property name="test.output.dir" value="${seam.dir}/test-output" />
- <property name="ftest.lib.dir" value="${ftest.dir}/lib" />
+ <property name="ftest.lib.dir" value="${seam.dir}/lib/ftest" />
<property name="log.dir" value="log" />
<property name="test.report.dir" value="test-report" />
@@ -45,9 +45,16 @@
<property name="jboss5.context.path" value="/seam-${example.name}" />
<property name="functional.listener" value="org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener"/>
+ <property name="root.lib.dir" value="${seam.dir}/lib" />
+ <!-- Build resources -->
+ <import file="${seam.dir}/build/common.build.xml" />
+
<!-- common path setup -->
<path id="classpath.build">
+ <fileset dir="${root.lib.dir}">
+ <include name="testng-jdk15.jar"/>
+ </fileset>
<fileset dir="${ftest.lib.dir}" includes="**/*.jar" />
</path>
@@ -56,14 +63,10 @@
<path location="${classes.dir}" />
</path>
- <taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader" classpathref="classpath.build" />
- <taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader" classpathref="classpath.build" />
- <taskdef name="stop" classname="org.jboss.ant.taskdefs.server.StopServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader" classpathref="classpath.build" />
-
<!-- common target definitions -->
<target name="clean" description="Delete all generated files">
- <delete dir="${build.dir}" />
+ <delete dir="${local.build.dir}" />
<delete dir="${test.output.dir}" />
<delete dir="${report.dir}" />
<delete dir="${log.dir}" />
@@ -81,7 +84,7 @@
<!-- TODO we should compile this once to a common place not build for each example -->
<!-- TODO if needed we should allow examples to exclude/include src under
common dvd does not care about booking for example-->
- <target name="build.common" description="Compiles the common selenium test code">
+ <target name="build.common" depends="copy.htmlunit, copy.selenium" description="Compiles the common selenium test code">
<mkdir dir="${classes.dir}" />
<javac srcdir="${common.src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
<copy todir="${classes.dir}">
@@ -198,14 +201,42 @@
<propertyset id="jboss5.deploy.properties" />
</target>
- <target name="start.container.jboss" depends="container.properties">
- <server:config javaHome="${java.home}" jbossHome="${container.home}">
- <server name="${container.profile}">
- <jvmarg value="${container.jvm.arguments}" />
- <sysproperty key="java.endorsed.dirs" value="${container.home}/lib/endorsed" />
- </server>
- </server:config>
- <server:start name="${container.profile}" />
+ <!-- Target for obtaining htmlunit -->
+ <target name="copy.htmlunit" if="depends.htmlunit" unless="copy.htmlunit.done">
+ <copyInlineDependencies id="allexamples" scope="compile" todir="${ftest.lib.dir}">
+ <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit" version="2.3"/>
+ <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.1"/>
+ <dependency groupId="org.w3c" artifactId="sac" version="1.3"/>
+ <dependency groupId="commons-io" artifactId="commons-io" version="1.3.1"/>
+ <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/>
+ <dependency groupId="apache-xerces" artifactId="xercesImpl" version="2.9.0"/>
+ <dependency groupId="commons-collections" artifactId="commons-collections" version="3.1"/>
+ <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/>
+ <dependency groupId="apache-xalan" artifactId="xalan" version="j_2.7.0"/>
+ <dependency groupId="commons-codec" artifactId="commons-codec" version="1.3"/>
+ <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
+ <dependency groupId="net.sourceforge.cssparser" artifactId="cssparser" version="0.9.5"/>
+ <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit-core-js" version="2.4"/>
+ <dependency groupId="net.sourceforge.nekohtml" artifactId="nekohtml" version="1.9.9"/>
+ <dependency groupId="apache-xalan" artifactId="serializer" version="j_2.7.0"/>
+ <dependency groupId="xml-apis" artifactId="xml-apis" version="1.3.03"/>
+ </copyInlineDependencies>
+ <property name="copy.htmlunit.done" value="true" />
</target>
+ <target name="copy.selenium" unless="copy.selenium.done">
+ <copyInlineDependencies id="selenium.server" scope="compile" todir="${ftest.lib.dir}">
+ <dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0.1" classifier="standalone">
+ <exclusion groupId="org.seleniumhq.selenium.core" artifactId="selenium-core" />
+ <exclusion groupId="org.seleniumhq.selenium.server" artifactId="selenium-server-coreless" />
+ <exclusion groupId="org.apache.ant" artifactId="ant-trax" />
+ <exclusion groupId="org.apache.ant" artifactId="ant-nodeps" />
+ </dependency>
+ <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0.1">
+ <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default" />
+ </dependency>
+ </copyInlineDependencies>
+ <property name="copy.selenium.done" value="true" />
+ </target>
+
</project>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/ui/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/ui/build.xml 2009-10-06 11:37:26 UTC (rev 11549)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/ui/build.xml 2009-10-06 12:06:37 UTC (rev 11550)
@@ -23,5 +23,7 @@
<project name="ui.ftest.build" basedir="." default="build">
<property name="example.name" value="ui" />
+ <property name="depends.htmlunit" value="true"/>
+
<import file="../build.xml" />
</project>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2009-10-06 11:37:26 UTC (rev 11549)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2009-10-06 12:06:37 UTC (rev 11550)
@@ -32,10 +32,11 @@
<property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
<property name="common.src.dir" value="${ftest.dir}/src/main" />
<property name="src.dir" value="src/main" />
- <property name="seamgen.build.dir" value="build" />
+ <property name="seamgen.build.dir" value="${ftest.dir}/seamgen/build" />
<property name="classes.dir" value="${seamgen.build.dir}/classes" />
<property name="test.output.dir" value="${seam.dir}/test-output" />
- <property name="ftest.lib.dir" value="${ftest.dir}/lib" />
+ <property name="ftest.lib.dir" value="${seam.dir}/lib/ftest" />
+ <property name="root.lib.dir" value="${seam.dir}/lib" />
<property name="ftest.config.location" value="src/test/ftest/ftest.properties" />
<property file="${seam.dir}/${ftest.config.location}" />
@@ -43,6 +44,10 @@
<!-- common path setup -->
<path id="classpath.build">
+ <fileset dir="${root.lib.dir}">
+ <include name="testng-jdk15.jar"/>
+ <include name="gen/ant.jar"/>
+ </fileset>
<fileset dir="${ftest.lib.dir}" includes="**/*.jar" />
</path>
@@ -63,19 +68,10 @@
<delete dir="${log.dir}" />
</target>
- <!-- Target for declaring needed libraries for tests runs -->
- <target name="import.libraries">
- <copyInlineDependencies id="selenium.server" scope="compile" todir="${ftest.lib.dir}">
- <dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0-beta-2" classifier="standalone"/>
- <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0-beta-2">
- <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default"/>
- </dependency>
- <dependency groupId="org.apache.ant" artifactId="ant" version="1.7.0"/>
- <dependency groupId="org.apache.ant" artifactId="ant-launcher" version="1.7.0"/>
- <dependency groupId="org.testng" artifactId="testng" version="5.9"/>
- </copyInlineDependencies>
+ <target name="copy.selenium">
+ <ant antfile="${ftest.dir}/examples/build.xml" target="copy.selenium" />
</target>
-
+
<target name="build" depends="build.common" description="Compiles the Test">
<mkdir dir="${classes.dir}" />
<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
@@ -86,10 +82,7 @@
</copy>
</target>
- <target name="build.common" description="Compiles the common selenium test code">
- <!-- Added for downloading libraries -->
- <antcall target="import.libraries"> </antcall>
-
+ <target name="build.common" depends="copy.selenium" description="Compiles the common selenium test code">
<mkdir dir="${classes.dir}" />
<javac srcdir="${common.src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
<copy todir="${classes.dir}">
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java 2009-10-06 11:37:26 UTC (rev 11549)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java 2009-10-06 12:06:37 UTC (rev 11550)
@@ -66,7 +66,7 @@
Project ant = new Project();
ant.init();
ProjectHelper.configureProject(ant, new File(buildfile));
- // ant.addBuildListener(log);
+ ant.addBuildListener(log);
return ant;
}
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2009-10-06 11:37:26 UTC (rev 11549)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2009-10-06 12:06:37 UTC (rev 11550)
@@ -96,9 +96,14 @@
return newBrowser;
}
- public void stopBrowser() {
- browser.stop();
- }
+
+ public void stopBrowser()
+ {
+ if (browser != null)
+ {
+ browser.stop();
+ }
+ }
public String getProperty(String key) {
if (!propertiesLoaded) {
15 years, 1 month
Seam SVN: r11549 - in branches/community/Seam_2_2: src/test/ftest/seamgen and 1 other directory.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-06 07:37:26 -0400 (Tue, 06 Oct 2009)
New Revision: 11549
Modified:
branches/community/Seam_2_2/build.xml
branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml
Log:
Added functional test dependencies to eclipse classpath
Modified: branches/community/Seam_2_2/build.xml
===================================================================
--- branches/community/Seam_2_2/build.xml 2009-10-06 09:44:05 UTC (rev 11548)
+++ branches/community/Seam_2_2/build.xml 2009-10-06 11:37:26 UTC (rev 11549)
@@ -1219,6 +1219,14 @@
<target name="eclipseclasspath" depends="init, jargen,antlr" description="Update eclipse classpath">
<path id="seam-gen.path" path="${seam.dir}/lib/gen/jboss-seam-gen.jar" />
+ <ant antfile="${seam.dir}/src/test/ftest/examples/build.xml" target="copy.selenium" />
+ <ant antfile="${seam.dir}/src/test/ftest/examples/build.xml" target="copy.htmlunit">
+ <property name="depends.htmlunit" value="true" />
+ </ant>
+ <path id="ftest.path">
+ <fileset dir="${seam.dir}/lib/ftest" includes="*.jar" />
+ </path>
+
<taskdef name="eclipseClasspath"
classname="org.jboss.seam.tool.EclipseClasspathTask"
classpathref="seam-gen.path"/>
@@ -1251,6 +1259,7 @@
<path refid="compile.jul.path" />
<path refid="compile.resteasy.path" />
<path refid="compile.wicket.path" />
+ <path refid="ftest.path" />
</eclipseClasspath>
</target>
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml 2009-10-06 09:44:05 UTC (rev 11548)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml 2009-10-06 11:37:26 UTC (rev 11549)
@@ -66,7 +66,6 @@
<delete dir="${test.output.dir}" />
<delete dir="${report.dir}" />
<delete dir="${log.dir}" />
- <delete dir="${ftest.lib.dir}" />
</target>
<target name="copy.selenium">
15 years, 1 month
Seam SVN: r11548 - branches/community/Seam_2_2/src/test/ftest/examples.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2009-10-06 05:44:05 -0400 (Tue, 06 Oct 2009)
New Revision: 11548
Modified:
branches/community/Seam_2_2/src/test/ftest/examples/build.xml
Log:
Ooops
Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-06 08:39:38 UTC (rev 11547)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-06 09:44:05 UTC (rev 11548)
@@ -86,7 +86,7 @@
<target name="build.extras" description="Build example specific files before build">
</target>
- <target name="build" depends="build.common, build.extras, copy.htmlunit, copy.selenium" description="Compiles the Test">
+ <target name="build" depends="build.common, build.extras" description="Compiles the Test">
<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
<copy todir="${classes.dir}">
<fileset dir="${src.dir}">
@@ -98,7 +98,7 @@
<!-- TODO we should compile this once to a common place not build for each example -->
<!-- TODO if needed we should allow examples to exclude/include src under
common dvd does not care about booking for example-->
- <target name="build.common" description="Compiles the common selenium test code">
+ <target name="build.common" depends="copy.htmlunit, copy.selenium" description="Compiles the common selenium test code">
<mkdir dir="${classes.dir}" />
<javac srcdir="${common.src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
<copy todir="${classes.dir}">
15 years, 1 month