[jboss-svn-commits] JBL Code SVN: r6015 - in 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
Wed Aug 30 09:02:01 EDT 2006
Author: michael.neale at jboss.com
Date: 2006-08-30 09:01:50 -0400 (Wed, 30 Aug 2006)
New Revision: 6015
Removed:
labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/AllTests.java
Modified:
labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/DslItem.java
labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/RuleItem.java
labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/RulesRepository.java
labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/DslItemTestCase.java
labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/FunctionItemTestCase.java
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:
now all the tests pass ! woot !
Modified: labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/DslItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/DslItem.java 2006-08-30 10:23:25 UTC (rev 6014)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/DslItem.java 2006-08-30 13:01:50 UTC (rev 6015)
@@ -88,7 +88,7 @@
* dsl node
* @throws RulesRepositoryException
*/
- public void updateContentFromFile(File file) throws RulesRepositoryException {
+ public void updateContent(String content) throws RulesRepositoryException {
try {
this.node.checkout();
}
@@ -114,9 +114,9 @@
Node resNode = this.node.getNode("jcr:content");
resNode.setProperty("jcr:mimeType", "text/plain");
resNode.setProperty("jcr:encoding", System.getProperty("file.encoding")); //TODO: is this right?
- resNode.setProperty("jcr:data", new FileInputStream(file));
+ resNode.setProperty("jcr:data", content);
Calendar lastModified = Calendar.getInstance();
- lastModified.setTimeInMillis(file.lastModified());
+ lastModified.setTimeInMillis(System.currentTimeMillis());
resNode.setProperty("jcr:lastModified", lastModified);
this.node.getSession().save();
Modified: labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/RuleItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/RuleItem.java 2006-08-30 10:23:25 UTC (rev 6014)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/RuleItem.java 2006-08-30 13:01:50 UTC (rev 6015)
@@ -406,7 +406,7 @@
* @param tag the tag to add to the rule. rules can have multiple tags
* @throws RulesRepositoryException
*/
- public void addTag(String tag) throws RulesRepositoryException {
+ public void addCategory(String tag) throws RulesRepositoryException {
try {
//make sure this object's node is the head version
if(this.node.getPrimaryNodeType().getName().equals("nt:version")) {
@@ -464,7 +464,7 @@
* @param tag the tag to remove from the rule
* @throws RulesRepositoryException
*/
- public void removeTag(String tag) throws RulesRepositoryException {
+ public void removeCategory(String tag) throws RulesRepositoryException {
//TODO: implement if the removed tag no longer has anyone referencing it, remove the tag (are we sure we want to do this, for versioning's sake?)
try {
//make sure this object's node is the head version
@@ -537,7 +537,7 @@
* @return a list of TagItem objects for each tag on the rule. If there are no tags, an empty list.
* @throws RulesRepositoryException
*/
- public List getTags() throws RulesRepositoryException {
+ public List getCategories() throws RulesRepositoryException {
try {
Node ruleNode;
if(this.node.getPrimaryNodeType().getName().equals("nt:version")) {
@@ -688,7 +688,7 @@
returnString.append("------\n");
returnString.append("Rule tags:\n");
- for(Iterator it=this.getTags().iterator(); it.hasNext();) {
+ for(Iterator it=this.getCategories().iterator(); it.hasNext();) {
CategoryItem currentTag = (CategoryItem)it.next();
returnString.append(currentTag.getName() + "\n");
}
Modified: labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/RulesRepository.java 2006-08-30 10:23:25 UTC (rev 6014)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/RulesRepository.java 2006-08-30 13:01:50 UTC (rev 6015)
@@ -455,14 +455,14 @@
* @return a DslItem object encapsulating the node that gets added
* @throws RulesRepositoryException
*/
- public DslItem addDslFromFile(File file) throws RulesRepositoryException {
+ public DslItem addDsl(String name, String content) throws RulesRepositoryException {
Node folderNode = this.getAreaNode(DSL_AREA);
try {
//create the node - see section 6.7.22.6 of the spec
- Node dslNode = folderNode.addNode(file.getName(), DslItem.DSL_NODE_TYPE_NAME);
+ Node dslNode = folderNode.addNode(name, DslItem.DSL_NODE_TYPE_NAME);
- dslNode.setProperty(DslItem.TITLE_PROPERTY_NAME, file.getName());
+ dslNode.setProperty(DslItem.TITLE_PROPERTY_NAME, name);
//TODO: set this property correctly once we've figured out logging in / JAAS
dslNode.setProperty(DslItem.CONTRIBUTOR_PROPERTY_NAME, "not yet implemented");
@@ -474,9 +474,9 @@
Node resNode = dslNode.addNode("jcr:content", "nt:resource");
resNode.setProperty("jcr:mimeType", "text/plain");
resNode.setProperty("jcr:encoding", System.getProperty("file.encoding")); //TODO: is this right?
- resNode.setProperty("jcr:data", new FileInputStream(file));
+ resNode.setProperty("jcr:data", content);
Calendar lastModified = Calendar.getInstance();
- lastModified.setTimeInMillis(file.lastModified());
+ lastModified.setTimeInMillis(System.currentTimeMillis());
resNode.setProperty("jcr:lastModified", lastModified);
dslNode.setProperty(DslItem.LAST_MODIFIED_PROPERTY_NAME, lastModified);
Deleted: labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/AllTests.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/AllTests.java 2006-08-30 10:23:25 UTC (rev 6014)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/AllTests.java 2006-08-30 13:01:50 UTC (rev 6015)
@@ -1,21 +0,0 @@
-package org.drools.repository.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.drools.repository.test");
- //$JUnit-BEGIN$
- suite.addTestSuite(StateItemTestCase.class);
- suite.addTestSuite(RulePackageItemTestCase.class);
- suite.addTestSuite(DslItemTestCase.class);
- suite.addTestSuite(RuleItemTestCase.class);
- suite.addTestSuite(CategoryItemTestCase.class);
- suite.addTestSuite(RulesRepositoryTestCase.class);
- //$JUnit-END$
- return suite;
- }
-
-}
Modified: labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/DslItemTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/DslItemTestCase.java 2006-08-30 10:23:25 UTC (rev 6014)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/DslItemTestCase.java 2006-08-30 13:01:50 UTC (rev 6015)
@@ -1,39 +1,29 @@
package org.drools.repository.test;
-import java.io.File;
-import java.util.Iterator;
+import junit.framework.TestCase;
+
import org.drools.repository.DslItem;
import org.drools.repository.RuleItem;
import org.drools.repository.RulesRepository;
import org.drools.repository.RulesRepositoryException;
-import junit.framework.TestCase;
-
public class DslItemTestCase extends TestCase {
- private RulesRepository rulesRepository;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- rulesRepository = new RulesRepository(true);
- }
- protected void tearDown() throws Exception {
- super.tearDown();
- rulesRepository.logout();
+ private RulesRepository getRepo() {
+ return RepositorySession.getRepository();
}
-
- public void testDslItem() {
+
+ public void testDslItem() {
+
try {
- File dslFile1 = new File("./src/java/org/drools/repository/test/test_data/dsl1.dsl");
-
//This calls the constructor
- DslItem dslItem1 = rulesRepository.addDslFromFile(dslFile1);
+ String meth = StackUtil.getCurrentMethodName();
+ DslItem dslItem1 = getRepo().addDsl(meth, "blah");
assertNotNull(dslItem1);
assertNotNull(dslItem1.getNode());
- assertEquals("dsl1.dsl", dslItem1.getName());
+ assertEquals(meth, dslItem1.getName());
}
catch(Exception e) {
fail("Unexpected Exception caught: " + e);
@@ -41,13 +31,11 @@
//try constructing a DslItem object with the wrong node type
try {
- File drlFile1 = new File("./src/java/org/drools/repository/test/test_data/rule1.drl");
-
//Get a reference to a node of the incorrect type
- RuleItem ruleItem1 = this.rulesRepository.addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = this.getRepo().addRule("test rule", "test lhs content", "test rhs content");
//this should fail
- DslItem dslItem2 = new DslItem(rulesRepository, ruleItem1.getNode());
+ DslItem dslItem2 = new DslItem(getRepo(), ruleItem1.getNode());
fail("Exception not thrown by constructor for node of type: " + ruleItem1.getNode().getPrimaryNodeType().getName());
}
catch(RulesRepositoryException e) {
@@ -59,58 +47,12 @@
}
public void testGetContent() {
- try {
- File dslFile1 = new File("./src/java/org/drools/repository/test/test_data/dsl2.dsl");
+ DslItem dslItem1 = getRepo().addDsl(StackUtil.getCurrentMethodName(), "[then]Send escalation email=sendEscalationEmail( customer, ticket );");
- //This calls the constructor
- DslItem dslItem1 = rulesRepository.addDslFromFile(dslFile1);
-
assertNotNull(dslItem1);
assertEquals("[then]Send escalation email=sendEscalationEmail( customer, ticket );", dslItem1.getContent());
- }
- catch(Exception e) {
- fail("Unexpected Exception caught: " + e);
- }
+ assertEquals("DSL", dslItem1.getFormat());
}
- public void testGetPrecedingVersion() {
- //not bothering to implement this test since it is pretty much covered by the RuleItemTestCase
- }
- public void testGetSucceedingVersion() {
- //not bothering to implement this test since it is pretty much covered by the RuleItemTestCase
- }
-
- public void testGetSuccessorVersionsIterator() {
- //This is covered by the test in RuleItemTestCase - all functionality under test
- // resides in the common subclass, VersionableItem
- }
-
- public void testGetPredecessorVersionsIterator() {
- //This is covered by the test in RuleItemTestCase - all functionality under test
- // resides in the common subclass, VersionableItem
- }
-
- public void testGetTitle() {
- //This is covered by the test in RuleItemTestCase - all functionality under test
- // resides in the common subclass, VersionableItem
- }
-
- public void testGetContributor() {
- //This is covered by the test in RuleItemTestCase - all functionality under test
- // resides in the common subclass, VersionableItem
- }
-
- public void testGetFormat() {
- try {
- File dslFile1 = new File("./src/java/org/drools/repository/test/test_data/dsl1.dsl");
-
- DslItem dslItem1 = rulesRepository.addDslFromFile(dslFile1);
-
- assertEquals("DSL", dslItem1.getFormat());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
- }
}
Modified: labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/FunctionItemTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/FunctionItemTestCase.java 2006-08-30 10:23:25 UTC (rev 6014)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/FunctionItemTestCase.java 2006-08-30 13:01:50 UTC (rev 6015)
@@ -10,26 +10,18 @@
import org.drools.repository.*;
public class FunctionItemTestCase 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 void testFunctionItem() {
try {
//calls constructor
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testFunctionItem", "test content");
assertNotNull(functionItem1);
assertNotNull(functionItem1.getNode());
- assertEquals("test function", functionItem1.getName());
+ assertEquals("testFunctionItem", functionItem1.getName());
}
catch(Exception e) {
fail("Caught unexpected exception: " + e);
@@ -37,9 +29,9 @@
//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);
- FunctionItem functionItem = new FunctionItem(this.rulesRepository, dslItem.getNode());
+
+ DslItem dslItem = getRepo().addDsl("testFunctionItem", "content here");
+ FunctionItem functionItem = new FunctionItem(this.getRepo(), dslItem.getNode());
fail("Exception not thrown for node of type: " + dslItem.getNode().getPrimaryNodeType().getName());
}
catch(RulesRepositoryException e) {
@@ -51,60 +43,42 @@
}
public void testGetContent() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testGetContent", "test content");
assertNotNull(functionItem1);
assertNotNull(functionItem1.getNode());
assertEquals("test content", functionItem1.getContent());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testUpdateContent() {
- //TODO: maybe add some testing on the versioning stuff more - check the content of the
- // previous version, etc.
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testUpdateContent", "test content");
functionItem1.updateContent("new content");
assertEquals("new content", functionItem1.getContent());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
- public void testAddTag() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ public void testAddCategory() {
+ FunctionItem functionItem1 = this.getRepo().addFunction("testAddCategory", "test content");
- functionItem1.addTag("TestTag");
+ functionItem1.addTag("testAddCategoryTestTag");
List tags = functionItem1.getTags();
assertEquals(1, tags.size());
- assertEquals("TestTag", ((CategoryItem)tags.get(0)).getName());
+ assertEquals("testAddCategoryTestTag", ((CategoryItem)tags.get(0)).getName());
- functionItem1.addTag("TestTag2");
+ functionItem1.addTag("testAddCategoryTestTag2");
tags = functionItem1.getTags();
assertEquals(2, tags.size());
//now test retrieve by tags
- List result = this.rulesRepository.findFunctionsByTag("TestTag");
+ List result = this.getRepo().findFunctionsByTag("testAddCategoryTestTag");
assertEquals(1, result.size());
FunctionItem retItem = (FunctionItem) result.get(0);
- assertEquals("test function", retItem.getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+ assertEquals("testAddCategory", retItem.getName());
}
public void testRemoveTag() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testRemoveTag", "test content");
functionItem1.addTag("TestTag");
functionItem1.removeTag("TestTag");
@@ -117,15 +91,10 @@
tags = functionItem1.getTags();
assertEquals(1, tags.size());
assertEquals("TestTag3", ((CategoryItem)tags.get(0)).getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testGetTags() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testGetTags", "test content");
List tags = functionItem1.getTags();
assertNotNull(tags);
@@ -135,15 +104,10 @@
tags = functionItem1.getTags();
assertEquals(1, tags.size());
assertEquals("TestTag", ((CategoryItem)tags.get(0)).getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testSetStateString() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testSetStateString", "test content");
functionItem1.setState("TestState1");
assertNotNull(functionItem1.getState());
@@ -152,34 +116,24 @@
functionItem1.setState("TestState2");
assertNotNull(functionItem1.getState());
assertEquals("TestState2", functionItem1.getState().getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testSetStateStateItem() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test content", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testSetStateStateItem", "test content");
- StateItem stateItem1 = rulesRepository.getState("TestState1");
+ StateItem stateItem1 = getRepo().getState("TestState1");
functionItem1.setState(stateItem1);
assertNotNull(functionItem1.getState());
assertEquals(functionItem1.getState().getName(), "TestState1");
- StateItem stateItem2 = rulesRepository.getState("TestState2");
+ StateItem stateItem2 = getRepo().getState("TestState2");
functionItem1.setState(stateItem2);
assertNotNull(functionItem1.getState());
assertEquals("TestState2", functionItem1.getState().getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testGetState() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testGetState", "test content");
StateItem stateItem1 = functionItem1.getState();
assertNull(stateItem1);
@@ -187,46 +141,24 @@
functionItem1.setState("TestState1");
assertNotNull(functionItem1.getState());
assertEquals("TestState1", functionItem1.getState().getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testToString() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
-
+ FunctionItem functionItem1 = this.getRepo().addFunction("testToString", "test content");
assertNotNull(functionItem1.toString());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
- public void testGetLastModified() {
- //common functionality with FunctionItem - tested there
- }
public void testFunctionRuleLanguage() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testFunctionRuleLanguage", "test content");
//it should be initialized to 'Java'
assertEquals("Java", functionItem1.getFunctionLanguage());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
- public void testGetDescription() {
- //common functionality with FunctionItem - tested there
- }
public void testGetPrecedingVersion() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testGetPrecedingVersion", "test content");
FunctionItem predecessorFunctionItem = (FunctionItem) functionItem1.getPrecedingVersion();
assertTrue(predecessorFunctionItem == null);
@@ -245,15 +177,10 @@
predecessorFunctionItem = (FunctionItem) predecessorFunctionItem.getPrecedingVersion();
assertNotNull(predecessorFunctionItem);
assertEquals("test content", predecessorFunctionItem.getContent());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testGetSucceedingVersion() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testGetSucceedingVersion", "test content");
FunctionItem succeedingFunctionItem = (FunctionItem) functionItem1.getSucceedingVersion();
assertTrue(succeedingFunctionItem == null);
@@ -265,15 +192,10 @@
succeedingFunctionItem = (FunctionItem) predecessorFunctionItem.getSucceedingVersion();
assertNotNull(succeedingFunctionItem);
assertEquals(functionItem1.getContent(), succeedingFunctionItem.getContent());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testGetSuccessorVersionsIterator() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testGetSuccessorVersionsIterator", "test content");
Iterator iterator = functionItem1.getSuccessorVersionsIterator();
assertNotNull(iterator);
@@ -304,15 +226,10 @@
nextFunctionItem = (FunctionItem)iterator.next();
assertEquals("newer content", nextFunctionItem.getContent());
assertFalse(iterator.hasNext());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testGetPredecessorVersionsIterator() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
+ FunctionItem functionItem1 = this.getRepo().addFunction("testGetPredecessorVersionsIterator", "test content");
Iterator iterator = functionItem1.getPredecessorVersionsIterator();
assertNotNull(iterator);
@@ -338,36 +255,21 @@
nextFunctionItem = (FunctionItem) iterator.next();
assertFalse(iterator.hasNext());
assertEquals("test content", nextFunctionItem.getContent());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
}
public void testGetTitle() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
-
- assertEquals("test function", functionItem1.getTitle());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+ FunctionItem functionItem1 = this.getRepo().addFunction("testGetTitle", "test content");
+ assertEquals("testGetTitle", functionItem1.getTitle());
}
- public void testGetContributor() {
- //can't implement this until we figure out login / JAAS stuff.
- fail("not yet implemented");
- }
public void testGetFormat() {
- try {
- FunctionItem functionItem1 = this.rulesRepository.addFunction("test function", "test content");
-
+ FunctionItem functionItem1 = this.getRepo().addFunction("testGetFormat", "test content");
assertEquals("Function", functionItem1.getFormat());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+ }
+
+ private RulesRepository getRepo() {
+
+ return RepositorySession.getRepository();
}
}
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-30 10:23:25 UTC (rev 6014)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RuleItemTestCase.java 2006-08-30 13:01:50 UTC (rev 6015)
@@ -31,8 +31,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 = getRepo().addDslFromFile(dslFile1);
+
+ DslItem dslItem = getRepo().addDsl("testRuleItem", "content here");
RuleItem ruleItem = new RuleItem(getRepo(), dslItem.getNode());
fail("Exception not thrown for node of type: " + dslItem.getNode().getPrimaryNodeType().getName());
}
@@ -88,13 +88,13 @@
public void testAddTag() {
RuleItem ruleItem1 = getRepo().addRule("testAddTag", "test lhs content", "test rhs content");
- ruleItem1.addTag("testAddTagTestTag");
- List tags = ruleItem1.getTags();
+ ruleItem1.addCategory("testAddTagTestTag");
+ List tags = ruleItem1.getCategories();
assertEquals(1, tags.size());
assertEquals("testAddTagTestTag", ((CategoryItem)tags.get(0)).getName());
- ruleItem1.addTag("testAddTagTestTag2");
- tags = ruleItem1.getTags();
+ ruleItem1.addCategory("testAddTagTestTag2");
+ tags = ruleItem1.getCategories();
assertEquals(2, tags.size());
@@ -108,35 +108,31 @@
}
public void testRemoveTag() {
- try {
- RuleItem ruleItem1 = getRepo().addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testRemoveTag", "test lhs content", "test rhs content");
- ruleItem1.addTag("TestTag");
- ruleItem1.removeTag("TestTag");
- List tags = ruleItem1.getTags();
+ ruleItem1.addCategory("TestTag");
+ ruleItem1.removeCategory("TestTag");
+ List tags = ruleItem1.getCategories();
assertEquals(0, tags.size());
- ruleItem1.addTag("TestTag2");
- ruleItem1.addTag("TestTag3");
- ruleItem1.removeTag("TestTag2");
- tags = ruleItem1.getTags();
+ ruleItem1.addCategory("TestTag2");
+ ruleItem1.addCategory("TestTag3");
+ ruleItem1.removeCategory("TestTag2");
+ tags = ruleItem1.getCategories();
assertEquals(1, tags.size());
assertEquals("TestTag3", ((CategoryItem)tags.get(0)).getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
+
}
public void testGetTags() {
RuleItem ruleItem1 = getRepo().addRule("testGetTags", "test lhs content", "test rhs content");
- List tags = ruleItem1.getTags();
+ List tags = ruleItem1.getCategories();
assertNotNull(tags);
assertEquals(0, tags.size());
- ruleItem1.addTag("testGetTagsTestTag");
- tags = ruleItem1.getTags();
+ ruleItem1.addCategory("testGetTagsTestTag");
+ tags = ruleItem1.getCategories();
assertEquals(1, tags.size());
assertEquals("testGetTagsTestTag", ((CategoryItem)tags.get(0)).getName());
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-30 10:23:25 UTC (rev 6014)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RulePackageItemTestCase.java 2006-08-30 13:01:50 UTC (rev 6015)
@@ -9,17 +9,6 @@
import junit.framework.TestCase;
public class RulePackageItemTestCase extends TestCase {
-// private RulesRepository rulesRepository;
-//
-// protected void setUp() throws Exception {
-// super.setUp();
-// getRepo() = new RulesRepository(true);
-// }
-//
-// protected void tearDown() throws Exception {
-// super.tearDown();
-// getRepo().logout();
-// }
public void testRulePackageItem() throws Exception {
RulesRepository repo = getRepo();
@@ -29,6 +18,20 @@
RulePackageItem rulePackageItem1 = repo.createRulePackage("testRulePackage");
assertNotNull(rulePackageItem1);
assertEquals("testRulePackage", rulePackageItem1.getName());
+
+ Iterator it = getRepo().listPackages();
+ assertTrue(it.hasNext());
+
+ while (it.hasNext()) {
+ RulePackageItem pack = (RulePackageItem) it.next();
+ if (pack.getName().equals( "testRulePackage" )) {
+ return;
+ }
+
+
+ }
+ fail("should have picked up the testRulePackage but didnt.");
+
}
catch(Exception e) {
e.printStackTrace();
@@ -36,9 +39,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 = repo.addDslFromFile(dslFile1);
+ try {
+ DslItem dslItem = repo.addDsl("testRulePackageItem", "content");
RulePackageItem rulePackageItem2 = new RulePackageItem(repo, dslItem.getNode());
fail("Exception not thrown for node of type: " + dslItem.getNode().getPrimaryNodeType().getName());
}
@@ -58,35 +60,29 @@
public void testAddRuleRuleItem() {
RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testAddRuleRuleItem");
- RuleItem ruleItem1 = getRepo().addRule("test rule", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testAddRuleRuleItem", "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("testAddRuleRuleItem", ((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("testAddRuleRuleItem", ((RuleItem)rules.get(0)).getName());
assertEquals("new lhs", ((RuleItem)rules.get(0)).getLhs());
- RuleItem ruleItem2 = getRepo().addRule("test rule 2", "test lhs content", "test rhs content");
+ RuleItem ruleItem2 = getRepo().addRule("testAddRuleRuleItem2", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem2);
rules = rulePackageItem1.getRules();
assertNotNull(rules);
assertEquals(2, rules.size());
-
- Iterator it = getRepo().listPackages();
- assertTrue(it.hasNext());
-
- RulePackageItem pack = (RulePackageItem) it.next();
- assertEquals("testRulePackage", pack.getName());
}
@@ -254,9 +250,9 @@
}
public void testToString() {
- RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testToString");
+ RulePackageItem rulePackageItem1 = getRepo().createRulePackage("testToStringPackage");
- RuleItem ruleItem1 = getRepo().addRule("testToString", "test lhs content", "test rhs content");
+ RuleItem ruleItem1 = getRepo().addRule("testToStringPackage", "test lhs content", "test rhs content");
rulePackageItem1.addRule(ruleItem1);
assertNotNull(rulePackageItem1.toString());
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-30 10:23:25 UTC (rev 6014)
+++ labs/jbossrules/trunk/drools-repository/src/java/org/drools/repository/test/RulesRepositoryTestCase.java 2006-08-30 13:01:50 UTC (rev 6015)
@@ -18,48 +18,15 @@
super.tearDown();
}
- public void testRulesRepository() {
- RulesRepository rulesRepository = null;
- try {
- rulesRepository = new RulesRepository(true);
- }
- catch(Exception e) {
- fail("Caught unexpected Exception: " + e);
- }
- finally {
- if(rulesRepository != null) {
- try {
- rulesRepository.logout();
- }
- catch(Exception e) {
- fail("Caught unexpected Exception: " + e);
- }
- }
- }
- }
-
- public void testLogout() {
- //this is covered by testRulesRepository() above
- }
-
- public void testAddDslFromFile() {
- //this is covered by the DslItemTestCase
- }
-
- public void testAddRule() {
- //this is covered by the RuleItemTestCase
- }
-
public void testAddRuleDslItemBoolean() {
- RulesRepository rulesRepository = null;
- try {
- rulesRepository = new RulesRepository(true);
- File dslFile1 = new File("./src/java/org/drools/repository/test/test_data/dsl1.dsl");
+ RulesRepository rulesRepository = RepositorySession.getRepository();
- DslItem dslItem1 = rulesRepository.addDslFromFile(dslFile1);
+
+
+ DslItem dslItem1 = rulesRepository.addDsl("testAddRuleDslItemBoolean", "original content");
assertNotNull(dslItem1);
- RuleItem ruleItem1 = rulesRepository.addRule("test rule", "test lhs content", "test rhs content", dslItem1, true);
+ RuleItem ruleItem1 = rulesRepository.addRule("testAddRuleDslItemBoolean", "test lhs content", "test rhs content", dslItem1, true);
assertNotNull(ruleItem1);
assertNotNull(ruleItem1.getNode());
@@ -67,14 +34,14 @@
assertEquals(dslItem1.getContent(), ruleItem1.getDsl().getContent());
//test that this follows the head version
- File dslFile2 = new File("./src/java/org/drools/repository/test/test_data/dsl2.dsl");
- dslItem1.updateContentFromFile(dslFile2);
+
+ dslItem1.updateContent("new content");
assertNotNull(ruleItem1.getNode());
assertNotNull(ruleItem1.getDsl());
assertEquals(dslItem1.getContent(), ruleItem1.getDsl().getContent());
//now do the same thing, but test not following head:
- RuleItem ruleItem2 = rulesRepository.addRule("test rule 2", "test lhs content", "test rhs content", dslItem1, false);
+ RuleItem ruleItem2 = rulesRepository.addRule("testAddRuleDslItemBoolean2", "test lhs content", "test rhs content", dslItem1, false);
assertNotNull(ruleItem2);
assertNotNull(ruleItem2.getNode());
@@ -83,70 +50,37 @@
//test that this stays tied to the specific revision of the DSL node
String originalContent = ruleItem2.getDsl().getContent();
- dslItem1.updateContentFromFile(dslFile2);
+ dslItem1.updateContent("new content");
assertNotNull(ruleItem2.getNode());
assertNotNull(ruleItem2.getDsl());
assertEquals(originalContent, ruleItem2.getDsl().getContent());
- }
- catch(Exception e) {
- fail("Unexpected Exception caught: " + e);
- }
- finally {
- if(rulesRepository != null) {
- try {
- rulesRepository.logout();
- }
- catch(Exception e) {
- fail("Caught unexpected Exception: " + e);
- }
- }
- }
}
public void testAddRuleCalendarCalendar() {
- RulesRepository rulesRepository = null;
- try {
- rulesRepository = new RulesRepository(true);
+ RulesRepository rulesRepository = RepositorySession.getRepository();
+
Calendar effectiveDate = Calendar.getInstance();
Calendar expiredDate = Calendar.getInstance();
expiredDate.setTimeInMillis(effectiveDate.getTimeInMillis() + (1000 * 60 * 60 * 24));
- RuleItem ruleItem1 = rulesRepository.addRule("test rule", "test lhs content", "test rhs content", effectiveDate, expiredDate);
+ RuleItem ruleItem1 = rulesRepository.addRule("testAddRuleCalendarCalendar", "test lhs content", "test rhs content", effectiveDate, expiredDate);
assertNotNull(ruleItem1);
assertNotNull(ruleItem1.getNode());
assertEquals(effectiveDate, ruleItem1.getDateEffective());
assertEquals(expiredDate, ruleItem1.getDateExpired());
- }
- catch(Exception e) {
- fail("Unexpected Exception caught: " + e);
- }
- finally {
- if(rulesRepository != null) {
- try {
- rulesRepository.logout();
- }
- catch(Exception e) {
- fail("Caught unexpected Exception: " + e);
- }
- }
- }
}
public void testAddRuleDslItemBooleanCalendarCalendar() {
- RulesRepository rulesRepository = null;
- try {
- rulesRepository = new RulesRepository(true);
- File dslFile1 = new File("./src/java/org/drools/repository/test/test_data/dsl1.dsl");
-
- DslItem dslItem1 = rulesRepository.addDslFromFile(dslFile1);
+ RulesRepository rulesRepository = RepositorySession.getRepository();
+ DslItem dslItem1 = rulesRepository.addDsl("testAddRuleDslItemBooleanCalendarCalendar", "content here");
assertNotNull(dslItem1);
Calendar effectiveDate = Calendar.getInstance();
Calendar expiredDate = Calendar.getInstance();
expiredDate.setTimeInMillis(effectiveDate.getTimeInMillis() + (1000 * 60 * 60 * 24));
- RuleItem ruleItem1 = rulesRepository.addRule("test rule", "test lhs content", "test rhs content", dslItem1, true, effectiveDate, expiredDate, "test description");
+ RuleItem ruleItem1 = rulesRepository.addRule("testAddRuleDslItemBooleanCalendarCalendar", "test lhs content", "test rhs content", dslItem1, true, effectiveDate, expiredDate, "test description");
assertNotNull(ruleItem1);
assertNotNull(ruleItem1.getNode());
@@ -157,14 +91,14 @@
assertEquals("test description", ruleItem1.getDescription());
//test that this follows the head version
- File dslFile2 = new File("./src/java/org/drools/repository/test/test_data/dsl2.dsl");
- dslItem1.updateContentFromFile(dslFile2);
+
+ dslItem1.updateContent("more content");
assertNotNull(ruleItem1.getNode());
assertNotNull(ruleItem1.getDsl());
assertEquals(dslItem1.getContent(), ruleItem1.getDsl().getContent());
//now do the same thing, but test not following head:
- RuleItem ruleItem2 = rulesRepository.addRule("test rule 2", "test lhs content", "test rhs content", dslItem1, false, effectiveDate, expiredDate, "test description 2");
+ RuleItem ruleItem2 = rulesRepository.addRule("testAddRuleDslItemBooleanCalendarCalendar2", "test lhs content", "test rhs content", dslItem1, false, effectiveDate, expiredDate, "test description 2");
assertNotNull(ruleItem2);
assertNotNull(ruleItem2.getNode());
@@ -176,154 +110,71 @@
//test that this stays tied to the specific revision of the DSL node
String originalContent = ruleItem2.getDsl().getContent();
- dslItem1.updateContentFromFile(dslFile2);
+ dslItem1.updateContent("more content");
assertNotNull(ruleItem2.getNode());
assertNotNull(ruleItem2.getDsl());
assertEquals(originalContent, ruleItem2.getDsl().getContent());
- }
- catch(Exception e) {
- fail("Unexpected Exception caught: " + e);
- }
- finally {
- if(rulesRepository != null) {
- try {
- rulesRepository.logout();
- }
- catch(Exception e) {
- fail("Caught unexpected Exception: " + e);
- }
- }
- }
}
- public void testCreateRulePackage() {
- //this is covered by RulePackageItemTestCase
- }
public void testGetState() {
- RulesRepository rulesRepository = null;
- try {
- rulesRepository = new RulesRepository(true);
+ RulesRepository rulesRepository = RepositorySession.getRepository();
- StateItem stateItem1 = rulesRepository.getState("TestState");
+
+ StateItem stateItem1 = rulesRepository.getState("testGetState");
assertNotNull(stateItem1);
- assertEquals("TestState", stateItem1.getName());
+ assertEquals("testGetState", stateItem1.getName());
- StateItem stateItem2 = rulesRepository.getState("TestState");
+ StateItem stateItem2 = rulesRepository.getState("testGetState");
assertNotNull(stateItem2);
- assertEquals("TestState", stateItem2.getName());
+ assertEquals("testGetState", stateItem2.getName());
assertEquals(stateItem1, stateItem2);
- }
- catch(Exception e) {
- fail("Unexpected Exception caught: " + e);
- }
- finally {
- if(rulesRepository != null) {
- try {
- rulesRepository.logout();
- }
- catch(Exception e) {
- fail("Caught unexpected Exception: " + e);
- }
- }
- }
}
public void testGetTag() {
- RulesRepository rulesRepository = null;
- try {
- rulesRepository = new RulesRepository(true);
-
- CategoryItem tagItem1 = rulesRepository.getOrCreateCategory("TestTag");
+ RulesRepository rulesRepository = RepositorySession.getRepository();
+ CategoryItem tagItem1 = rulesRepository.getOrCreateCategory("testGetTag");
assertNotNull(tagItem1);
- assertEquals("TestTag", tagItem1.getName());
- assertEquals("TestTag", tagItem1.getFullPath());
+ assertEquals("testGetTag", tagItem1.getName());
+ assertEquals("testGetTag", tagItem1.getFullPath());
- CategoryItem tagItem2 = rulesRepository.getOrCreateCategory("TestTag");
+ CategoryItem tagItem2 = rulesRepository.getOrCreateCategory("testGetTag");
assertNotNull(tagItem2);
- assertEquals("TestTag", tagItem2.getName());
+ assertEquals("testGetTag", tagItem2.getName());
assertEquals(tagItem1, tagItem2);
//now test getting a tag down in the tag hierarchy
- CategoryItem tagItem3 = rulesRepository.getOrCreateCategory("TestTag/TestChildTag1");
+ CategoryItem tagItem3 = rulesRepository.getOrCreateCategory("testGetTag/TestChildTag1");
assertNotNull(tagItem3);
assertEquals("TestChildTag1", tagItem3.getName());
- assertEquals("TestTag/TestChildTag1", tagItem3.getFullPath());
- }
- catch(Exception e) {
- fail("Unexpected Exception caught: " + e);
- }
- finally {
- if(rulesRepository != null) {
- try {
- rulesRepository.logout();
- }
- catch(Exception e) {
- fail("Caught unexpected Exception: " + e);
- }
- }
- }
+ assertEquals("testGetTag/TestChildTag1", tagItem3.getFullPath());
}
public void testAddFunctionStringString() {
- RulesRepository rulesRepository = null;
- try {
- rulesRepository = new RulesRepository(true);
-
- FunctionItem functionItem1 = rulesRepository.addFunction("test function", "test content");
+ RulesRepository rulesRepository = RepositorySession.getRepository();
+ FunctionItem functionItem1 = rulesRepository.addFunction("testAddFunctionStringString", "test content");
assertNotNull(functionItem1);
assertNotNull(functionItem1.getNode());
- assertEquals("test function", functionItem1.getName());
+ assertEquals("testAddFunctionStringString", functionItem1.getName());
assertEquals("test content", functionItem1.getContent());
assertEquals("", functionItem1.getDescription());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
- finally {
- if(rulesRepository != null) {
- try {
- rulesRepository.logout();
- }
- catch(Exception e) {
- fail("Caught unexpected Exception: " + e);
- }
- }
- }
}
public void testAddFunctionStringStringString() {
- RulesRepository rulesRepository = null;
- try {
- rulesRepository = new RulesRepository(true);
+ RulesRepository rulesRepository = RepositorySession.getRepository();
- FunctionItem functionItem1 = rulesRepository.addFunction("test function", "test content", "test description");
+ FunctionItem functionItem1 = rulesRepository.addFunction("testAddFunctionStringStringString", "test content", "test description");
assertNotNull(functionItem1);
assertNotNull(functionItem1.getNode());
- assertEquals("test function", functionItem1.getName());
+ assertEquals("testAddFunctionStringStringString", functionItem1.getName());
assertEquals("test content", functionItem1.getContent());
assertEquals("test description", functionItem1.getDescription());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
- finally {
- if(rulesRepository != null) {
- try {
- rulesRepository.logout();
- }
- catch(Exception e) {
- fail("Caught unexpected Exception: " + e);
- }
- }
- }
}
public void testListPackages() {
RulesRepository rulesRepository = RepositorySession.getRepository();
- try {
RulePackageItem rulePackageItem1 = rulesRepository.createRulePackage("testListPackages");
Iterator it = rulesRepository.listPackages();
@@ -331,19 +182,5 @@
RulePackageItem pack = (RulePackageItem) it.next();
assertEquals("testListPackages", pack.getName());
- }
- catch(Exception e) {
- fail("Caught unexpected exception: " + e);
- }
- finally {
- if(rulesRepository != null) {
- try {
- rulesRepository.logout();
- }
- catch(Exception e) {
- fail("Caught unexpected Exception: " + e);
- }
- }
- }
}
}
More information about the jboss-svn-commits
mailing list