[jboss-svn-commits] JBL Code SVN: r20687 - in labs/jbossrules/trunk/drools-repository/src: test/java/org/drools/repository and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2008-06-22 20:28:21 -0400 (Sun, 22 Jun 2008)
New Revision: 20687

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
Log:
small improvements for handling file extensions and rules with a dot as part of the name

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java	2008-06-22 19:15:21 UTC (rev 20686)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java	2008-06-23 00:28:21 UTC (rev 20687)
@@ -484,7 +484,12 @@
     	boolean name = true;
     	for (int i = 0; i < cs.length; i++) {
     		if (name && cs[i] == '.') {
-    			name = false;
+    			String rhs = fileName.substring(i);
+    			if (rhs.contains("_") || rhs.contains(" ")) {
+    				r[0] = r[0] + '.'; //its part of the name
+    			} else {
+    				name = false;
+    			}
     		} else if (name) {
 				r[0] = r[0] + cs[i];
 			} else {

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2008-06-22 19:15:21 UTC (rev 20686)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2008-06-23 00:28:21 UTC (rev 20687)
@@ -97,6 +97,28 @@
     	assertEquals("foo", asset[0]);
     	assertEquals("bar.xls", asset[1]);
 
+    	asset = AssetItem.getAssetNameFromFileName("Rule 261.3 Something foo.drl");
+    	assertEquals("Rule 261.3 Something foo", asset[0]);
+    	assertEquals("drl", asset[1]);
+
+    	asset = AssetItem.getAssetNameFromFileName("Rule_261.3_Something_foo.drl");
+    	assertEquals("Rule_261.3_Something_foo", asset[0]);
+    	assertEquals("drl", asset[1]);
+
+    	asset = AssetItem.getAssetNameFromFileName("Rule 261.3 Something foo.model.drl");
+    	assertEquals("Rule 261.3 Something foo", asset[0]);
+    	assertEquals("model.drl", asset[1]);
+
+    	asset = AssetItem.getAssetNameFromFileName("Rule_261.3_Something_foo.model.drl");
+    	assertEquals("Rule_261.3_Something_foo", asset[0]);
+    	assertEquals("model.drl", asset[1]);
+
+
+//    	System.err.println(asset[0]);
+//    	System.err.println(asset[1]);
+
+
+
     }