[jboss-svn-commits] JBL Code SVN: r23922 - labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 18 10:15:49 EST 2008
Author: jamesdeanturner
Date: 2008-11-18 10:15:48 -0500 (Tue, 18 Nov 2008)
New Revision: 23922
Modified:
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
Log:
changed to use constant from AssetFormats vs hard-code string for asset format
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java 2008-11-18 13:40:15 UTC (rev 23921)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java 2008-11-18 15:15:48 UTC (rev 23922)
@@ -46,11 +46,11 @@
String uuid1 = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
"description",
"testLoadRuleAssetWithRoleBasedAuthrozationCat1",
- "testLoadRuleAssetWithRoleBasedAuthrozation", "drl");
+ "testLoadRuleAssetWithRoleBasedAuthrozation", AssetFormats.DRL);
String uuid2 = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation2",
"description",
"testLoadRuleAssetWithRoleBasedAuthrozationCat2",
- "testLoadRuleAssetWithRoleBasedAuthrozation", "drl");
+ "testLoadRuleAssetWithRoleBasedAuthrozation", AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -101,7 +101,7 @@
String uuid1 = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
"description",
"testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat1",
- "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack1", "drl");
+ "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack1", AssetFormats.DRL);
impl.repository.createPackage(
"testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack2", "desc");
@@ -109,7 +109,7 @@
String uuid2 = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
"description",
"testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat1",
- "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack2", "drl");
+ "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack2", AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -168,7 +168,7 @@
"description",
null,
"testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryPack",
- "drl");
+ AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -217,7 +217,7 @@
String uuid = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
"description",
null,
- "testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryPackageAdminPack", "drl");
+ "testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryPackageAdminPack", AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -268,7 +268,7 @@
String uuid = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
"description",
null,
- "testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryAnalystPack", "drl");
+ "testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryAnalystPack", AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -323,7 +323,7 @@
String uuid = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
"description",
null,
- "testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryMixedPack", "drl");
+ "testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryMixedPack", AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -410,19 +410,19 @@
impl.createCategory("", category1Name, "this is a cat");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description", category1Name, package1Name, "drl");
+ "description", category1Name, package1Name, AssetFormats.DRL);
String package2Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack2";
impl.repository.createPackage(package2Name, "desc");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description", category1Name, package2Name, "drl");
+ "description", category1Name, package2Name, AssetFormats.DRL);
String package3Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationPackageReadonlyPack3";
impl.repository.createPackage(package3Name, "desc");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description", category1Name, package3Name, "drl");
+ "description", category1Name, package3Name, AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -472,19 +472,19 @@
impl.createCategory("",category1Name, "this is a cat");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description", category1Name, package1Name, "drl");
+ "description", category1Name, package1Name, AssetFormats.DRL);
String package2Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack2";
impl.repository.createPackage(package2Name, "desc");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description", category1Name, package2Name, "drl");
+ "description", category1Name, package2Name, AssetFormats.DRL);
String package3Name = "testloadRuleListForCategoriesWithRoleBasedAuthrozationAnalystPack3";
impl.repository.createPackage(package3Name, "desc");
impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
- "description", category1Name, package3Name, "drl");
+ "description", category1Name, package3Name, AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -536,7 +536,7 @@
impl.createCategory("testCheckinWithPackageReadonlyCat", "deeper", "description");
String uuid = impl.createNewRule("testChecking",
"this is a description", "testCheckinWithPackageReadonlyCat",
- "testCheckinWithPackageReadonlyPack", "drl");
+ "testCheckinWithPackageReadonlyPack", AssetFormats.DRL);
RuleAsset asset = impl.loadRuleAsset(uuid);
assertNotNull(asset.metaData.lastModifiedDate);
asset.metaData.coverage = "boo";
@@ -588,7 +588,7 @@
impl.createCategory("testCheckinWithPackageDeveloperCat", "deeper", "description");
String uuid = impl.createNewRule("testChecking",
"this is a description", "testCheckinWithPackageDeveloperCat",
- "testCheckinWithPackageDeveloperPack", "drl");
+ "testCheckinWithPackageDeveloperPack", AssetFormats.DRL);
RuleAsset asset = impl.loadRuleAsset(uuid);
assertNotNull(asset.metaData.lastModifiedDate);
asset.metaData.coverage = "boo";
@@ -640,7 +640,7 @@
String uuid3 = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
"ReadonlyFilterDescription",
"testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat3",
- package3Name, "drl");
+ package3Name, AssetFormats.DRL);
String package4Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack4";
impl.repository.createPackage(package4Name, "desc");
@@ -648,7 +648,7 @@
String uuid2 = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
"ReadonlyFilterDescription",
"testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat3",
- package4Name, "drl");
+ package4Name, AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -697,7 +697,7 @@
impl.createCategory("", category7Name, "this is a rabbit");
String uuid7 = impl.createNewRule(rule7Name,
- "MetaDataFilterDescription7", category7Name, package7Name, "drl");
+ "MetaDataFilterDescription7", category7Name, package7Name, AssetFormats.DRL);
String package8Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack8";
String category8Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat8";
@@ -705,7 +705,7 @@
String packageItem8UUID = packageItem8.getUUID();
impl.createCategory("", category8Name, "this is a mouse");
String uuid8 = impl.createNewRule(rule8Name,
- "MetaDataFilterDescription8", category8Name, package8Name, "drl");
+ "MetaDataFilterDescription8", category8Name, package8Name, AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -764,7 +764,7 @@
String packageItem5UUID = packageItem5.getUUID();
impl.createCategory("", category5Name, "this is a cat");
String uuid7 = impl.createNewRule(rule5Name,
- "MetaDataFilter2Description5", category5Name, package5Name, "drl");
+ "MetaDataFilter2Description5", category5Name, package5Name, AssetFormats.DRL);
String package6Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack6";
String category6Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat6";
@@ -772,7 +772,7 @@
String packageItem6UUID = packageItem6.getUUID();
impl.createCategory("", category6Name, "this is a dog");
String uuid6 = impl.createNewRule(rule6Name,
- "MetaDataFilter2Description6", category6Name, package6Name, "drl");
+ "MetaDataFilter2Description6", category6Name, package6Name, AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -828,7 +828,7 @@
String packageItem9UUID = packageItem9.getUUID();
impl.createCategory("", category9Name, "this is a pigeon");
String uuid9 = impl.createNewRule(rule9Name,
- "MetaDataFilter3Description9", category9Name, package9Name, "drl");
+ "MetaDataFilter3Description9", category9Name, package9Name, AssetFormats.DRL);
String package10Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack10";
String category10Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat10";
@@ -836,7 +836,7 @@
String packageItem10UUID = packageItem10.getUUID();
impl.createCategory("", category10Name, "this is a sparrow");
String uuid10 = impl.createNewRule(rule10Name,
- "MetaDataFilter3Description10", category10Name, package10Name, "drl");
+ "MetaDataFilter3Description10", category10Name, package10Name, AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
@@ -892,7 +892,7 @@
String packageItem11UUID = packageItem11.getUUID();
impl.createCategory("", category11Name, "this is a dock");
String uuid11 = impl.createNewRule(rule11Name,
- "DisplayHandlerDescription11", category11Name, package11Name, "drl");
+ "DisplayHandlerDescription11", category11Name, package11Name, AssetFormats.DRL);
String package12Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack12";
String category12Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat12";
@@ -900,7 +900,7 @@
String packageItem12UUID = packageItem12.getUUID();
impl.createCategory("", category12Name, "this is a sparrow");
String uuid12 = impl.createNewRule(rule12Name,
- "DisplayHandlerDescription12", category12Name, package12Name, "drl");
+ "DisplayHandlerDescription12", category12Name, package12Name, AssetFormats.DRL);
// Mock up SEAM contexts
Map application = new HashMap<String, Object>();
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 2008-11-18 13:40:15 UTC (rev 23921)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java 2008-11-18 15:15:48 UTC (rev 23922)
@@ -299,7 +299,7 @@
impl.createCategory("", "testLoadRuleAsset", "this is a cat");
impl.createNewRule("testLoadRuleAsset", "description",
- "testLoadRuleAsset", "testLoadRuleAsset", "drl");
+ "testLoadRuleAsset", "testLoadRuleAsset", AssetFormats.DRL);
TableDataResult res = impl
.loadRuleListForCategories("testLoadRuleAsset", 0, -1, AssetItemGrid.RULE_LIST_TABLE_ID);
@@ -323,7 +323,7 @@
assertEquals("testLoadRuleAsset", asset.metaData.name);
assertEquals("testLoadRuleAsset", asset.metaData.title);
assertEquals("testLoadRuleAsset", asset.metaData.packageName);
- assertEquals("drl", asset.metaData.format);
+ assertEquals(AssetFormats.DRL, asset.metaData.format);
assertNotNull(asset.metaData.createdDate);
assertEquals(1, asset.metaData.categories.length);
@@ -350,6 +350,10 @@
AssetFormats.DSL_TEMPLATE_RULE);
asset = impl.loadRuleAsset(uuid);
assertTrue(asset.content instanceof RuleContentText);
+
+
+ //asset
+
}
public void testLoadAssetHistoryAndRestore() throws Exception {
@@ -358,7 +362,7 @@
impl.createCategory("", "testLoadAssetHistory", "this is a cat");
String uuid = impl.createNewRule("testLoadAssetHistory", "description",
- "testLoadAssetHistory", "testLoadAssetHistory", "drl");
+ "testLoadAssetHistory", "testLoadAssetHistory", AssetFormats.DRL);
RuleAsset asset = impl.loadRuleAsset(uuid);
impl.checkinVersion(asset); // 1
asset = impl.loadRuleAsset(uuid);
@@ -405,7 +409,7 @@
String uuid = serv.createNewRule("testChecking",
"this is a description", "testCheckinCategory",
- RulesRepository.DEFAULT_PACKAGE, "drl");
+ RulesRepository.DEFAULT_PACKAGE, AssetFormats.DRL);
RuleAsset asset = serv.loadRuleAsset(uuid);
@@ -667,7 +671,7 @@
ServiceImplementation impl = getService();
PackageItem pkg = impl.repository.createPackage("testListUnregisteredAssetFormats", "");
AssetItem as = pkg.addAsset("whee", "");
- as.updateFormat("drl");
+ as.updateFormat(AssetFormats.DRL);
as.checkin("");
as = pkg.addAsset("whee2", "");
@@ -685,11 +689,11 @@
impl.createCategory("/", cat, "qkfnd");
impl.createPackage("testQuickFind",
"for testing quick find.");
- String uuid = impl.createNewRule("testQuickFindmyRule1", "desc", cat, "testQuickFind", "drl");
+ String uuid = impl.createNewRule("testQuickFindmyRule1", "desc", cat, "testQuickFind", AssetFormats.DRL);
TableDataResult res = impl.quickFindAsset("testQuickFindmyRule", 20, false);
assertEquals(1, res.data.length);
- impl.createNewRule("testQuickFindmyRule2", "desc", cat, "testQuickFind", "drl");
+ impl.createNewRule("testQuickFindmyRule2", "desc", cat, "testQuickFind", AssetFormats.DRL);
res = impl.quickFindAsset("testQuickFindmyRule", 20, false);
assertEquals(2, res.data.length);
@@ -707,7 +711,7 @@
impl.createCategory("/", cat, "qkfnd");
impl.createPackage("testTextSearch",
"for testing search.");
- String uuid = impl.createNewRule("testTextRule1", "desc", cat, "testTextSearch", "drl");
+ String uuid = impl.createNewRule("testTextRule1", "desc", cat, "testTextSearch", AssetFormats.DRL);
TableDataResult res = impl.queryFullText("testTextRule1", false, 0, -1);
assertEquals(1, res.data.length);
}
@@ -763,9 +767,9 @@
String packagUUID = impl.createPackage("testStatus", "description");
String ruleUUID = impl.createNewRule("testStatus", "desc", null,
- "testStatus", "drl");
+ "testStatus", AssetFormats.DRL);
String ruleUUID2 = impl.createNewRule("testStatus2", "desc", null,
- "testStatus", "drl");
+ "testStatus", AssetFormats.DRL);
impl.createState("testState");
RuleAsset asset = impl.loadRuleAsset(ruleUUID);
@@ -803,7 +807,7 @@
String cat = impl.loadChildCategories("/")[0];
String uuid = impl.createNewRule("testMovePackage", "desc", cat,
- "sourcePackage", "drl");
+ "sourcePackage", AssetFormats.DRL);
TableDataResult res = impl.listAssets(destPkgId,
new String[] { "drl" }, 0, 2, AssetItemGrid.RULE_LIST_TABLE_ID);
@@ -824,7 +828,7 @@
RepositoryService impl = getService();
impl.createCategory("/", "templates", "ya");
String uuid = impl.createNewRule("testCopyAsset", "", "templates",
- RulesRepository.DEFAULT_PACKAGE, "drl");
+ RulesRepository.DEFAULT_PACKAGE, AssetFormats.DRL);
String uuid2 = impl.copyAsset(uuid, RulesRepository.DEFAULT_PACKAGE,
"testCopyAsset2");
assertNotSame(uuid, uuid2);
@@ -841,7 +845,7 @@
impl.createCategory("/", "snapshotTesting", "y");
impl.createPackage("testSnapshot", "d");
String uuid = impl.createNewRule("testSnapshotRule", "",
- "snapshotTesting", "testSnapshot", "drl");
+ "snapshotTesting", "testSnapshot", AssetFormats.DRL);
impl.createPackageSnapshot("testSnapshot", "X", false, "ya");
SnapshotInfo[] snaps = impl.listSnapshots("testSnapshot");
More information about the jboss-svn-commits
mailing list