[jboss-svn-commits] JBL Code SVN: r35162 - in labs/jbossrules/trunk/drools-guvnor/src: main/java/org/drools/guvnor/server and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Sep 16 05:50:55 EDT 2010
Author: jervisliu
Date: 2010-09-16 05:50:55 -0400 (Thu, 16 Sep 2010)
New Revision: 35162
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
Log:
GUVNOR-632: Asset position displayed by Next/Previous button is not correct in "Knowledge Bases -> Packages -> defaultPackage -> Business Rule Assets"
GUVNOR-631: Administration -> Archive shows only 40 items
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java 2010-09-16 08:23:26 UTC (rev 35161)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java 2010-09-16 09:50:55 UTC (rev 35162)
@@ -367,7 +367,8 @@
public void onClick(Button button,
EventObject e) {
if ( forward ) {
- int newPos = currentCursorPosition - 2;
+ //int newPos = currentCursorPosition - 2;
+ int newPos = currentCursorPosition;
if ( newPos > 0 ) {
cursorPositions.push( newPos );
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-09-16 08:23:26 UTC (rev 35161)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-09-16 09:50:55 UTC (rev 35162)
@@ -895,7 +895,10 @@
TableDataResult table = new TableDataResult();
table.data = result.toArray( new TableDataRow[result.size()] );
- table.currentPosition = it.getPosition();
+ table.currentPosition = it.getPosition();
+ table.total = it.getSize();
+ table.hasNext = it.hasNext();
+
return table;
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java 2010-09-16 08:23:26 UTC (rev 35161)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java 2010-09-16 09:50:55 UTC (rev 35162)
@@ -739,7 +739,121 @@
asset = impl.loadRuleAsset( uuid );
assertTrue( asset.content instanceof RuleContentText );
}
+
+ public void testListAssets() throws Exception {
+ ServiceImplementation impl = getService();
+ PackageItem pacakgeItem = impl.repository.createPackage("testListAssetsPackage",
+ "desc");
+ impl.createCategory("",
+ "testListAssetsCat",
+ "this is a cat");
+ String uuid1 = impl.createNewRule("testLoadArchivedAssets1",
+ "description",
+ "testListAssetsCat",
+ "testListAssetsPackage",
+ AssetFormats.BUSINESS_RULE);
+
+ String uuid2 = impl.createNewRule("testLoadArchivedAssets2",
+ "description",
+ "testListAssetsCat",
+ "testListAssetsPackage",
+ AssetFormats.BUSINESS_RULE);
+
+ String uuid3 = impl.createNewRule("testLoadArchivedAssets3",
+ "description",
+ "testListAssetsCat",
+ "testListAssetsPackage",
+ AssetFormats.BUSINESS_RULE);
+
+ String uuid4 = impl.createNewRule("testLoadArchivedAssets4",
+ "description",
+ "testListAssetsCat",
+ "testListAssetsPackage",
+ AssetFormats.BUSINESS_RULE);
+
+ String uuid5 = impl.createNewRule("testLoadArchivedAssets5",
+ "description",
+ "testListAssetsCat",
+ "testListAssetsPackage",
+ AssetFormats.BUSINESS_RULE);
+
+
+ TableDataResult res = impl.listAssets(pacakgeItem.getUUID(), new String[]{AssetFormats.BUSINESS_RULE}, 0, 2, AssetItemGrid.PACKAGEVIEW_LIST_TABLE_ID);
+
+ assertEquals(2, res.data.length);
+ assertTrue(5 == res.total);
+ assertTrue(res.currentPosition == 2);
+ assertTrue(res.hasNext);
+
+ res = impl.listAssets(pacakgeItem.getUUID(), new String[]{AssetFormats.BUSINESS_RULE}, 2, 2, AssetItemGrid.PACKAGEVIEW_LIST_TABLE_ID);
+ assertEquals(2, res.data.length);
+ assertTrue(5 == res.total);
+ assertTrue(res.currentPosition == 4);
+ assertTrue(res.hasNext);
+ }
+
+ public void testLoadArchivedAssets() throws Exception {
+ ServiceImplementation impl = getService();
+ impl.repository.createPackage("testLoadArchivedAssetsPackage",
+ "desc");
+ impl.createCategory("",
+ "testLoadArchivedAssetsCat",
+ "this is a cat");
+
+ String uuid1 = impl.createNewRule("testLoadArchivedAssets1",
+ "description",
+ "testLoadArchivedAssetsCat",
+ "testLoadArchivedAssetsPackage",
+ AssetFormats.DRL);
+ impl.archiveAsset(uuid1);
+
+ String uuid2 = impl.createNewRule("testLoadArchivedAssets2",
+ "description",
+ "testLoadArchivedAssetsCat",
+ "testLoadArchivedAssetsPackage",
+ AssetFormats.DRL);
+ impl.archiveAsset(uuid2);
+
+ String uuid3 = impl.createNewRule("testLoadArchivedAssets3",
+ "description",
+ "testLoadArchivedAssetsCat",
+ "testLoadArchivedAssetsPackage",
+ AssetFormats.DRL);
+ impl.archiveAsset(uuid3);
+
+ String uuid4 = impl.createNewRule("testLoadArchivedAssets4",
+ "description",
+ "testLoadArchivedAssetsCat",
+ "testLoadArchivedAssetsPackage",
+ AssetFormats.DRL);
+ impl.archiveAsset(uuid4);
+
+ String uuid5 = impl.createNewRule("testLoadArchivedAssets5",
+ "description",
+ "testLoadArchivedAssetsCat",
+ "testLoadArchivedAssetsPackage",
+ AssetFormats.DRL);
+ impl.archiveAsset(uuid5);
+
+ //We do not know how many archived assets we have in the test repo,
+ //but definitely more than 5 (as we just created 5)
+ TableDataResult res = impl.loadArchivedAssets(0, 2);
+
+ assertEquals(2, res.data.length);
+ //may return -1 as per JCR2.0 when precise count is not available due to performance reasons.
+ //assertTrue(-1 != res.total);
+ assertTrue(res.currentPosition == 2);
+ assertTrue(res.hasNext);
+
+ res = impl.loadArchivedAssets(2, 2);
+
+ assertEquals(2, res.data.length);
+ //assertTrue(-1 != res.total);
+ assertEquals(res.currentPosition, 4);
+ assertTrue(res.hasNext);
+ }
+
public void testTrackRecentOpenedChanged() throws Exception {
ServiceImplementation impl = getService();
UserInbox ib = new UserInbox( impl.repository );
@@ -3551,7 +3665,58 @@
assertEquals( null,
res.result );
}
+
+ //GUVNOR-296
+ public void IGNORE_testHistoryAfterReImportSampleRepository() throws Exception {
+ ServiceImplementation impl = getService();
+
+ //Import sample, do a sanity check, make sure sample is installed correctly
+ impl.installSampleRepository();
+ PackageConfigData[] cfgs = impl.listPackages();
+ assertEquals(2, cfgs.length);
+ assertTrue( cfgs[0].name.equals("mortgages") || cfgs[1].name.equals("mortgages"));
+
+ TableDataResult res = impl.quickFindAsset("Bankruptcy history", false, 0, 20);
+ assertEquals(1, res.data.length);
+ String uuid = res.data[0].id;
+ // create version 4.
+ RuleAsset ai = impl.loadRuleAsset(uuid);
+ ai.metaData.checkinComment = "version 4";
+ impl.checkinVersion(ai);
+
+ // create version 5.
+ ai = impl.loadRuleAsset(uuid);
+ ai.metaData.checkinComment = "version 5";
+ impl.checkinVersion(ai);
+
+ System.out.println("old uuid: " + uuid);
+
+ //NOTE: Have not figured out the reason, but if we dont create a random package here,
+ //we will get an InvalidItemStateException during impl.installSampleRepository()
+ impl.repository.createPackage( "testHistoryAfterReImportSampleRepository", "desc" );
+
+ TableDataResult result = impl.loadAssetHistory(uuid);
+ assertNotNull(result);
+ TableDataRow[] rows = result.data;
+ assertEquals(1, rows.length);
+
+ //Import sample again
+ impl.installSampleRepository();
+ res = impl.quickFindAsset("Bankruptcy history", false,
+ 0, 20);
+ assertEquals(1, res.data.length);
+ String newUuid = res.data[0].id;
+
+ //Now verify history, should be zero.
+ result = impl.loadAssetHistory(newUuid);
+ System.out.println("new uuid: " + newUuid);
+
+ assertNotNull(result);
+ rows = result.data;
+ assertEquals(1, rows.length);
+ }
+
public void testAddCategories() throws Exception {
ServiceImplementation impl = getService();
impl.repository.createPackage( "testAddCategoriesPackage",
More information about the jboss-svn-commits
mailing list