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

[<jbo...@li...>]

Author: mic...@jb...
Date: 2006-01-17 06:59:10 -0500 (Tue, 17 Jan 2006)
New Revision: 2120

Modified:
   trunk/labs/jbossrules/drools-repository/src/main/java/org/drools/repository/RuleSetDef.java
   trunk/labs/jbossrules/drools-repository/src/test/java/org/drools/repository/IntegrationTest.java
   trunk/labs/jbossrules/drools-repository/src/test/java/org/drools/repository/RuleSetPersistenceTest.java
Log:
refactoring

Modified: trunk/labs/jbossrules/drools-repository/src/main/java/org/drools/repository/RuleSetDef.java
===================================================================
--- trunk/labs/jbossrules/drools-repository/src/main/java/org/drools/repository/RuleSetDef.java	2006-01-17 08:45:05 UTC (rev 2119)
+++ trunk/labs/jbossrules/drools-repository/src/main/java/org/drools/repository/RuleSetDef.java	2006-01-17 11:59:10 UTC (rev 2120)
@@ -53,7 +53,7 @@
         this.applicationData = new HashSet();
         this.imports = new HashSet();
         this.workingVersionNumber = 1;
-        this.versionHistory.add(new RuleSetVersionInfo(1, "New"));
+        addNewVersionHistory("new", "created");        
     }
 
     /**
@@ -97,7 +97,7 @@
     }
     
     /** Find the current working version info. */
-    public RuleSetVersionInfo getCurrentVersionInfo() {        
+    public RuleSetVersionInfo getVersionInfoWorking() {        
         for ( Iterator iter = this.versionHistory.iterator(); iter.hasNext(); ) {
             RuleSetVersionInfo info = (RuleSetVersionInfo) iter.next();
             if (info.getVersionNumber() == this.getWorkingVersionNumber()) {

Modified: trunk/labs/jbossrules/drools-repository/src/test/java/org/drools/repository/IntegrationTest.java
===================================================================
--- trunk/labs/jbossrules/drools-repository/src/test/java/org/drools/repository/IntegrationTest.java	2006-01-17 08:45:05 UTC (rev 2119)
+++ trunk/labs/jbossrules/drools-repository/src/test/java/org/drools/repository/IntegrationTest.java	2006-01-17 11:59:10 UTC (rev 2120)
@@ -26,9 +26,10 @@
      */
     public void testBootstrap() {
         runVersioningTests();
+//        runAttachmentTests();
+//        runConcurrentTests();
+//        runLocalPersistTests();
         
-        
-        
     }
 
 
@@ -59,7 +60,7 @@
         meta.setDescription("A test ruleset");
         
         RuleSetDef ruleSet = new RuleSetDef("Integration ruleset 1", meta);
-        RuleSetVersionInfo info = ruleSet.getCurrentVersionInfo();
+        RuleSetVersionInfo info = ruleSet.getVersionInfoWorking();
         info.setStatus("draft");
         
         //time to save it
@@ -72,7 +73,7 @@
         repo = RepositoryFactory.getStatefulRepository();
         assertTrue(repo.listRuleSets().size() > 0);
         ruleSet = repo.loadRuleSet("Integration ruleset 1", 1);
-        assertEquals("draft", ruleSet.getCurrentVersionInfo().getStatus());
+        assertEquals("draft", ruleSet.getVersionInfoWorking().getStatus());
         
         //now lets work "disconnected" for a while
         repo.close();
@@ -132,8 +133,8 @@
         repo = RepositoryFactory.getStatefulRepository();
         ruleSet = repo.loadRuleSet("Integration ruleset 1", 2);
         assertEquals(2, ruleSet.getVersionHistory().size());
-        assertEquals("New version", ruleSet.getCurrentVersionInfo().getVersionComment());
-        assertEquals("pending", ruleSet.getCurrentVersionInfo().getStatus());        
+        assertEquals("New version", ruleSet.getVersionInfoWorking().getVersionComment());
+        assertEquals("pending", ruleSet.getVersionInfoWorking().getStatus());        
         
         
        //lets add a rule to it (making 3 rules in total)
@@ -143,7 +144,7 @@
         //lets load up the old version, check that there is still only 2 rules
         ruleSet = repo.loadRuleSet("Integration ruleset 1", 1);
         assertEquals(2, ruleSet.getRules().size());        
-        assertEquals("draft", ruleSet.getCurrentVersionInfo().getStatus());        
+        assertEquals("draft", ruleSet.getVersionInfoWorking().getStatus());        
 
         
         repo.close();

Modified: trunk/labs/jbossrules/drools-repository/src/test/java/org/drools/repository/RuleSetPersistenceTest.java
===================================================================
--- trunk/labs/jbossrules/drools-repository/src/test/java/org/drools/repository/RuleSetPersistenceTest.java	2006-01-17 08:45:05 UTC (rev 2119)
+++ trunk/labs/jbossrules/drools-repository/src/test/java/org/drools/repository/RuleSetPersistenceTest.java	2006-01-17 11:59:10 UTC (rev 2120)
@@ -323,7 +323,7 @@
     
     public void testFindWorkingVersionInfo() {
         RuleSetDef ruleset = new RuleSetDef("nothing", null);
-        RuleSetVersionInfo info = ruleset.getCurrentVersionInfo();
+        RuleSetVersionInfo info = ruleset.getVersionInfoWorking();
         assertNotNull(info);
         assertEquals(1, info.getVersionNumber());
     }