[jboss-svn-commits] JBL Code SVN: r8229 - in labs/jbossrules/trunk/drools-repository/src: main/java/org/drools/repository test/java/org/drools/repository

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2006-12-11 12:44:40 -0500 (Mon, 11 Dec 2006)
New Revision: 8229

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulePackageItem.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RuleItemTestCase.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulePackageItemTestCase.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTestCase.java
Log:
JBRULES-582 Items should not save and checkin on creation

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulePackageItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulePackageItem.java	2006-12-11 17:24:00 UTC (rev 8228)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulePackageItem.java	2006-12-11 17:44:40 UTC (rev 8229)
@@ -130,11 +130,6 @@
                 rule.addCategory( initialCategory );
             }
             
-            
-            
-            this.rulesRepository.save();
-            
-            rule.checkin( "Initial" );
             return rule;
 
         } catch ( Exception e ) {

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RuleItemTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RuleItemTestCase.java	2006-12-11 17:24:00 UTC (rev 8228)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RuleItemTestCase.java	2006-12-11 17:44:40 UTC (rev 8229)
@@ -137,8 +137,8 @@
     public void testFindRulesByCategory() throws Exception {
         
         getRepo().loadCategory( "/" ).addCategory( "testFindRulesByCat", "yeah" );
-        getDefaultPackage().addRule( "testFindRulesByCategory1", "ya", "testFindRulesByCat" );
-        getDefaultPackage().addRule( "testFindRulesByCategory2", "ya", "testFindRulesByCat" );
+        getDefaultPackage().addRule( "testFindRulesByCategory1", "ya", "testFindRulesByCat" ).checkin( "version0" );
+        getDefaultPackage().addRule( "testFindRulesByCategory2", "ya", "testFindRulesByCat" ).checkin( "version0" );
   
         
         List rules = getRepo().findRulesByCategory( "testFindRulesByCat" );
@@ -301,6 +301,7 @@
     
     public void testSaveAndCheckinDescriptionAndTitle() throws Exception {
             RuleItem ruleItem1 = getRepo().loadDefaultRulePackage().addRule("testGetDescription", "");
+            ruleItem1.checkin( "version0" );
             
             //it should be "" to begin with
             assertEquals("", ruleItem1.getDescription());
@@ -337,6 +338,7 @@
         
             getRepo().loadCategory( "/" ).addCategory( "foo", "ka" );
             RuleItem ruleItem1 = getRepo().loadDefaultRulePackage().addRule("testGetPrecedingVersion", "descr");
+            ruleItem1.checkin( "version0" );
             assertTrue(ruleItem1.getPrecedingVersion() == null);
             
             
@@ -384,6 +386,7 @@
     
     public void testGetSucceedingVersion() {
             RuleItem ruleItem1 = getRepo().loadDefaultRulePackage().addRule("testGetSucceedingVersion", "test description");
+            ruleItem1.checkin( "version0" );
 
             assertEquals("1", ruleItem1.getVersionNumber());
             
@@ -404,7 +407,8 @@
     
     public void testGetSuccessorVersionsIterator() {
         try {
-            RuleItem ruleItem1 = getRepo().loadDefaultRulePackage().addRule("testGetSuccessorVersionsIterator", "test content");                        
+            RuleItem ruleItem1 = getRepo().loadDefaultRulePackage().addRule("testGetSuccessorVersionsIterator", "test content");
+            ruleItem1.checkin( "version0" );
             
             Iterator iterator = ruleItem1.getSuccessorVersionsIterator();            
             assertNotNull(iterator);
@@ -446,6 +450,7 @@
     public void testGetPredecessorVersionsIterator() {
         try {
             RuleItem ruleItem1 = getRepo().loadDefaultRulePackage().addRule("testGetPredecessorVersionsIterator", "test description");
+            ruleItem1.checkin( "version0" );
             
             Iterator iterator = ruleItem1.getPredecessorVersionsIterator();            
             assertNotNull(iterator);

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulePackageItemTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulePackageItemTestCase.java	2006-12-11 17:24:00 UTC (rev 8228)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulePackageItemTestCase.java	2006-12-11 17:44:40 UTC (rev 8229)
@@ -161,8 +161,13 @@
         
         
         RuleItem rule1 = pack.addRule( "rule number 1", "yeah man" );
+        rule1.checkin( "version0" );
+        
         RuleItem rule2 = pack.addRule( "rule number 2", "no way" );
+        rule2.checkin( "version0" );
+        
         RuleItem rule3 = pack.addRule( "rule number 3", "yes way" );
+        rule3.checkin( "version0" );
         
         getRepo().save();
         

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTestCase.java	2006-12-11 17:24:00 UTC (rev 8228)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTestCase.java	2006-12-11 17:44:40 UTC (rev 8229)
@@ -48,10 +48,13 @@
         assertEquals("my rule", rule.getName());
         
         rule.updateRuleContent( "foo foo" );
-        rule.checkin( "foobar" );
+        rule.checkin( "version0" );
         
         pack.addRule( "other rule", "description" );
         
+        rule.updateRuleContent( "foo bar" );
+        rule.checkin( "version1" );
+        
         RulePackageItem pack2 =  repo.loadRulePackage( "testAddVersionARule" );
         
         Iterator it =  pack2.getRules();
@@ -63,8 +66,8 @@
         
         RuleItem prev = (RuleItem) rule.getPrecedingVersion();
        
-        assertEquals("foo foo", rule.getRuleContent());
-        assertFalse("foo foo".equals( prev.getRuleContent() ));
+        assertEquals("foo bar", rule.getRuleContent());
+        assertEquals("foo foo", prev.getRuleContent());
         
         
         
@@ -215,6 +218,7 @@
         RulesRepository repo = RepositorySession.getRepository();
         RulePackageItem pkg = repo.createRulePackage( "testMove", "description" );
         RuleItem r = pkg.addRule( "testMove", "description" );
+        r.checkin( "version0" );
         
         assertEquals("testMove", r.getPackageName());
         
@@ -238,7 +242,7 @@
         
         RuleItem p = (RuleItem) r.getPrecedingVersion();
         assertEquals("testMove", p.getPackageName());
-        assertEquals("Initial", p.getCheckinComment());
+        assertEquals("version0", p.getCheckinComment());
         
     }