[jboss-svn-commits] JBL Code SVN: r6008 - labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 29 17:01:11 EDT 2006
Author: michael.neale at jboss.com
Date: 2006-08-29 17:01:07 -0400 (Tue, 29 Aug 2006)
New Revision: 6008
Added:
labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RepositorySession.java
Modified:
labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RuleItemTestCase.java
labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RulePackageItemTestCase.java
labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RulesRepositoryTestCase.java
Log:
speedup tests
Added: labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RepositorySession.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RepositorySession.java 2006-08-29 17:16:19 UTC (rev 6007)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RepositorySession.java 2006-08-29 21:01:07 UTC (rev 6008)
@@ -0,0 +1,19 @@
+package org.drools.repository.test;
+
+import org.drools.repository.RulesRepository;
+
+public class RepositorySession {
+
+ private static ThreadLocal repo = new ThreadLocal();
+
+ public static RulesRepository getRepository() {
+ Object repoInstance = repo.get();
+ if ( repoInstance == null ) {
+ repoInstance = new RulesRepository( true );
+ repo.set( repoInstance );
+
+ }
+ return (RulesRepository) repoInstance;
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RuleItemTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RuleItemTestCase.java 2006-08-29 17:16:19 UTC (rev 6007)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RuleItemTestCase.java 2006-08-29 21:01:07 UTC (rev 6008)
@@ -10,26 +10,20 @@
import org.drools.repository.*;
public class RuleItemTestCase extends TestCase {
- private RulesRepository rulesRepository;
-
- protected void setUp() throws Exception {
- super.setUp();
- this.rulesRepository = new RulesRepository(true);
- }
- protected void tearDown() throws Exception {
- super.tearDown();
- rulesRepository.logout();
- }
+ public RulesRepository getRepo() {
+ return RepositorySession.getRepository();
+ }
+
public void testRuleItem() {
try {
//calls constructor
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testRuleItem", "test lhs content", "test rhs content");
assertNotNull(ruleItem1);
assertNotNull(ruleItem1.getNode());
- assertEquals("test rule", ruleItem1.getName());
+ assertEquals("testRuleItem", ruleItem1.getName());
}
catch(Exception e) {
fail("Caught unexpected exception: " + e);
@@ -38,8 +32,8 @@
//try constructing with node of wrong type
try {
File dslFile1 = new File("./src/java/org/drools/repository/test/test_data/dsl1.dsl");
- DslItem dslItem = rulesRepository.addDslFromFile(dslFile1);
- RuleItem ruleItem = new RuleItem(this.rulesRepository, dslItem.getNode());
+ DslItem dslItem = getRepo().addDslFromFile(dslFile1);
+ RuleItem ruleItem = new RuleItem(getRepo(), dslItem.getNode());
fail("Exception not thrown for node of type: " + dslItem.getNode().getPrimaryNodeType().getName());
}
catch(RulesRepositoryException e) {
@@ -51,90 +45,71 @@
}
public void testGetLhs() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetLhs", "test lhs content", "test rhs content");
+
assertNotNull(ruleItem1);
assertNotNull(ruleItem1.getNode());
assertEquals("test lhs content", ruleItem1.getLhs());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testGetRhs() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetRhs", "test lhs content", "test rhs content");
assertNotNull(ruleItem1);
assertNotNull(ruleItem1.getNode());
assertEquals("test rhs content", ruleItem1.getRhs());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testUpdateLhs() {
- //TODO: maybe add some testing on the versioning stuff more - check the content of the
- // previous version, etc.
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testUpdateLhs", "test lhs content", "test rhs content");
ruleItem1.updateLhs("new lhs content");
assertEquals("new lhs content", ruleItem1.getLhs());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+
+ RuleItem prev = (RuleItem) ruleItem1.getPredecessorVersionsIterator().next();
+ assertEquals("test lhs content", prev.getLhs());
+
+ assertEquals(prev, ruleItem1.getPrecedingVersion());
+
}
public void testUpdateRhs() {
- //TODO: maybe add some testing on the versioning stuff more - check the content of the
- // previous version, etc.
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
-
- ruleItem1.updateRhs("new rhs content");
-
+ RuleItem ruleItem1 = getRepo().addRule("testUpdateRhs", "test lhs content", "test rhs content");
+ ruleItem1.updateRhs("new rhs content");
assertEquals("new rhs content", ruleItem1.getRhs());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+ RuleItem prev = (RuleItem) ruleItem1.getPrecedingVersion();
+ assertEquals("test rhs content", prev.getRhs());
+
}
public void testAddTag() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testAddTag", "test lhs content", "test rhs content");
- ruleItem1.addTag("TestTag");
+ ruleItem1.addTag("testAddTagTestTag");
List tags = ruleItem1.getTags();
assertEquals(1, tags.size());
- assertEquals("TestTag", ((CategoryItem)tags.get(0)).getName());
+ assertEquals("testAddTagTestTag", ((CategoryItem)tags.get(0)).getName());
- ruleItem1.addTag("TestTag2");
+ ruleItem1.addTag("testAddTagTestTag2");
tags = ruleItem1.getTags();
assertEquals(2, tags.size());
//now test retrieve by tags
- List result = this.rulesRepository.findRulesByTag("TestTag");
+ List result = getRepo().findRulesByTag("testAddTagTestTag");
assertEquals(1, result.size());
RuleItem retItem = (RuleItem) result.get( 0 );
- assertEquals("test rule", retItem.getName());
+ assertEquals("testAddTag", retItem.getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testRemoveTag() {
try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("test rule", "test lhs content", "test rhs content");
ruleItem1.addTag("TestTag");
ruleItem1.removeTag("TestTag");
@@ -154,26 +129,21 @@
}
public void testGetTags() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetTags", "test lhs content", "test rhs content");
List tags = ruleItem1.getTags();
assertNotNull(tags);
assertEquals(0, tags.size());
- ruleItem1.addTag("TestTag");
+ ruleItem1.addTag("testGetTagsTestTag");
tags = ruleItem1.getTags();
assertEquals(1, tags.size());
- assertEquals("TestTag", ((CategoryItem)tags.get(0)).getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+ assertEquals("testGetTagsTestTag", ((CategoryItem)tags.get(0)).getName());
+
}
public void testSetStateString() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testSetStateString", "test lhs content", "test rhs content");
ruleItem1.setState("TestState1");
assertNotNull(ruleItem1.getState());
@@ -182,34 +152,26 @@
ruleItem1.setState("TestState2");
assertNotNull(ruleItem1.getState());
assertEquals("TestState2", ruleItem1.getState().getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testSetStateStateItem() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testSetStateStateItem", "test lhs content", "test rhs content");
- StateItem stateItem1 = rulesRepository.getState("TestState1");
+ StateItem stateItem1 = getRepo().getState("TestState1");
ruleItem1.setState(stateItem1);
assertNotNull(ruleItem1.getState());
assertEquals(ruleItem1.getState().getName(), "TestState1");
- StateItem stateItem2 = rulesRepository.getState("TestState2");
+ StateItem stateItem2 = getRepo().getState("TestState2");
ruleItem1.setState(stateItem2);
assertNotNull(ruleItem1.getState());
assertEquals("TestState2", ruleItem1.getState().getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testGetState() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetState", "test lhs content", "test rhs content");
StateItem stateItem1 = ruleItem1.getState();
assertNull(stateItem1);
@@ -217,26 +179,17 @@
ruleItem1.setState("TestState1");
assertNotNull(ruleItem1.getState());
assertEquals("TestState1", ruleItem1.getState().getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testToString() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testToString", "test lhs content", "test rhs content");
assertNotNull(ruleItem1.toString());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testGetLastModified() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetLastModified", "test lhs content", "test rhs content");
Calendar cal = Calendar.getInstance();
long before = cal.getTimeInMillis();
@@ -250,15 +203,12 @@
assertTrue(before < after);
assertTrue(before < lastMod);
assertTrue(lastMod < after);
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testGetDateEffective() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+
+ RuleItem ruleItem1 = getRepo().addRule("testGetDateEffective", "test lhs content", "test rhs content");
//it should be initialized to null
assertTrue(ruleItem1.getDateEffective() == null);
@@ -269,15 +219,11 @@
Calendar cal2 = ruleItem1.getDateEffective();
assertEquals(cal, cal2);
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testGetDateExpired() {
try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetDateExpired", "test lhs content", "test rhs content");
//it should be initialized to null
assertTrue(ruleItem1.getDateExpired() == null);
@@ -296,7 +242,7 @@
public void testGetRuleLanguage() {
try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetRuleLanguage", "test lhs content", "test rhs content");
//it should be initialized to 'DRL'
assertEquals("DRL", ruleItem1.getRuleLanguage());
@@ -307,23 +253,17 @@
}
public void testGetDescription() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetDescription", "test lhs content", "test rhs content");
//it should be "" to begin with
assertEquals("", ruleItem1.getDescription());
ruleItem1.updateDescription("test description");
assertEquals("test description", ruleItem1.getDescription());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testGetPrecedingVersion() {
- try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetPrecedingVersion", "test lhs content", "test rhs content");
RuleItem predecessorRuleItem = (RuleItem) ruleItem1.getPrecedingVersion();
assertTrue(predecessorRuleItem == null);
@@ -342,15 +282,12 @@
predecessorRuleItem = (RuleItem) predecessorRuleItem.getPrecedingVersion();
assertNotNull(predecessorRuleItem);
assertEquals("test lhs content", predecessorRuleItem.getLhs());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testGetSucceedingVersion() {
try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetSucceedingVersion", "test lhs content", "test rhs content");
RuleItem succeedingRuleItem = (RuleItem) ruleItem1.getSucceedingVersion();
assertTrue(succeedingRuleItem == null);
@@ -370,7 +307,7 @@
public void testGetSuccessorVersionsIterator() {
try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetSuccessorVersionsIterator", "test lhs content", "test rhs content");
Iterator iterator = ruleItem1.getSuccessorVersionsIterator();
assertNotNull(iterator);
@@ -409,7 +346,7 @@
public void testGetPredecessorVersionsIterator() {
try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetPredecessorVersionsIterator", "test lhs content", "test rhs content");
Iterator iterator = ruleItem1.getPredecessorVersionsIterator();
assertNotNull(iterator);
@@ -443,23 +380,18 @@
public void testGetTitle() {
try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetTitle", "test lhs content", "test rhs content");
- assertEquals("test rule", ruleItem1.getTitle());
+ assertEquals("testGetTitle", ruleItem1.getTitle());
}
catch(Exception e) {
fail("Caught unexpected exception: " + e);
}
}
- public void testGetContributor() {
- //can't implement this until we figure out login / JAAS stuff.
- fail("not yet implemented");
- }
-
public void testGetFormat() {
try {
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetFormat", "test lhs content", "test rhs content");
assertEquals("Rule", ruleItem1.getFormat());
}
Modified: labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RulePackageItemTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RulePackageItemTestCase.java 2006-08-29 17:16:19 UTC (rev 6007)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RulePackageItemTestCase.java 2006-08-29 21:01:07 UTC (rev 6008)
@@ -9,22 +9,24 @@
import junit.framework.TestCase;
public class RulePackageItemTestCase extends TestCase {
- private RulesRepository rulesRepository;
-
- protected void setUp() throws Exception {
- super.setUp();
- this.rulesRepository = new RulesRepository(true);
- }
+// private RulesRepository rulesRepository;
+//
+// protected void setUp() throws Exception {
+// super.setUp();
+// getRepo() = new RulesRepository(true);
+// }
+//
+// protected void tearDown() throws Exception {
+// super.tearDown();
+// getRepo().logout();
+// }
- protected void tearDown() throws Exception {
- super.tearDown();
- this.rulesRepository.logout();
- }
-
public void testRulePackageItem() throws Exception {
+ RulesRepository repo = getRepo();
try {
+
//calls constructor
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = repo.createRulePackage("testRulePackage");
assertNotNull(rulePackageItem1);
assertEquals("testRulePackage", rulePackageItem1.getName());
}
@@ -36,8 +38,8 @@
//try constructing with node of wrong type
try {
File dslFile1 = new File("./src/java/org/drools/repository/test/test_data/dsl1.dsl");
- DslItem dslItem = rulesRepository.addDslFromFile(dslFile1);
- RulePackageItem rulePackageItem2 = new RulePackageItem(this.rulesRepository, dslItem.getNode());
+ DslItem dslItem = repo.addDslFromFile(dslFile1);
+ RulePackageItem rulePackageItem2 = new RulePackageItem(repo, dslItem.getNode());
fail("Exception not thrown for node of type: " + dslItem.getNode().getPrimaryNodeType().getName());
}
catch(RulesRepositoryException e) {
@@ -49,11 +51,14 @@
}
}
+ private RulesRepository getRepo() {
+ return RepositorySession.getRepository();
+ }
+
public void testAddRuleRuleItem() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testAddRuleRuleItem");
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("test rule", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem1);
@@ -70,47 +75,42 @@
assertEquals("test rule", ((RuleItem)rules.get(0)).getName());
assertEquals("new lhs", ((RuleItem)rules.get(0)).getLhs());
- RuleItem ruleItem2 = this.rulesRepository.addRule("test rule 2", "test lhs content", "test rhs content");
+ RuleItem ruleItem2 = getRepo().addRule("test rule 2", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem2);
rules = rulePackageItem1.getRules();
assertNotNull(rules);
assertEquals(2, rules.size());
- Iterator it = rulesRepository.listPackages();
+ Iterator it = getRepo().listPackages();
assertTrue(it.hasNext());
RulePackageItem pack = (RulePackageItem) it.next();
assertEquals("testRulePackage", pack.getName());
- }
- catch(Exception e) {
- e.printStackTrace();
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testAddRuleRuleItemBoolean() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testAddRuleRuleItemBoolean");
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testAddRuleRuleItemBoolean", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem1, true);
List rules = rulePackageItem1.getRules();
assertNotNull(rules);
assertEquals(1, rules.size());
- assertEquals("test rule", ((RuleItem)rules.get(0)).getName());
+ assertEquals("testAddRuleRuleItemBoolean", ((RuleItem)rules.get(0)).getName());
//test that it is following the head revision
ruleItem1.updateLhs("new lhs");
rules = rulePackageItem1.getRules();
assertNotNull(rules);
assertEquals(1, rules.size());
- assertEquals("test rule", ((RuleItem)rules.get(0)).getName());
+ assertEquals("testAddRuleRuleItemBoolean", ((RuleItem)rules.get(0)).getName());
assertEquals("new lhs", ((RuleItem)rules.get(0)).getLhs());
- RuleItem ruleItem2 = this.rulesRepository.addRule("test rule 2", "test lhs content", "test rhs content");
+ RuleItem ruleItem2 = getRepo().addRule("testAddRuleRuleItemBoolean2", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem2);
rules = rulePackageItem1.getRules();
@@ -119,7 +119,7 @@
//test not following the head revision
rulePackageItem1.removeAllRules();
- RuleItem ruleItem3 = this.rulesRepository.addRule("test rule 3", "test lhs content", "test rhs content");
+ RuleItem ruleItem3 = getRepo().addRule("testAddRuleRuleItemBoolean3", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem3, false);
@@ -133,18 +133,13 @@
assertNotNull(rules);
assertEquals(1, rules.size());
assertEquals("test lhs content", ((RuleItem)rules.get(0)).getLhs());
- }
- catch(Exception e) {
- e.printStackTrace();
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testAddFunctionFunctionItem() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testAddFunctionFunctionItem");
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = getRepo().addFunction("test function", "test content");
rulePackageItem1.addFunction(functionItem1);
@@ -161,41 +156,36 @@
assertEquals("test function", ((FunctionItem)functions.get(0)).getName());
assertEquals("new content", ((FunctionItem)functions.get(0)).getContent());
- FunctionItem functionItem2 = this.rulesRepository.addFunction("test function 2", "test content");
+ FunctionItem functionItem2 = getRepo().addFunction("test function 2", "test content");
rulePackageItem1.addFunction(functionItem2);
functions = rulePackageItem1.getFunctions();
assertNotNull(functions);
assertEquals(2, functions.size());
- }
- catch(Exception e) {
- e.printStackTrace();
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testAddFunctionFunctionItemBoolean() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testAddFunctionFunctionItemBoolean");
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = getRepo().addFunction("testAddFunctionFunctionItemBoolean", "test content");
rulePackageItem1.addFunction(functionItem1, true);
List functions = rulePackageItem1.getFunctions();
assertNotNull(functions);
assertEquals(1, functions.size());
- assertEquals("test function", ((FunctionItem)functions.get(0)).getName());
+ assertEquals("testAddFunctionFunctionItemBoolean", ((FunctionItem)functions.get(0)).getName());
//test that it is following the head revision
functionItem1.updateContent("new content");
functions = rulePackageItem1.getFunctions();
assertNotNull(functions);
assertEquals(1, functions.size());
- assertEquals("test function", ((FunctionItem)functions.get(0)).getName());
+ assertEquals("testAddFunctionFunctionItemBoolean", ((FunctionItem)functions.get(0)).getName());
assertEquals("new content", ((FunctionItem)functions.get(0)).getContent());
- FunctionItem functionItem2 = this.rulesRepository.addFunction("test function 2", "test content");
+ FunctionItem functionItem2 = getRepo().addFunction("testAddFunctionFunctionItemBoolean2", "test content");
rulePackageItem1.addFunction(functionItem2);
functions = rulePackageItem1.getFunctions();
@@ -204,7 +194,7 @@
//test not following the head revision
rulePackageItem1.removeAllFunctions();
- FunctionItem functionItem3 = this.rulesRepository.addFunction("test function 3", "test content");
+ FunctionItem functionItem3 = getRepo().addFunction("testAddFunctionFunctionItemBoolean3", "test content");
rulePackageItem1.addFunction(functionItem3, false);
@@ -218,52 +208,43 @@
assertNotNull(functions);
assertEquals(1, functions.size());
assertEquals("test content", ((FunctionItem)functions.get(0)).getContent());
- }
- catch(Exception e) {
- e.printStackTrace();
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testGetFunctions() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testGetFunctions");
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = getRepo().addFunction("testGetFunctions", "test content");
rulePackageItem1.addFunction(functionItem1);
List functions = rulePackageItem1.getFunctions();
assertNotNull(functions);
assertEquals(1, functions.size());
- assertEquals("test function", ((FunctionItem)functions.get(0)).getName());
+ assertEquals("testGetFunctions", ((FunctionItem)functions.get(0)).getName());
- FunctionItem functionItem2 = this.rulesRepository.addFunction("test function 2", "test content");
+ FunctionItem functionItem2 = getRepo().addFunction("testGetFunctions2", "test content");
rulePackageItem1.addFunction(functionItem2);
functions = rulePackageItem1.getFunctions();
assertNotNull(functions);
assertEquals(2, functions.size());
- }
- catch(Exception e) {
- e.printStackTrace();
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testGetRules() {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testGetRules");
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testGetRules", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem1);
List rules = rulePackageItem1.getRules();
assertNotNull(rules);
assertEquals(1, rules.size());
- assertEquals("test rule", ((RuleItem)rules.get(0)).getName());
+ assertEquals("testGetRules", ((RuleItem)rules.get(0)).getName());
- RuleItem ruleItem2 = this.rulesRepository.addRule("test rule 2", "test lhs content", "test rhs content");
+ RuleItem ruleItem2 = getRepo().addRule("testGetRules2", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem2);
rules = rulePackageItem1.getRules();
@@ -273,152 +254,125 @@
}
public void testToString() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testToString");
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testToString", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem1);
assertNotNull(rulePackageItem1.toString());
- }
- catch(Exception e) {
- e.printStackTrace();
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testRemoveRule() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testRemoveRule");
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testRemoveRule", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem1);
List rules = rulePackageItem1.getRules();
assertNotNull(rules);
assertEquals(1, rules.size());
- assertEquals("test rule", ((RuleItem)rules.get(0)).getName());
+ assertEquals("testRemoveRule", ((RuleItem)rules.get(0)).getName());
ruleItem1.updateLhs("new lhs");
rules = rulePackageItem1.getRules();
assertNotNull(rules);
assertEquals(1, rules.size());
- assertEquals("test rule", ((RuleItem)rules.get(0)).getName());
+ assertEquals("testRemoveRule", ((RuleItem)rules.get(0)).getName());
assertEquals("new lhs", ((RuleItem)rules.get(0)).getLhs());
- RuleItem ruleItem2 = this.rulesRepository.addRule("test rule 2", "test lhs content", "test rhs content");
+ RuleItem ruleItem2 = getRepo().addRule("testRemoveRule2", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem2);
//remove the rule, make sure the other rule in the pacakge stays around
rulePackageItem1.removeRule(ruleItem1);
rules = rulePackageItem1.getRules();
assertEquals(1, rules.size());
- assertEquals("test rule 2", ((RuleItem)rules.get(0)).getName());
+ assertEquals("testRemoveRule2", ((RuleItem)rules.get(0)).getName());
//remove the rule that is following the head revision, make sure the pacakge is now empty
rulePackageItem1.removeRule(ruleItem2);
rules = rulePackageItem1.getRules();
assertNotNull(rules);
assertEquals(0, rules.size());
-
- }
- catch(Exception e) {
- e.printStackTrace();
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testRemoveAllRules() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testRemoveAllRules");
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testRemoveAllRules", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem1);
List rules = rulePackageItem1.getRules();
assertNotNull(rules);
assertEquals(1, rules.size());
- assertEquals("test rule", ((RuleItem)rules.get(0)).getName());
+ assertEquals("testRemoveAllRules", ((RuleItem)rules.get(0)).getName());
rulePackageItem1.removeAllRules();
rules = rulePackageItem1.getRules();
assertNotNull(rules);
assertEquals(0, rules.size());
- }
- catch(Exception e) {
- e.printStackTrace();
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testRemoveFunction() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testRemoveFunction");
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = getRepo().addFunction("testRemoveFunction", "test content");
rulePackageItem1.addFunction(functionItem1);
List functions = rulePackageItem1.getFunctions();
assertNotNull(functions);
assertEquals(1, functions.size());
- assertEquals("test function", ((FunctionItem)functions.get(0)).getName());
+ assertEquals("testRemoveFunction", ((FunctionItem)functions.get(0)).getName());
functionItem1.updateContent("new content");
functions = rulePackageItem1.getFunctions();
assertNotNull(functions);
assertEquals(1, functions.size());
- assertEquals("test function", ((FunctionItem)functions.get(0)).getName());
+ assertEquals("testRemoveFunction", ((FunctionItem)functions.get(0)).getName());
assertEquals("new content", ((FunctionItem)functions.get(0)).getContent());
- FunctionItem functionItem2 = this.rulesRepository.addFunction("test function 2", "test content");
+ FunctionItem functionItem2 = getRepo().addFunction("testRemoveFunction2", "test content");
rulePackageItem1.addFunction(functionItem2);
//remove the function, make sure the other function in the package stays around
rulePackageItem1.removeFunction(functionItem1);
functions = rulePackageItem1.getFunctions();
assertEquals(1, functions.size());
- assertEquals("test function 2", ((FunctionItem)functions.get(0)).getName());
+ assertEquals("testRemoveFunction2", ((FunctionItem)functions.get(0)).getName());
//remove the function that is following the head revision, make sure the package is now empty
rulePackageItem1.removeFunction(functionItem2);
functions = rulePackageItem1.getFunctions();
assertNotNull(functions);
assertEquals(0, functions.size());
-
- }
- catch(Exception e) {
- e.printStackTrace();
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testRemoveAllFunctions() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testRemoveAllFunctions");
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = getRepo().addFunction("testRemoveAllFunctions", "test content");
rulePackageItem1.addFunction(functionItem1);
List functions = rulePackageItem1.getFunctions();
assertNotNull(functions);
assertEquals(1, functions.size());
- assertEquals("test function", ((FunctionItem)functions.get(0)).getName());
+ assertEquals("testRemoveAllFunctions", ((FunctionItem)functions.get(0)).getName());
rulePackageItem1.removeAllFunctions();
functions = rulePackageItem1.getFunctions();
assertNotNull(functions);
assertEquals(0, functions.size());
- }
- catch(Exception e) {
- e.printStackTrace();
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testGetPrecedingVersion() {
@@ -450,13 +404,9 @@
}
public void testGetFormat() {
- try {
- RulePackageItem rulePackageItem1 = this.rulesRepository.createRulePackage("testRulePackage");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testGetFormat");
assertNotNull(rulePackageItem1);
assertEquals("Rule Package", rulePackageItem1.getFormat());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RulesRepositoryTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RulesRepositoryTestCase.java 2006-08-29 17:16:19 UTC (rev 6007)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RulesRepositoryTestCase.java 2006-08-29 21:01:07 UTC (rev 6008)
@@ -322,15 +322,15 @@
}
public void testListPackages() {
- RulesRepository rulesRepository = null;
+ RulesRepository rulesRepository = RepositorySession.getRepository();
try {
- RulePackageItem rulePackageItem1 = rulesRepository.createRulePackage("testRulePacakge");
+ RulePackageItem rulePackageItem1 = rulesRepository.createRulePackage("testListPackages");
Iterator it = rulesRepository.listPackages();
assertTrue(it.hasNext());
RulePackageItem pack = (RulePackageItem) it.next();
- assertEquals("testRulePackage", pack.getName());
+ assertEquals("testListPackages", pack.getName());
}
catch(Exception e) {
fail("Caught unexpected exception: " + e);
More information about the jboss-svn-commits
mailing list