Scarab commit: svn commit: r10524 - trunk/src/test/org/tigris/scarab: feeds om services/security/ldap test util util/word util/xmlissues xmlrpc
[email protected] 23 Dec 2007 21:09:35 -0000
Newsgroups
gmane.comp.java.scarab.cvs
Message-ID
<[email protected] >
Author: ronvoe122
Date: 2007-12-23 13:09:34-0800
New Revision: 10524
Added:
trunk/src/test/org/tigris/scarab/om/AttributeTestObjectFactory.java
trunk/src/test/org/tigris/scarab/om/IssueTestObjectFactory.java
trunk/src/test/org/tigris/scarab/om/IssueTypeTestObjectFactory.java
trunk/src/test/org/tigris/scarab/om/ModuleTestObjectFactory.java
trunk/src/test/org/tigris/scarab/om/ScarabUserTestObjectFactory.java
Removed:
trunk/src/test/org/tigris/scarab/test/BaseScarabTestCase.java
Modified:
trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java
trunk/src/test/org/tigris/scarab/feeds/QueryFeedTest.java
trunk/src/test/org/tigris/scarab/om/ActivitySetTest.java
trunk/src/test/org/tigris/scarab/om/ActivityTest.java
trunk/src/test/org/tigris/scarab/om/AttachmentTest.java
trunk/src/test/org/tigris/scarab/om/AttachmentTest2.java
trunk/src/test/org/tigris/scarab/om/AttributeGroupTest.java
trunk/src/test/org/tigris/scarab/om/AttributeOptionTest.java
trunk/src/test/org/tigris/scarab/om/AttributeTest.java
trunk/src/test/org/tigris/scarab/om/AttributeValueTest.java
trunk/src/test/org/tigris/scarab/om/IssueTest.java
trunk/src/test/org/tigris/scarab/om/IssueTypeTest.java
trunk/src/test/org/tigris/scarab/om/QueryTest.java
trunk/src/test/org/tigris/scarab/om/RModuleAttributeTest.java
trunk/src/test/org/tigris/scarab/om/RModuleIssueTypeTest.java
trunk/src/test/org/tigris/scarab/om/RModuleOptionTest.java
trunk/src/test/org/tigris/scarab/om/ScarabModuleTest.java
trunk/src/test/org/tigris/scarab/om/ScarabUserTest.java
trunk/src/test/org/tigris/scarab/services/security/ldap/LDAPIteratorTest.java
trunk/src/test/org/tigris/scarab/test/AllScarabTests.java
trunk/src/test/org/tigris/scarab/util/EmailLinkTest.java
trunk/src/test/org/tigris/scarab/util/word/IssueSearchFactoryTest.java
trunk/src/test/org/tigris/scarab/util/word/IssueSearchTest.java
trunk/src/test/org/tigris/scarab/util/xmlissues/ImportIssuesTest.java
trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java
Log:
Moved methods for creating objects commonly used in tests from BaseScarabTestCase into own classes.
Removed BaseScarabTestCase.
This removes the cyclic dependency between the application code in org.tigris.scarab.om and the test code in org.tigris.scarab.test.
Modified: trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java&p2=trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java (original)
+++ trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java 2007-12-23 13:09:34-0800
@@ -45,8 +45,9 @@
* individuals on behalf of CollabNet.
*/
import org.tigris.scarab.om.Issue;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.om.IssueTestObjectFactory;
import org.tigris.scarab.util.MockScarabLink;
+import org.tigris.scarab.test.BaseTurbineTestCase;
import org.tigris.scarab.tools.MockScarabLocalizationTool;
import com.sun.syndication.feed.synd.SyndFeed;
@@ -56,10 +57,12 @@
* @author Eric Pugh
*
*/
-public class IssueFeedTest extends BaseScarabTestCase {
+public class IssueFeedTest extends BaseTurbineTestCase {
+
+ private IssueTestObjectFactory testIssues = new IssueTestObjectFactory();
public void testCreatingFeed() throws Exception {
- Issue issue = getIssue0();
+ Issue issue = testIssues.getIssue0();
Feed feed = new IssueFeed(issue, new MockScarabLink(), new MockScarabLocalizationTool());
SyndFeed syndFeed = feed.getFeed();
syndFeed.setFeedType("rss_2.0");
Modified: trunk/src/test/org/tigris/scarab/feeds/QueryFeedTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/feeds/QueryFeedTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/feeds/QueryFeedTest.java&p2=trunk/src/test/org/tigris/scarab/feeds/QueryFeedTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/feeds/QueryFeedTest.java (original)
+++ trunk/src/test/org/tigris/scarab/feeds/QueryFeedTest.java 2007-12-23 13:09:34-0800
@@ -49,7 +49,7 @@
import org.tigris.scarab.om.Query;
import org.tigris.scarab.om.QueryManager;
import org.tigris.scarab.screens.RSSDataExport;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
import com.sun.syndication.feed.synd.SyndFeed;
import com.sun.syndication.io.SyndFeedOutput;
@@ -59,7 +59,7 @@
* @author Eric Pugh
*
*/
-public class QueryFeedTest extends BaseScarabTestCase {
+public class QueryFeedTest extends BaseTurbineTestCase {
public void testCreatingFeed() throws Exception{
Query query = QueryManager.getInstance(new Long(280));
Modified: trunk/src/test/org/tigris/scarab/om/ActivitySetTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/ActivitySetTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/ActivitySetTest.java&p2=trunk/src/test/org/tigris/scarab/om/ActivitySetTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/ActivitySetTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/ActivitySetTest.java 2007-12-23 13:09:34-0800
@@ -48,7 +48,7 @@
import org.apache.torque.om.NumberKey;
import org.tigris.scarab.notification.ActivityType;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.ActivitySet class.
@@ -56,9 +56,11 @@
* @author <a href="mailto:[email protected] ">Tim McNerney</a>
* @version $Id$
*/
-public class ActivitySetTest extends BaseScarabTestCase
+public class ActivitySetTest extends BaseTurbineTestCase
{
private ActivitySet trans = null;
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
+ private IssueTestObjectFactory testIssues = new IssueTestObjectFactory();
public void testCreate() throws Exception {
@@ -70,18 +72,18 @@
Attachment attachment = AttachmentManager.getInstance();
attachment.setName("activitySet test");
attachment.setData("Test comment");
- attachment.setTextFields(getUser1(), issue, Attachment.COMMENT__PK);
+ attachment.setTextFields(testUsers.getUser1(), issue, Attachment.COMMENT__PK);
attachment.save();
- trans = ActivitySetManager.getInstance(new Integer(1), getUser1(), attachment);
+ trans = ActivitySetManager.getInstance(new Integer(1), testUsers.getUser1(), attachment);
trans.save();
System.out.println("new activitySet id = " + trans.getActivitySetId());
// Create some activities
- Activity activity = ActivityManager.createTextActivity(getIssue0(), null, trans, ActivityType.ATTRIBUTE_CHANGED, null, null,
+ Activity activity = ActivityManager.createTextActivity(testIssues.getIssue0(), null, trans, ActivityType.ATTRIBUTE_CHANGED, null, null,
"oldValue", "newValue");
activity.save();
- Activity activity1 = ActivityManager.createTextActivity(getIssue0(), null, trans, ActivityType.ATTRIBUTE_CHANGED, null, null,
+ Activity activity1 = ActivityManager.createTextActivity(testIssues.getIssue0(), null, trans, ActivityType.ATTRIBUTE_CHANGED, null, null,
"oldValue", "newValue");
activity1.save();
}
Modified: trunk/src/test/org/tigris/scarab/om/ActivityTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/ActivityTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/ActivityTest.java&p2=trunk/src/test/org/tigris/scarab/om/ActivityTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/ActivityTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/ActivityTest.java 2007-12-23 13:09:34-0800
@@ -48,7 +48,7 @@
import org.apache.torque.om.NumberKey;
import org.tigris.scarab.notification.ActivityType;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.Activity class.
@@ -56,12 +56,15 @@
* @author <a href="mailto:[email protected] ">Tim McNerney </a>
* @version $Id$
*/
-public class ActivityTest extends BaseScarabTestCase {
+public class ActivityTest extends BaseTurbineTestCase {
+
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
+ private IssueTestObjectFactory testIssues = new IssueTestObjectFactory();
public void testCreateLong() throws Exception {
System.out.println("\ntestCreateLong()");
ActivitySet trans = getEditActivitySet();
- Activity activity = ActivityManager.createNumericActivity(getIssue0(), getPlatformAttribute(), trans,
+ Activity activity = ActivityManager.createNumericActivity(testIssues.getIssue0(), getPlatformAttribute(), trans,
null, new Integer(5), new Integer(6));
activity.save();
ActivitySet newtrans = activity.getActivitySet();
@@ -77,7 +80,7 @@
System.out.println("\ntestCreateShort()");
ActivitySet trans = getEditActivitySet();
- Activity activity = ActivityManager.createTextActivity(getIssue0(), getPlatformAttribute(), trans,
+ Activity activity = ActivityManager.createTextActivity(testIssues.getIssue0(), getPlatformAttribute(), trans,
ActivityType.ATTRIBUTE_CHANGED, "oldValue", "newValue");
activity.save();
@@ -99,11 +102,11 @@
protected ActivitySet getEditActivitySet() throws Exception {
Attachment attach = new Attachment();
- attach.setTextFields(getUser1(), getIssue0(), Attachment.MODIFICATION__PK);
+ attach.setTextFields(testUsers.getUser1(), testIssues.getIssue0(), Attachment.MODIFICATION__PK);
attach.setName("commenttest");
attach.save();
- ActivitySet trans = ActivitySetManager.getInstance(ActivitySetTypePeer.EDIT_ISSUE__PK, getUser1(), attach);
+ ActivitySet trans = ActivitySetManager.getInstance(ActivitySetTypePeer.EDIT_ISSUE__PK, testUsers.getUser1(), attach);
trans.save();
return trans;
}
Modified: trunk/src/test/org/tigris/scarab/om/AttachmentTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/AttachmentTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/AttachmentTest.java&p2=trunk/src/test/org/tigris/scarab/om/AttachmentTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/AttachmentTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/AttachmentTest.java 2007-12-23 13:09:34-0800
@@ -54,7 +54,7 @@
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.torque.om.NumberKey;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
@@ -63,11 +63,12 @@
* @author <a href="mailto:[email protected] ">Elicia David</a>
* @version $Id$
*/
-public class AttachmentTest extends BaseScarabTestCase
+public class AttachmentTest extends BaseTurbineTestCase
{
private Attachment comment = null;
private Attachment fileAttachment = null;
private Issue issue = null;
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
public void setUp()throws Exception {
super.setUp();
@@ -83,7 +84,7 @@
// save comment
comment.setName("comment");
comment.setData("Test comment");
- comment.setTextFields(getUser1(),issue, Attachment.COMMENT__PK);
+ comment.setTextFields(testUsers.getUser1(),issue, Attachment.COMMENT__PK);
comment.save();
//
@@ -109,11 +110,11 @@
fileAttachment.setFile(fileItem);
fileAttachment.setName(fileItem.getName());
fileAttachment.setMimeType("image/jpeg");
- fileAttachment.setCreatedBy(getUser1().getUserId());
- issue.addFile(fileAttachment, getUser1());
+ fileAttachment.setCreatedBy(testUsers.getUser1().getUserId());
+ issue.addFile(fileAttachment, testUsers.getUser1());
issue.save();
// need to save the attachments AFTER the issue has been created
- issue.doSaveFileAttachments(getUser1());
+ issue.doSaveFileAttachments(testUsers.getUser1());
System.out.println("filename=" + fileAttachment.getFileName());
}
Modified: trunk/src/test/org/tigris/scarab/om/AttachmentTest2.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/AttachmentTest2.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/AttachmentTest2.java&p2=trunk/src/test/org/tigris/scarab/om/AttachmentTest2.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/AttachmentTest2.java (original)
+++ trunk/src/test/org/tigris/scarab/om/AttachmentTest2.java 2007-12-23 13:09:34-0800
@@ -52,7 +52,7 @@
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.torque.om.NumberKey;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
@@ -61,15 +61,14 @@
* @author <a href="mailto:[email protected] ">Elicia David</a>
* @version $Id$
*/
-public class AttachmentTest2 extends BaseScarabTestCase
+public class AttachmentTest2 extends BaseTurbineTestCase
{
- private Attachment comment = null;
private Attachment fileAttachment = null;
private Issue issue = null;
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
public void setUp()throws Exception {
super.setUp();
- comment = AttachmentManager.getInstance();
fileAttachment = AttachmentManager.getInstance();
issue = IssueManager.getInstance(new NumberKey("1"));
@@ -91,11 +90,11 @@
fileAttachment.setFile(fileItem);
fileAttachment.setName(fileItem.getName());
fileAttachment.setMimeType("image/jpeg");
- fileAttachment.setCreatedBy(getUser1().getUserId());
- issue.addFile(fileAttachment, getUser1());
+ fileAttachment.setCreatedBy(testUsers.getUser1().getUserId());
+ issue.addFile(fileAttachment, testUsers.getUser1());
issue.save();
// need to save the attachments AFTER the issue has been created
- issue.doSaveFileAttachments(getUser1());
+ issue.doSaveFileAttachments(testUsers.getUser1());
System.out.println("filename=" + fileAttachment.getFileName());
}
Modified: trunk/src/test/org/tigris/scarab/om/AttributeGroupTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/AttributeGroupTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/AttributeGroupTest.java&p2=trunk/src/test/org/tigris/scarab/om/AttributeGroupTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/AttributeGroupTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/AttributeGroupTest.java 2007-12-23 13:09:34-0800
@@ -48,7 +48,7 @@
import org.apache.torque.om.NumberKey;
import org.tigris.scarab.services.cache.ScarabCache;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
import org.tigris.scarab.util.ScarabException;
/**
@@ -57,19 +57,19 @@
* @author <a href="mailto:[email protected] ">Elicia David </a>
* @version $Id$
*/
-public class AttributeGroupTest extends BaseScarabTestCase {
+public class AttributeGroupTest extends BaseTurbineTestCase {
private AttributeGroup group = null;
private Attribute severity = null;
- private Attribute desc = null;
-
private ScarabUser user2;
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
+ private ModuleTestObjectFactory testModules = new ModuleTestObjectFactory();
+
public void setUp() throws Exception {
super.setUp();
severity = AttributeManager.getInstance(new NumberKey("9"));
- desc = AttributeManager.getInstance(new NumberKey("1"));
group = AttributeGroupManager.getInstance(new NumberKey("131"));
}
@@ -81,19 +81,19 @@
*/
public void OFFtestDeleteAddAttribute() throws Exception {
- Attribute test = severity.copyAttribute(getUser1());
+ Attribute test = severity.copyAttribute(testUsers.getUser1());
test.save();
assertFalse(test.getAttributeId().equals(severity.getAttributeId()));
int numberOfAttributes = group.getAttributes().size();
group.addAttribute(test);
assertEquals(numberOfAttributes + 1, group.getAttributes().size());
try {
- group.deleteAttribute(test, getUser1(), getModule());
+ group.deleteAttribute(test, testUsers.getUser1(), testModules.getModule());
fail("User 1 doesn't have permissions to delete attributes.");
} catch (Exception e) {
assertTrue(e instanceof ScarabException);
}
- group.deleteAttribute(test, getUser2(), getModule());
+ group.deleteAttribute(test, getUser2(), testModules.getModule());
assertEquals(numberOfAttributes, group.getAttributes().size());
}
Modified: trunk/src/test/org/tigris/scarab/om/AttributeOptionTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/AttributeOptionTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/AttributeOptionTest.java&p2=trunk/src/test/org/tigris/scarab/om/AttributeOptionTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/AttributeOptionTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/AttributeOptionTest.java 2007-12-23 13:09:34-0800
@@ -50,7 +50,7 @@
import java.util.List;
import org.apache.torque.om.NumberKey;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.Attribute class.
@@ -58,7 +58,7 @@
* @author <a href="mailto:[email protected] ">Jon S. Stevens</a>
* @version $Id$
*/
-public class AttributeOptionTest extends BaseScarabTestCase
+public class AttributeOptionTest extends BaseTurbineTestCase
{
private AttributeOption ao;
Modified: trunk/src/test/org/tigris/scarab/om/AttributeTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/AttributeTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/AttributeTest.java&p2=trunk/src/test/org/tigris/scarab/om/AttributeTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/AttributeTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/AttributeTest.java 2007-12-23 13:09:34-0800
@@ -49,7 +49,7 @@
import java.util.List;
import org.apache.torque.om.NumberKey;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.Attribute class.
@@ -57,7 +57,7 @@
* @author <a href="mailto:[email protected] ">Jon S. Stevens</a>
* @version $Id$
*/
-public class AttributeTest extends BaseScarabTestCase
+public class AttributeTest extends BaseTurbineTestCase
{
Added: trunk/src/test/org/tigris/scarab/om/AttributeTestObjectFactory.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/AttributeTestObjectFactory.java?view=auto&rev=10524
==============================================================================
--- (empty file)
+++ trunk/src/test/org/tigris/scarab/om/AttributeTestObjectFactory.java 2007-12-23 13:09:34-0800
@@ -0,0 +1,39 @@
+package org.tigris.scarab.om;
+
+import org.apache.torque.om.NumberKey;
+
+public class AttributeTestObjectFactory
+{
+
+ private Attribute platformAttribute = null;
+ private Attribute voteAttribute = null;
+ private Attribute assignAttribute = null;
+
+ public Attribute getPlatformAttribute() throws Exception
+ {
+ if (platformAttribute == null)
+ {
+ platformAttribute = AttributeManager.getInstance(new NumberKey(5));
+ }
+ return platformAttribute;
+ }
+
+ public Attribute getVoteAttribute() throws Exception
+ {
+ if (voteAttribute == null)
+ {
+ voteAttribute = AttributeManager.getInstance(new NumberKey(8));
+ }
+ return voteAttribute;
+ }
+
+ public Attribute getAssignAttribute() throws Exception
+ {
+ if (assignAttribute == null)
+ {
+ assignAttribute = AttributeManager.getInstance(new NumberKey(2));
+ }
+ return assignAttribute;
+ }
+
+}
Modified: trunk/src/test/org/tigris/scarab/om/AttributeValueTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/AttributeValueTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/AttributeValueTest.java&p2=trunk/src/test/org/tigris/scarab/om/AttributeValueTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/AttributeValueTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/AttributeValueTest.java 2007-12-23 13:09:34-0800
@@ -47,7 +47,7 @@
*/
import org.apache.torque.om.NumberKey;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.Query class.
@@ -55,17 +55,18 @@
* @author <a href="mailto:[email protected] ">Tim McNerney</a>
* @version $Id$
*/
-public class AttributeValueTest extends BaseScarabTestCase
+public class AttributeValueTest extends BaseTurbineTestCase
{
private AttributeValue attVal = null;
private AttributeValue attVal2 = null;
private AttributeValue newAttVal = null;
private Issue issue = null;
+ private IssueTestObjectFactory testIssues = new IssueTestObjectFactory();
public void testSomething() throws Exception
{
- issue = getIssue0();
+ issue = testIssues.getIssue0();
// severity
attVal = issue.getAttributeValue(AttributeManager.getInstance(new NumberKey("9")));
// description
Modified: trunk/src/test/org/tigris/scarab/om/IssueTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/IssueTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/IssueTest.java&p2=trunk/src/test/org/tigris/scarab/om/IssueTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/IssueTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/IssueTest.java 2007-12-23 13:09:34-0800
@@ -47,14 +47,13 @@
*/
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.torque.om.NumberKey;
import org.apache.torque.util.Criteria;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.Issue class.
@@ -62,17 +61,17 @@
* @author <a href="mailto:[email protected] ">Jon S. Stevens</a>
* @version $Id$
*/
-public class IssueTest extends BaseScarabTestCase
+public class IssueTest extends BaseTurbineTestCase
{
private List issueList = new ArrayList();
- private Map uniqueIDs;
protected static int nbrDfltModules = 7;
protected static int nbrDfltIssueTypes = 5;
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
+ private IssueTestObjectFactory testIssues = new IssueTestObjectFactory();
public void setUp() throws Exception
{
super.setUp();
- uniqueIDs = new HashMap();
createTestIssues();
loopThruTestIssues();
@@ -159,9 +158,9 @@
{
System.out.println("assignUser()");
Attribute assignAttr = getAssignAttribute();
- ScarabUser assigner = getUser1();
- ScarabUser assignee = getUser2();
- getIssue0().assignUser(
+ ScarabUser assigner = testUsers.getUser1();
+ ScarabUser assignee = testUsers.getUser2();
+ testIssues.getIssue0().assignUser(
null,
assigner,
assignee,
@@ -173,9 +172,9 @@
{
System.out.println("testAssociatedUsers()");
assignUser();
- assertEquals(getIssue0().getAssociatedUsers().size(), 1);
- List pair = (List) getIssue0().getAssociatedUsers().iterator().next();
- assertEquals(pair.get(1), getUser1());
+ assertEquals(testIssues.getIssue0().getAssociatedUsers().size(), 1);
+ List pair = (List) testIssues.getIssue0().getAssociatedUsers().iterator().next();
+ assertEquals(pair.get(1), testUsers.getUser1());
}
public void OFFtestChangeUserAttributeValue() throws Exception
@@ -184,17 +183,17 @@
assignUser();
Attribute assignAttr = getAssignAttribute();
Attribute ccAttr = getCcAttribute();
- ScarabUser assigner = getUser1();
- ScarabUser assignee = getUser2();
- AttributeValue attVal = getIssue0().getAttributeValue(assignAttr);
- getIssue0().changeUserAttributeValue(
+ ScarabUser assigner = testUsers.getUser1();
+ ScarabUser assignee = testUsers.getUser2();
+ AttributeValue attVal = testIssues.getIssue0().getAttributeValue(assignAttr);
+ testIssues.getIssue0().changeUserAttributeValue(
null,
assigner,
assignee,
attVal,
ccAttr,
getAttachment(assigner));
- List pair = (List) getIssue0().getAssociatedUsers().iterator().next();
+ List pair = (List) testIssues.getIssue0().getAssociatedUsers().iterator().next();
assertEquals(pair.get(0), ccAttr);
}
@@ -202,22 +201,22 @@
{
System.out.println("testDeleteUser()");
Attribute assignAttr = getAssignAttribute();
- ScarabUser assigner = getUser1();
- AttributeValue attVal = getIssue0().getAttributeValue(assignAttr);
- getIssue0().deleteUser(
+ ScarabUser assigner = testUsers.getUser1();
+ AttributeValue attVal = testIssues.getIssue0().getAttributeValue(assignAttr);
+ testIssues.getIssue0().deleteUser(
null,
- getUser1(),
- getUser2(),
+ testUsers.getUser1(),
+ testUsers.getUser2(),
attVal,
getAttachment(assigner));
- assertEquals(getIssue0().getAssociatedUsers().size(), 0);
+ assertEquals(testIssues.getIssue0().getAssociatedUsers().size(), 0);
}
public void testGetUserAttributeValues() throws Exception
{
System.out.println("testAssociatedUsers()");
assignUser();
- List attVals = getIssue0().getUserAttributeValues();
+ List attVals = testIssues.getIssue0().getUserAttributeValues();
AttributeValue attVal = (AttributeValue) attVals.get(0);
assertEquals(attVal.getAttributeId().toString(), "2");
}
@@ -226,7 +225,7 @@
{
System.out.println("testGetEligibleUsers()");
assignUser();
- List users = getIssue0().getEligibleUsers(getAssignAttribute());
+ List users = testIssues.getIssue0().getEligibleUsers(getAssignAttribute());
assertTrue(users.size()>0);
}
@@ -235,9 +234,9 @@
System.out.println("testGetUsersToEmail()");
assignUser();
Set users =
- getIssue0().getUsersToEmail(
+ testIssues.getIssue0().getUsersToEmail(
AttributePeer.EMAIL_TO,
- getIssue0(),
+ testIssues.getIssue0(),
null);
assertEquals(users.size(), 2);
}
@@ -249,7 +248,7 @@
attachment.setName("comment");
attachment.setTextFields(
assigner,
- getIssue0(),
+ testIssues.getIssue0(),
Attachment.MODIFICATION__PK);
attachment.save();
return attachment;
Added: trunk/src/test/org/tigris/scarab/om/IssueTestObjectFactory.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/IssueTestObjectFactory.java?view=auto&rev=10524
==============================================================================
--- (empty file)
+++ trunk/src/test/org/tigris/scarab/om/IssueTestObjectFactory.java 2007-12-23 13:09:34-0800
@@ -0,0 +1,18 @@
+package org.tigris.scarab.om;
+
+import org.apache.torque.om.NumberKey;
+
+public class IssueTestObjectFactory
+{
+ private Issue issue0 = null;
+
+ public Issue getIssue0() throws Exception
+ {
+ if (issue0 == null)
+ {
+ issue0 = IssueManager.getInstance(new NumberKey(1), false);
+ }
+ return issue0;
+ }
+
+}
Modified: trunk/src/test/org/tigris/scarab/om/IssueTypeTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/IssueTypeTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/IssueTypeTest.java&p2=trunk/src/test/org/tigris/scarab/om/IssueTypeTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/IssueTypeTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/IssueTypeTest.java 2007-12-23 13:09:34-0800
@@ -46,7 +46,7 @@
* individuals on behalf of Collab.Net.
*/
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
import org.tigris.scarab.util.ScarabConstants;
/**
@@ -55,12 +55,12 @@
* @author <a href="mailto:[email protected] ">Jon S. Stevens</a>
* @version $Id$
*/
-public class IssueTypeTest extends BaseScarabTestCase
+public class IssueTypeTest extends BaseTurbineTestCase
{
private IssueType issueType = null;
private AttributeGroup ag = null;
-
+ private AttributeTestObjectFactory testAttribs = new AttributeTestObjectFactory();
public void setUp() throws Exception {
super.setUp();
@@ -150,8 +150,8 @@
testGetTemplateId();
testCreateNewGroup();
System.out.println("\ntestAddRIssueTypeAttribute()");
- ag.addAttribute(getPlatformAttribute());
- ag.addAttribute(getAssignAttribute());
+ ag.addAttribute(testAttribs.getPlatformAttribute());
+ ag.addAttribute(testAttribs.getAssignAttribute());
}
public void testGetRIssueTypeAttributes() throws Exception
@@ -164,8 +164,8 @@
public void testGetRIssueTypeAttribute() throws Exception
{
System.out.println("\ntestGetRIssueTypeAttribute()");
- System.out.println(issueType.getRIssueTypeAttribute(getPlatformAttribute()));
- System.out.println(issueType.getRIssueTypeAttribute(getAssignAttribute()));
+ System.out.println(issueType.getRIssueTypeAttribute(testAttribs.getPlatformAttribute()));
+ System.out.println(issueType.getRIssueTypeAttribute(testAttribs.getAssignAttribute()));
}
public void testGetUserAttributes() throws Exception
@@ -179,7 +179,7 @@
{
testAddRIssueTypeAttribute();
System.out.println("\ntestGetIssueTypeOptions()");
- assertEquals(issueType.getRIssueTypeOptions(getPlatformAttribute(), false).size(), 8);
+ assertEquals(issueType.getRIssueTypeOptions(testAttribs.getPlatformAttribute(), false).size(), 8);
}
public void testGetAvailableAttributes() throws Exception
Added: trunk/src/test/org/tigris/scarab/om/IssueTypeTestObjectFactory.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/IssueTypeTestObjectFactory.java?view=auto&rev=10524
==============================================================================
--- (empty file)
+++ trunk/src/test/org/tigris/scarab/om/IssueTypeTestObjectFactory.java 2007-12-23 13:09:34-0800
@@ -0,0 +1,18 @@
+package org.tigris.scarab.om;
+
+import org.apache.torque.om.NumberKey;
+
+public class IssueTypeTestObjectFactory
+{
+ private static IssueType defaultIssueType = null;
+
+ public IssueType getDefaultIssueType()
+ throws Exception
+ {
+ if(defaultIssueType==null)
+ defaultIssueType = IssueTypeManager
+ .getInstance(new NumberKey(1), false);
+ return defaultIssueType;
+ }
+
+}
Added: trunk/src/test/org/tigris/scarab/om/ModuleTestObjectFactory.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/ModuleTestObjectFactory.java?view=auto&rev=10524
==============================================================================
--- (empty file)
+++ trunk/src/test/org/tigris/scarab/om/ModuleTestObjectFactory.java 2007-12-23 13:09:34-0800
@@ -0,0 +1,24 @@
+package org.tigris.scarab.om;
+
+import org.apache.torque.om.NumberKey;
+
+public class ModuleTestObjectFactory
+{
+
+ private Module module;
+
+ /**
+ * If something like an Issue needs a mapping to a Module, then this is
+ * Module #5 that you can use. For example, you should call:
+ * issue.setModule(getModule()) in your Test before you use any of the rest
+ * of the methods on the Issue object.
+ */
+ public Module getModule()
+ throws Exception
+ {
+ if(module==null)
+ module = ModuleManager.getInstance(new NumberKey(5), false);
+ return module;
+ }
+
+}
Modified: trunk/src/test/org/tigris/scarab/om/QueryTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/QueryTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/QueryTest.java&p2=trunk/src/test/org/tigris/scarab/om/QueryTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/QueryTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/QueryTest.java 2007-12-23 13:09:34-0800
@@ -50,7 +50,7 @@
import java.util.List;
import org.apache.torque.TorqueException;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
import org.tigris.scarab.util.ScarabException;
/**
@@ -59,10 +59,13 @@
* @author <a href="mailto:[email protected] ">Tim McNerney</a>
* @version $Id$
*/
-public class QueryTest extends BaseScarabTestCase
+public class QueryTest extends BaseTurbineTestCase
{
private Query query = null;
private Query query1 = null;
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
+ private ModuleTestObjectFactory testModules = new ModuleTestObjectFactory();
+ private IssueTypeTestObjectFactory testITs = new IssueTypeTestObjectFactory();
@@ -98,7 +101,7 @@
//
try
{
- query.delete(getUser5());
+ query.delete(testUsers.getUser5());
fail("Shoud have thrown an exception, user 5 is not the owner!");
}
catch (Exception ex)
@@ -109,7 +112,7 @@
assertTrue(!retQuery.getDeleted());
// user 2 should succeed in deleting, as the owner.
- query.delete(getUser2());
+ query.delete(testUsers.getUser2());
retQuery = QueryManager.getInstance(query.getQueryId(), false);
assertTrue(retQuery.getDeleted());
@@ -121,12 +124,12 @@
*/
private void createQuery() throws TorqueException, Exception
{
- query.setUserId(getUser2().getUserId());
+ query.setUserId(testUsers.getUser2().getUserId());
query.setName("Test query 1");
query.setValue("&searchId=1&searchisp=asc");
query.setDescription("Description for test query 1");
- query.setModuleId(getModule().getModuleId());
- query.setIssueType(getDefaultIssueType());
+ query.setModuleId(testModules.getModule().getModuleId());
+ query.setIssueType(testITs.getDefaultIssueType());
query.setApproved(false);
query.setScopeId(new Integer(1));
query.save();
@@ -139,10 +142,10 @@
query1.setName("Test query 2");
query1.setValue("&searchId=2&searchisp=asc");
query1.setDescription("Description for test query 2");
- query1.setModuleId(getModule().getModuleId());
- query1.setIssueType(getDefaultIssueType());
+ query1.setModuleId(testModules.getModule().getModuleId());
+ query1.setIssueType(testITs.getDefaultIssueType());
query1.setScopeId(Scope.PERSONAL__PK);
- query1.saveAndSendEmail(getUser1(), getModule(), null);
+ query1.saveAndSendEmail(testUsers.getUser1(), testModules.getModule(), null);
//
// Make sure the query was persisted correctly.
//
@@ -161,8 +164,8 @@
query1.setName("Test query 2");
query1.setValue("&searchId=2&searchisp=asc");
query1.setDescription("Description for test query 2");
- query1.setModuleId(getModule().getModuleId());
- query1.setIssueType(getDefaultIssueType());
+ query1.setModuleId(testModules.getModule().getModuleId());
+ query1.setIssueType(testITs.getDefaultIssueType());
query1.setScopeId(Scope.MODULE__PK);
query1.save();
//
@@ -220,7 +223,7 @@
//
try
{
- query.approve(getUser5(), true);
+ query.approve(testUsers.getUser5(), true);
fail("user1 should fail in approving the query");
}
catch (Exception ex)
@@ -228,7 +231,7 @@
assertTrue(ex instanceof ScarabException);
}
- query.approve(getUser2(), true);
+ query.approve(testUsers.getUser2(), true);
assertTrue(query.getApproved());
}
@@ -236,14 +239,14 @@
{
System.out.println("\ntestSubscribe()");
createQuery();
- query.subscribe(getUser2(), new Integer(1));
- RQueryUser rqu = query.getRQueryUser(getUser2());
- query.subscribe(getUser2(), new Integer(1));
+ query.subscribe(testUsers.getUser2(), new Integer(1));
+ RQueryUser rqu = query.getRQueryUser(testUsers.getUser2());
+ query.subscribe(testUsers.getUser2(), new Integer(1));
assertTrue(rqu.getIsSubscribed());
// Now if unsubscribed, should fail to return RQueryUser
- query.unSubscribe(getUser2());
+ query.unSubscribe(testUsers.getUser2());
- rqu = query.getRQueryUser(getUser2());
+ rqu = query.getRQueryUser(testUsers.getUser2());
}
@@ -254,8 +257,8 @@
assertEquals(newQuery.getName(), query.getName());
assertEquals(newQuery.getUserId(), query.getUserId());
assertEquals(newQuery.getValue(), query.getValue());
- RQueryUser rqu = query.getRQueryUser(getUser1());
- RQueryUser rquNew = newQuery.getRQueryUser(getUser1());
+ RQueryUser rqu = query.getRQueryUser(testUsers.getUser1());
+ RQueryUser rquNew = newQuery.getRQueryUser(testUsers.getUser1());
assertEquals(rqu.getIsSubscribed(), rquNew.getIsSubscribed());
}
Modified: trunk/src/test/org/tigris/scarab/om/RModuleAttributeTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/RModuleAttributeTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/RModuleAttributeTest.java&p2=trunk/src/test/org/tigris/scarab/om/RModuleAttributeTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/RModuleAttributeTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/RModuleAttributeTest.java 2007-12-23 13:09:34-0800
@@ -47,7 +47,7 @@
*/
import org.apache.torque.om.NumberKey;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.Query class.
@@ -55,10 +55,12 @@
* @author <a href="mailto:[email protected] ">Elicia David</a>
* @version $Id$
*/
-public class RModuleAttributeTest extends BaseScarabTestCase
+public class RModuleAttributeTest extends BaseTurbineTestCase
{
private RModuleAttribute rma = null;
private Attribute platform = null;
+ private ModuleTestObjectFactory testModules = new ModuleTestObjectFactory();
+ private IssueTypeTestObjectFactory testITs = new IssueTypeTestObjectFactory();
@@ -66,8 +68,8 @@
{
super.setUp();
platform = AttributeManager.getInstance(new NumberKey("5"));
- rma = getModule().getRModuleAttribute(platform,
- getDefaultIssueType());
+ rma = testModules.getModule().getRModuleAttribute(platform,
+ testITs.getDefaultIssueType());
}
@@ -99,6 +101,6 @@
{
System.out.println("\ntestDelete()");
rma.delete();
- assertEquals(11,getModule().getRModuleAttributes(getDefaultIssueType()).size());
+ assertEquals(11,testModules.getModule().getRModuleAttributes(testITs.getDefaultIssueType()).size());
}
}
Modified: trunk/src/test/org/tigris/scarab/om/RModuleIssueTypeTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/RModuleIssueTypeTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/RModuleIssueTypeTest.java&p2=trunk/src/test/org/tigris/scarab/om/RModuleIssueTypeTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/RModuleIssueTypeTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/RModuleIssueTypeTest.java 2007-12-23 13:09:34-0800
@@ -46,7 +46,7 @@
* individuals on behalf of Collab.Net.
*/
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.Query class.
@@ -54,16 +54,19 @@
* @author <a href="mailto:[email protected] ">Elicia David</a>
* @version $Id$
*/
-public class RModuleIssueTypeTest extends BaseScarabTestCase
+public class RModuleIssueTypeTest extends BaseTurbineTestCase
{
private RModuleIssueType rmit = null;
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
+ private ModuleTestObjectFactory testModules = new ModuleTestObjectFactory();
+ private IssueTypeTestObjectFactory testITs = new IssueTypeTestObjectFactory();
public void setUp() throws Exception
{
super.setUp();
- rmit = getModule().getRModuleIssueType(getDefaultIssueType());
+ rmit = testModules.getModule().getRModuleIssueType(testITs.getDefaultIssueType());
}
@@ -87,7 +90,7 @@
public void OFFtestDelete() throws Exception
{
System.out.println("\ntestDelete()");
- rmit.delete(getUser1());
- assertEquals(4, getModule().getRModuleIssueTypes().size());
+ rmit.delete(testUsers.getUser1());
+ assertEquals(4, testModules.getModule().getRModuleIssueTypes().size());
}
}
Modified: trunk/src/test/org/tigris/scarab/om/RModuleOptionTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/RModuleOptionTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/RModuleOptionTest.java&p2=trunk/src/test/org/tigris/scarab/om/RModuleOptionTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/RModuleOptionTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/RModuleOptionTest.java 2007-12-23 13:09:34-0800
@@ -47,7 +47,7 @@
*/
import org.apache.torque.om.NumberKey;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.Query class.
@@ -55,22 +55,24 @@
* @author <a href="mailto:[email protected] ">Elicia David</a>
* @version $Id$
*/
-public class RModuleOptionTest extends BaseScarabTestCase
+public class RModuleOptionTest extends BaseTurbineTestCase
{
private RModuleOption rmo = null;
private Attribute priority = null;
private AttributeOption high = null;
private IssueType issueType = null;
+ private ModuleTestObjectFactory testModules = new ModuleTestObjectFactory();
+ private IssueTypeTestObjectFactory testITs = new IssueTypeTestObjectFactory();
public void setUp() throws Exception
{
super.setUp();
- issueType = getDefaultIssueType();
+ issueType = testITs.getDefaultIssueType();
priority = AttributeManager.getInstance(new NumberKey("7"));
high = AttributeOptionManager.getInstance(new NumberKey("54"));
- rmo = getModule().getRModuleOption(high, issueType);
+ rmo = testModules.getModule().getRModuleOption(high, issueType);
assertNotNull(issueType);
assertNotNull(priority);
assertNotNull(high);
@@ -113,8 +115,8 @@
{
System.out.println("\ntestDelete()");
RModuleOption rmoNew= RModuleOptionManager.getInstance();
- rmoNew.setModule(getModule());
- rmoNew.setIssueType(getDefaultIssueType());
+ rmoNew.setModule(testModules.getModule());
+ rmoNew.setIssueType(testITs.getDefaultIssueType());
rmoNew.setOptionId(new Integer(1));
rmoNew.save();
rmoNew.delete();
Modified: trunk/src/test/org/tigris/scarab/om/ScarabModuleTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/ScarabModuleTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/ScarabModuleTest.java&p2=trunk/src/test/org/tigris/scarab/om/ScarabModuleTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/ScarabModuleTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/ScarabModuleTest.java 2007-12-23 13:09:34-0800
@@ -53,7 +53,7 @@
import org.apache.torque.om.NumberKey;
import org.tigris.scarab.services.security.ScarabSecurity;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.ScarabModule class.
@@ -61,7 +61,7 @@
* @author <a href="mailto:[email protected] ">Jon S. Stevens</a>
* @version $Id$
*/
-public class ScarabModuleTest extends BaseScarabTestCase
+public class ScarabModuleTest extends BaseTurbineTestCase
{
ScarabModule newModule;
public void setUp() throws Exception{
Modified: trunk/src/test/org/tigris/scarab/om/ScarabUserTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/ScarabUserTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/om/ScarabUserTest.java&p2=trunk/src/test/org/tigris/scarab/om/ScarabUserTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/om/ScarabUserTest.java (original)
+++ trunk/src/test/org/tigris/scarab/om/ScarabUserTest.java 2007-12-23 13:09:34-0800
@@ -49,7 +49,7 @@
import java.util.Calendar;
import java.util.List;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the om.ScarabUserImpl class.
@@ -57,16 +57,16 @@
* @author <a href="mailto:[email protected] ">Jon S. Stevens</a>
* @version $Id$
*/
-public class ScarabUserTest extends BaseScarabTestCase
+public class ScarabUserTest extends BaseTurbineTestCase
{
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
-
public void testSetPasswordExpire()
throws Exception
{
- ScarabUser user = getUser1();
+ ScarabUser user = testUsers.getUser1();
Calendar cal = Calendar.getInstance();
cal.set(2010, 9, 2);
user.setPasswordExpire(cal);
@@ -81,7 +81,7 @@
public void testGetModules()
throws Exception
{
- ScarabUser user = getUser1();
+ ScarabUser user = testUsers.getUser1();
List modules = user.getModules(true);
assertTrue(modules.size()>0);
}
Added: trunk/src/test/org/tigris/scarab/om/ScarabUserTestObjectFactory.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/om/ScarabUserTestObjectFactory.java?view=auto&rev=10524
==============================================================================
--- (empty file)
+++ trunk/src/test/org/tigris/scarab/om/ScarabUserTestObjectFactory.java 2007-12-23 13:09:34-0800
@@ -0,0 +1,40 @@
+package org.tigris.scarab.om;
+
+import org.apache.torque.om.NumberKey;
+
+public class ScarabUserTestObjectFactory
+{
+
+ private ScarabUser user0 = null;
+ private ScarabUser user1 = null;
+ private ScarabUser user2 = null;
+
+ public ScarabUser getUser1() throws Exception
+ {
+ if (user1 == null)
+ {
+ user1 = ScarabUserManager.getInstance(new NumberKey(1), false);
+ }
+ return user1;
+ }
+
+ public ScarabUser getUser2() throws Exception
+ {
+ if (user2 == null)
+ {
+ user2 = ScarabUserManager.getInstance(new NumberKey(2), false);
+
+ }
+ return user2;
+ }
+
+ public ScarabUser getUser5() throws Exception
+ {
+ if (user0 == null)
+ {
+ user0 = ScarabUserManager.getInstance(new NumberKey(5), false);
+ }
+ return user0;
+ }
+
+}
Modified: trunk/src/test/org/tigris/scarab/services/security/ldap/LDAPIteratorTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/services/security/ldap/LDAPIteratorTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/services/security/ldap/LDAPIteratorTest.java&p2=trunk/src/test/org/tigris/scarab/services/security/ldap/LDAPIteratorTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/services/security/ldap/LDAPIteratorTest.java (original)
+++ trunk/src/test/org/tigris/scarab/services/security/ldap/LDAPIteratorTest.java 2007-12-23 13:09:34-0800
@@ -13,13 +13,13 @@
import org.tigris.scarab.om.ScarabUserImplPeer;
import org.tigris.scarab.om.ScarabUserManager;
import org.tigris.scarab.om.UserPreferencePeer;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* @author pti
*
*/
-public class LDAPIteratorTest extends BaseScarabTestCase {
+public class LDAPIteratorTest extends BaseTurbineTestCase {
private LDAPSynchronizer syncer;
Modified: trunk/src/test/org/tigris/scarab/test/AllScarabTests.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/test/AllScarabTests.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/test/AllScarabTests.java&p2=trunk/src/test/org/tigris/scarab/test/AllScarabTests.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/test/AllScarabTests.java (original)
+++ trunk/src/test/org/tigris/scarab/test/AllScarabTests.java 2007-12-23 13:09:34-0800
@@ -74,7 +74,7 @@
* Create a suite of tests to be run in a single container instantiation
*
*/
-public class AllScarabTests extends BaseScarabTestCase {
+public class AllScarabTests{
static public TestSuite suite() {
TestSuite suite = new TestSuite("Scarab Tests");
Removed: trunk/src/test/org/tigris/scarab/test/BaseScarabTestCase.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/test/BaseScarabTestCase.java?view=auto&rev=10523
Modified: trunk/src/test/org/tigris/scarab/util/EmailLinkTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/util/EmailLinkTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/util/EmailLinkTest.java&p2=trunk/src/test/org/tigris/scarab/util/EmailLinkTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/util/EmailLinkTest.java (original)
+++ trunk/src/test/org/tigris/scarab/util/EmailLinkTest.java 2007-12-23 13:09:34-0800
@@ -47,7 +47,8 @@
*/
import org.tigris.scarab.om.Module;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.om.ModuleTestObjectFactory;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* Used for testing the ScarabUtil.java class.
@@ -55,13 +56,15 @@
* @author <a href="mailto:[email protected] ">Jon Scott Stevens</a>
* @version $Id$
*/
-public class EmailLinkTest extends BaseScarabTestCase
+public class EmailLinkTest extends BaseTurbineTestCase
{
-
+
+ private ModuleTestObjectFactory testModules = new ModuleTestObjectFactory();
+
public void testEmailLink() throws Exception
{
- Module module = getModule();
+ Module module = testModules.getModule();
EmailLink el = new EmailLink(module);
el.setPage("Foo.vm").addPathInfo("foo", "bar").addPathInfo("jjj","aaa");
String expected =
Modified: trunk/src/test/org/tigris/scarab/util/word/IssueSearchFactoryTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/util/word/IssueSearchFactoryTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/util/word/IssueSearchFactoryTest.java&p2=trunk/src/test/org/tigris/scarab/util/word/IssueSearchFactoryTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/util/word/IssueSearchFactoryTest.java (original)
+++ trunk/src/test/org/tigris/scarab/util/word/IssueSearchFactoryTest.java 2007-12-23 13:09:34-0800
@@ -47,9 +47,12 @@
*/
import org.tigris.scarab.om.IssueType;
+import org.tigris.scarab.om.IssueTypeTestObjectFactory;
import org.tigris.scarab.om.Module;
+import org.tigris.scarab.om.ModuleTestObjectFactory;
import org.tigris.scarab.om.ScarabUser;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.om.ScarabUserTestObjectFactory;
+import org.tigris.scarab.test.BaseTurbineTestCase;
/**
* A Testing Suite for the util.word.IssueSearchFactory class. This class
@@ -64,9 +67,11 @@
* @author <a href="mailto:[email protected] ">John McNally</a>
* @version $Id$
*/
-public class IssueSearchFactoryTest extends BaseScarabTestCase
+public class IssueSearchFactoryTest extends BaseTurbineTestCase
{
- private IssueSearch search;
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
+ private ModuleTestObjectFactory testModules = new ModuleTestObjectFactory();
+ private IssueTypeTestObjectFactory testITs = new IssueTypeTestObjectFactory();
/**
@@ -88,9 +93,9 @@
}
};
- Module module = getModule();
- IssueType it = getDefaultIssueType();
- ScarabUser user = getUser1();
+ Module module = testModules.getModule();
+ IssueType it = testITs.getDefaultIssueType();
+ ScarabUser user = testUsers.getUser1();
IssueSearch[] isa = new IssueSearch[5];
for (int i=0; i<5; i++)
@@ -101,7 +106,7 @@
// try to get one more than max
try
{
- issueSearchFactory.getInstance(module, it, getUser1());
+ issueSearchFactory.getInstance(module, it, testUsers.getUser1());
fail("Created more than maxInstances");
}
catch (MaxConcurrentSearchException expected)
@@ -114,7 +119,7 @@
// try again should work this time
try
{
- issueSearchFactory.getInstance(module, it, getUser1());
+ issueSearchFactory.getInstance(module, it, testUsers.getUser1());
}
catch (MaxConcurrentSearchException failure)
{
@@ -175,9 +180,9 @@
}
};
- Module module = getModule();
- IssueType it = getDefaultIssueType();
- ScarabUser user = getUser1();
+ Module module = testModules.getModule();
+ IssueType it = testITs.getDefaultIssueType();
+ ScarabUser user = testUsers.getUser1();
for (int i = 0; i < pts.length; i++)
Modified: trunk/src/test/org/tigris/scarab/util/word/IssueSearchTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/util/word/IssueSearchTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/util/word/IssueSearchTest.java&p2=trunk/src/test/org/tigris/scarab/util/word/IssueSearchTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/util/word/IssueSearchTest.java (original)
+++ trunk/src/test/org/tigris/scarab/util/word/IssueSearchTest.java 2007-12-23 13:09:34-0800
@@ -47,13 +47,15 @@
*/
import java.util.List;
-import org.tigris.scarab.test.BaseScarabTestCase;
-import org.tigris.scarab.om.Attribute;
+import org.tigris.scarab.test.BaseTurbineTestCase;
+import org.tigris.scarab.om.AttributeTestObjectFactory;
+import org.tigris.scarab.om.IssueTypeTestObjectFactory;
import org.tigris.scarab.om.Module;
import org.tigris.scarab.om.IssueType;
-import org.tigris.scarab.om.AttributeManager;
import org.tigris.scarab.om.AttributeOptionManager;
import org.tigris.scarab.om.AttributeOption;
+import org.tigris.scarab.om.ModuleTestObjectFactory;
+import org.tigris.scarab.om.ScarabUserTestObjectFactory;
/**
* A Testing Suite for the om.IssueSearch class.
@@ -61,19 +63,21 @@
* @author <a href="mailto:[email protected] ">John McNally</a>
* @version $Id$
*/
-public class IssueSearchTest extends BaseScarabTestCase
+public class IssueSearchTest extends BaseTurbineTestCase
{
- private int[] attributeIds = {3, 4, 6, 7, 8}; //, 9, 12};
- private int[] optionIds = {1, 8, 24, 54, 58}; //, 62, 88};
+ private ScarabUserTestObjectFactory testUsers = new ScarabUserTestObjectFactory();
+ private AttributeTestObjectFactory testAttribs = new AttributeTestObjectFactory();
+ private ModuleTestObjectFactory testModules = new ModuleTestObjectFactory();
+ private IssueTypeTestObjectFactory testITs = new IssueTypeTestObjectFactory();
private IssueSearch getSearch()
throws Exception, MaxConcurrentSearchException
{
- Module module = getModule();
- IssueType it = getDefaultIssueType();
+ Module module = testModules.getModule();
+ IssueType it = testITs.getDefaultIssueType();
IssueSearch search = IssueSearchFactory.INSTANCE
- .getInstance(module, it, getUser1());
+ .getInstance(module, it, testUsers.getUser1());
search.setIssueListAttributeColumns(
module.getDefaultRModuleUserAttributes(it));
return search;
@@ -85,7 +89,7 @@
IssueSearch search = getSearch();
AttributeOption sgi =
AttributeOptionManager.getInstance(new Integer(21));
- search.addAttributeValue(getPlatformAttribute(), sgi);
+ search.addAttributeValue(testAttribs.getPlatformAttribute(), sgi);
List results = search.getQueryResults();
assertTrue("Should be one result.", (results.size() == 1));
IssueSearchFactory.INSTANCE.notifyDone();
@@ -97,7 +101,7 @@
IssueSearch search = getSearch();
AttributeOption notsgi =
AttributeOptionManager.getInstance(new Integer(20));
- search.addAttributeValue(getPlatformAttribute(), notsgi);
+ search.addAttributeValue(testAttribs.getPlatformAttribute(), notsgi);
List results = search.getQueryResults();
assertTrue("Should be no result.", (results.size() == 0));
IssueSearchFactory.INSTANCE.notifyDone();
@@ -115,7 +119,7 @@
IssueSearch search = getSearch();
AttributeOption empty =
AttributeOptionManager.getInstance(new Integer(0));
- search.addAttributeValue(getVoteAttribute(), empty);
+ search.addAttributeValue(testAttribs.getVoteAttribute(), empty);
List results = search.getQueryResults();
assertTrue("Should be ONE result.", (results.size() == 1));
IssueSearchFactory.INSTANCE.notifyDone();
@@ -125,7 +129,7 @@
throws Exception
{
IssueSearch search = getSearch();
- search.addUserSearch(getUser5().getUserId().toString(),
+ search.addUserSearch(testUsers.getUser5().getUserId().toString(),
IssueSearch.ANY_KEY);
List results = search.getQueryResults();
assertTrue("Should be one result.", (results.size() == 1));
@@ -136,7 +140,7 @@
throws Exception
{
IssueSearch search = getSearch();
- search.addUserSearch(getUser5().getUserId().toString(),
+ search.addUserSearch(testUsers.getUser5().getUserId().toString(),
IssueSearch.CREATED_BY_KEY);
List results = search.getQueryResults();
assertTrue("Should be one result.", (results.size() == 1));
@@ -147,8 +151,8 @@
throws Exception
{
IssueSearch search = getSearch();
- search.addUserSearch(getUser5().getUserId().toString(),
- getAssignAttribute().getAttributeId().toString());
+ search.addUserSearch(testUsers.getUser5().getUserId().toString(),
+ testAttribs.getAssignAttribute().getAttributeId().toString());
List results = search.getQueryResults();
assertTrue("Should be no results.", (results.size() == 0));
IssueSearchFactory.INSTANCE.notifyDone();
@@ -158,8 +162,8 @@
throws Exception
{
IssueSearch search = getSearch();
- search.addUserSearch(getUser5().getUserId().toString(),
- getAssignAttribute().getAttributeId().toString());
+ search.addUserSearch(testUsers.getUser5().getUserId().toString(),
+ testAttribs.getAssignAttribute().getAttributeId().toString());
search.setMinCreationDate("01/01/2000");
List results = search.getQueryResults();
assertTrue("Should be no results.", (results.size() == 0));
@@ -173,8 +177,8 @@
IssueSearch search = getSearch();
AttributeOption sgi =
AttributeOptionManager.getInstance(new Integer(21));
- search.addAttributeValue(getPlatformAttribute(), sgi);
- search.addUserSearch(getUser5().getUserId().toString(),
+ search.addAttributeValue(testAttribs.getPlatformAttribute(), sgi);
+ search.addUserSearch(testUsers.getUser5().getUserId().toString(),
IssueSearch.ANY_KEY);
List results = search.getQueryResults();
assertTrue("Should be one result.", (results.size() == 1));
Modified: trunk/src/test/org/tigris/scarab/util/xmlissues/ImportIssuesTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/util/xmlissues/ImportIssuesTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/util/xmlissues/ImportIssuesTest.java&p2=trunk/src/test/org/tigris/scarab/util/xmlissues/ImportIssuesTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/util/xmlissues/ImportIssuesTest.java (original)
+++ trunk/src/test/org/tigris/scarab/util/xmlissues/ImportIssuesTest.java 2007-12-23 13:09:34-0800
@@ -51,12 +51,8 @@
import org.apache.torque.util.Criteria;
-import org.tigris.scarab.test.BaseScarabTestCase;
-//import org.tigris.scarab.om.Module;
-//import org.tigris.scarab.om.IssueType;
+import org.tigris.scarab.test.BaseTurbineTestCase;
import org.tigris.scarab.om.ActivityPeer;
-//import org.tigris.scarab.om.AttributeOptionManager;
-//import org.tigris.scarab.om.AttributeOption;
/**
* A Testing Suite for the ImportIssues class.
@@ -64,10 +60,9 @@
* @author <a href="mailto:[email protected] ">John McNally</a>
* @version $Id$
*/
-public class ImportIssuesTest extends BaseScarabTestCase
+public class ImportIssuesTest extends BaseTurbineTestCase
{
private static final File INPUT_FILE = new File("src/test/org/tigris/scarab/util/xmlissues/test-issues.xml").getAbsoluteFile();
- private static final String INPUT_FILENAME = INPUT_FILE.toString();
public void testImportIssuesViaXMLFile()
throws Exception
Modified: trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java?view=diff&rev=10524&p1=trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java&p2=trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java&r1=10523&r2=10524
==============================================================================
--- trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java (original)
+++ trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java 2007-12-23 13:09:34-0800
@@ -9,14 +9,14 @@
import org.tigris.scarab.om.AttributeValue;
import org.tigris.scarab.om.Issue;
import org.tigris.scarab.om.IssueManager;
-import org.tigris.scarab.test.BaseScarabTestCase;
+import org.tigris.scarab.test.BaseTurbineTestCase;
import org.tigris.scarab.util.ScarabException;
/**
* @author pti
*
*/
-public class NewTicketHandlerTest extends BaseScarabTestCase {
+public class NewTicketHandlerTest extends BaseTurbineTestCase {
NewTicketHandler nth;
SimpleHandler sh;