[jboss-svn-commits] JBL Code SVN: r7688 - 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: michael.neale at jboss.com
Date: 2006-11-17 12:13:17 -0500 (Fri, 17 Nov 2006)
New Revision: 7688

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/FunctionItem.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RuleItem.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulePackageItem.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTestCase.java
Log:
more test coverage and got rid of unneded confusing method

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/FunctionItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/FunctionItem.java	2006-11-17 16:42:36 UTC (rev 7687)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/FunctionItem.java	2006-11-17 17:13:17 UTC (rev 7688)
@@ -245,7 +245,6 @@
             returnString.append("------\n");
                         
             returnString.append("Function Language: " + this.getFunctionLanguage() + "\n");
-            returnString.append("Version Name: " + this.getVersionName() + "\n");
             returnString.append("------\n");
             
             returnString.append("Function state: ");

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java	2006-11-17 16:42:36 UTC (rev 7687)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java	2006-11-17 17:13:17 UTC (rev 7688)
@@ -85,22 +85,5 @@
         return this.node.hashCode();
     }        
     
-    /**
-     * @return the name of the version for this node in the version history
-     * @throws RulesRepositoryException
-     */
-    public String getVersionName() throws RulesRepositoryException {
-        try {
-            if(this.node.getPrimaryNodeType().getName().equals("nt:version")) {
-                return this.node.getName();
-            }
-            else {
-                return this.node.getBaseVersion().getName();
-            }            
-        }
-        catch(Exception e) {
-            log.error("Caught exception", e);
-            throw new RulesRepositoryException(e);
-        }
-    }
+
 }

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RuleItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RuleItem.java	2006-11-17 16:42:36 UTC (rev 7687)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RuleItem.java	2006-11-17 17:13:17 UTC (rev 7688)
@@ -275,7 +275,6 @@
 
             returnString.append( "Date Effective: " + this.getDateEffective() + "\n" );
             returnString.append( "Date Expired: " + this.getDateExpired() + "\n" );
-            returnString.append( "Version Name: " + this.getVersionName() + "\n" );
             returnString.append( "------\n" );
 
             returnString.append( "Rule state: " );

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-11-17 16:42:36 UTC (rev 7687)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulePackageItem.java	2006-11-17 17:13:17 UTC (rev 7688)
@@ -493,7 +493,6 @@
             returnString.append( "Format: " + this.getFormat() + "\n" );
             returnString.append( "Last modified: " + this.getLastModified() + "\n" );
             returnString.append( "Title: " + this.getTitle() + "\n" );
-            returnString.append( "Version Name: " + this.getVersionName() + "\n" );
             returnString.append( "----\n" );
 
             return returnString.toString();

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-11-17 16:42:36 UTC (rev 7687)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTestCase.java	2006-11-17 17:13:17 UTC (rev 7688)
@@ -86,6 +86,22 @@
         assertEquals("testLoadRuleByUUID", loaded.getName());
         assertEquals( "this is a description", loaded.getDescription());
         
+        String oldVersionNumber = loaded.getVersionNumber();
+        
+        loaded.updateRuleContent( "xxx" );
+        loaded.checkin( "woo" );
+        
+        
+        
+        
+        RuleItem reload = repo.loadRuleByUUID( uuid );
+        assertEquals("testLoadRuleByUUID", reload.getName());
+        assertEquals("xxx", reload.getRuleContent());
+        System.out.println(reload.getVersionNumber());
+        System.out.println(loaded.getVersionNumber());
+        assertFalse(reload.getVersionNumber().equals( oldVersionNumber ));
+        
+
         // try loading rule package that was not created 
         try {
             repo.loadRuleByUUID("01010101-0101-0101-0101-010101010101");