[jboss-svn-commits] JBL Code SVN: r6862 - 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-10-17 11:53:45 -0400 (Tue, 17 Oct 2006)
New Revision: 6862

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.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/ScalabilityTest.java
Log:
some refactoring

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2006-10-17 15:31:24 UTC (rev 6861)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2006-10-17 15:53:45 UTC (rev 6862)
@@ -680,7 +680,7 @@
      * Only the latest versions of each RuleItem will be returned (you will have 
      * to delve into the rules deepest darkest history yourself... mahahahaha).
      */
-    public List findRulesByTag(String categoryTag) throws RulesRepositoryException {
+    public List findRulesByCategory(String categoryTag) throws RulesRepositoryException {
         
         CategoryItem item = this.loadCategory( categoryTag );
         List results = new ArrayList();

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-10-17 15:31:24 UTC (rev 6861)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RuleItemTestCase.java	2006-10-17 15:53:45 UTC (rev 6862)
@@ -105,7 +105,7 @@
             ruleItem1.checkin( "woot" );
             
             //now test retrieve by tags
-            List result = getRepo().findRulesByTag("testAddTagTestTag");            
+            List result = getRepo().findRulesByCategory("testAddTagTestTag");            
             assertEquals(1, result.size());            
             RuleItem retItem = (RuleItem) result.get( 0 );
             assertEquals("testAddTag", retItem.getName());
@@ -113,7 +113,7 @@
             ruleItem1.updateRuleContent( "foo" );
             ruleItem1.checkin( "latest" );
             
-            result = getRepo().findRulesByTag( "testAddTagTestTag" );
+            result = getRepo().findRulesByCategory( "testAddTagTestTag" );
             
             assertEquals(1, result.size());
 
@@ -225,9 +225,9 @@
             
             cal = Calendar.getInstance();
             long after = cal.getTimeInMillis();
-            assertTrue(before < after);
-            assertTrue(before < lastMod);
-            assertTrue(lastMod < after);
+            assertTrue(before <= after);
+            assertTrue(before <= lastMod);
+            assertTrue(lastMod <= after);
 
     }
     

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/ScalabilityTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/ScalabilityTest.java	2006-10-17 15:31:24 UTC (rev 6861)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/ScalabilityTest.java	2006-10-17 15:53:45 UTC (rev 6862)
@@ -68,20 +68,20 @@
 
     private List listACat(RulesRepository repo) {
         long start = System.currentTimeMillis();
-        List results = repo.findRulesByTag( "HR/CAT_1" );
+        List results = repo.findRulesByCategory( "HR/CAT_1" );
         System.out.println("Time for listing a cat: " + (System.currentTimeMillis() - start));
         
         start = System.currentTimeMillis();
-        List results2 = repo.findRulesByTag( "HR/CAT_1" );
+        List results2 = repo.findRulesByCategory( "HR/CAT_1" );
         System.out.println("Time for listing a cat: " + (System.currentTimeMillis() - start));
 
 
         start = System.currentTimeMillis();
-        results2 = repo.findRulesByTag( "HR/CAT_100" );
+        results2 = repo.findRulesByCategory( "HR/CAT_100" );
         System.out.println("Time for listing a cat: " + (System.currentTimeMillis() - start));
 
         start = System.currentTimeMillis();
-        results2 = repo.findRulesByTag( "HR/CAT_100" );
+        results2 = repo.findRulesByCategory( "HR/CAT_100" );
         System.out.println("Time for listing a cat: " + (System.currentTimeMillis() - start));