[jboss-svn-commits] JBL Code SVN: r35624 - in labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src: main/java/org/drools/guvnor/client/modeldriven/ui and 28 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 20 23:27:19 EDT 2010
Author: kurt.stam at jboss.com
Date: 2010-10-20 23:27:14 -0400 (Wed, 20 Oct 2010)
New Revision: 35624
Added:
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/resources/drools_repository.properties
Modified:
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/table/RowData.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MailboxService.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/resources/log4j.xml
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/CollectionsTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/AsyncInterfaceTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/decisiontable/DecisionTableHandlerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/ExplorerLayoutManagerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditorTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/testscenarios/ScenarioHelperTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/BulkTestRunResultTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rulelist/TableDataRowTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/BackchannelTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/CategoryFilterTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServletWrapperTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/VerificationServiceImplementationTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/FeedServletTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MailboxServiceTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepositoryConfigurator.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RepositoryStartupServiceTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/UserInboxTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockIdentity.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/NilAuthenticatorTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleTypesTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/BuiltInSelectorTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/AssetFormatHelperTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/AssetLockManagerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/DiscussionTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/ide/common/server/rules/BRMSSuggestionCompletionLoaderTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/resources/RepoBinPackage.pkg
Log:
BRMS-403, converting the guvnor code and tests over to use the jcr-api. Most of the work is around making each individual tests start and stop the repository
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -35,6 +35,8 @@
import org.drools.guvnor.client.ruleeditor.SaveEventListener;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
@@ -276,15 +278,15 @@
}
final Button addNewFact = new Button( constants.AddNewFactType() );
- addNewFact.addClickListener( new ClickListener() {
- public void onClick(Widget w) {
+ addNewFact.addClickHandler( new ClickHandler() {
+ public void onClick(ClickEvent event) {
String type = Window.prompt( constants.NewType(),
constants.EnterNewTypeName() );
if ( type != null ) {
if ( uniqueName( type,
m.models ) ) {
m.models.add( new FactMetaModel( type,
- new ArrayList() ) );
+ new ArrayList<FieldMetaModel>() ) );
editingFact = m.models.size() - 1;
renderEditor();
} else {
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -68,7 +68,7 @@
private static final String ENUM_TAG = "ENUM";
private static final String DATE_TAG = "DATE";
private static final String BOOLEAN_TAG = "BOOLEAN";
- private final List widgets;
+ private final List<Widget> widgets;
private final DSLSentence sentence;
private final VerticalPanel layout;
private HorizontalPanel currentRow;
@@ -80,7 +80,7 @@
public DSLSentenceWidget(RuleModeller modeller, DSLSentence sentence, Boolean readOnly) {
super (modeller);
- widgets = new ArrayList();
+ widgets = new ArrayList<Widget>();
this.sentence = sentence;
if (readOnly == null){
@@ -263,8 +263,8 @@
*/
protected void updateSentence() {
String newSentence = "";
- for ( Iterator iter = widgets.iterator(); iter.hasNext(); ) {
- Widget wid = (Widget) iter.next();
+ for ( Iterator<Widget> iter = widgets.iterator(); iter.hasNext(); ) {
+ Widget wid = iter.next();
if ( wid instanceof Label ) {
newSentence = newSentence + ((Label) wid).getText();
} else if ( wid instanceof FieldEditor ) {
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -52,6 +52,8 @@
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
import com.google.gwt.user.client.Window;
@@ -599,7 +601,7 @@
final VerticalPanel vert = new VerticalPanel();
form.addAttribute( constants.ChooseOrCreateSnapshotName(),
vert );
- final List radioList = new ArrayList();
+ final List<RadioButton> radioList = new ArrayList<RadioButton>();
final TextBox newName = new TextBox();
final String newSnapshotText = constants.NEW() + ": ";
@@ -618,9 +620,9 @@
newSnapshotText ); //NON-NLS
newSnap.add( newSnapRadio );
newName.setEnabled( false );
- newSnapRadio.addClickListener( new ClickListener() {
+ newSnapRadio.addClickHandler( new ClickHandler() {
- public void onClick(Widget w) {
+ public void onClick(ClickEvent event) {
newName.setEnabled( true );
}
@@ -647,8 +649,8 @@
public void onClick(Widget w) {
boolean replace = false;
- for ( Iterator iter = radioList.iterator(); iter.hasNext(); ) {
- RadioButton but = (RadioButton) iter.next();
+ for ( Iterator<RadioButton> iter = radioList.iterator(); iter.hasNext(); ) {
+ RadioButton but = iter.next();
if ( but.isChecked() ) {
name = but.getText();
if ( !but.getText().equals( newSnapshotText ) ) {
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -283,23 +283,23 @@
private void doGlobals(Types t) {
globalList.clear();
- for (Iterator it = t.globals.iterator(); it.hasNext();) {
- Global g = (Global) it.next();
+ for (Iterator<Global> it = t.globals.iterator(); it.hasNext();) {
+ Global g = it.next();
globalList.addItem(g.type + " [" + g.name + "]");
}
}
private void doImports(Types t) {
importList.clear();
- for (Iterator it = t.imports.iterator(); it.hasNext();) {
- Import i = (Import) it.next();
+ for (Iterator<Import> it = t.imports.iterator(); it.hasNext();) {
+ Import i = it.next();
importList.addItem(i.type);
}
}
static class Types {
- List imports = new ArrayList();
- List globals = new ArrayList();
+ List<Import> imports = new ArrayList<Import>();
+ List<Global> globals = new ArrayList<Global>();
}
static class Import {
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -48,6 +48,7 @@
import com.google.gwt.user.client.ui.*;
import com.google.gwt.user.client.ui.SuggestOracle.Callback;
import com.google.gwt.user.client.ui.SuggestOracle.Request;
+import com.google.gwt.user.client.ui.SuggestOracle.Suggestion;
import com.google.gwt.user.client.Command;
import com.google.gwt.core.client.GWT;
@@ -206,7 +207,7 @@
RepositoryServiceFactory.getService().quickFindAsset( match, archiveBox.isChecked() ,0, 5, new GenericCallback<TableDataResult>() {
public void onSuccess(TableDataResult result) {
- List items = new ArrayList();
+ List<Suggestion> items = new ArrayList<Suggestion>();
for ( int i = 0; i < result.data.length; i++ ) {
if (!result.data[i].id.equals( "MORE" )) { //NON-NLS
final String str = result.data[i].values[0];
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/table/RowData.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/table/RowData.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/client/table/RowData.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -39,7 +39,7 @@
/** This is used to hold the data for sorting in a grid */
public class RowData implements Comparable {
- List columnValues = new ArrayList();
+ List<Comparable> columnValues = new ArrayList<Comparable>();
int sortColIndex = 0;
public void addColumnValue(Comparable value){
@@ -57,11 +57,11 @@
return this.columnValues.get(index);
}
- public List getColumnValues() {
+ public List<Comparable> getColumnValues() {
return columnValues;
}
- public void setColumnValues(List columnValues) {
+ public void setColumnValues(List<Comparable> columnValues) {
this.columnValues = columnValues;
}
@@ -78,7 +78,7 @@
return -1;
}
RowData otherRow = (RowData)other;
- Comparable obj1 = (Comparable)this.getColumnValue(this.sortColIndex);
+ Comparable<Comparable> obj1 = (Comparable<Comparable>)this.getColumnValue(this.sortColIndex);
Comparable obj2 = (Comparable)otherRow.getColumnValue(this.sortColIndex);
return obj1.compareTo(obj2);
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MailboxService.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MailboxService.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MailboxService.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -21,6 +21,7 @@
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
import org.drools.guvnor.server.util.LoggingHelper;
import org.drools.repository.AssetItem;
@@ -36,37 +37,56 @@
*/
public class MailboxService {
- private static final LoggingHelper log = LoggingHelper.getLogger( MailboxService.class );
- public static final String MAILMAN = "mailman";
- private static ExecutorService executor = Executors.newSingleThreadExecutor();
-
- private static MailboxService INSTANCE = new MailboxService();
-
-
- public static MailboxService getInstance() { return INSTANCE; }
-
+ private static final LoggingHelper log = LoggingHelper.getLogger( MailboxService.class );
+ public static final String MAILMAN = "mailman";
+ private static ExecutorService executor = null;
+ private static MailboxService INSTANCE = null;
/**
* Should be the for the "mailman" user.
*/
private RulesRepository repository;
+ public static MailboxService getInstance() {
+ if (INSTANCE==null) {
+ INSTANCE = new MailboxService();
+ executor = Executors.newSingleThreadExecutor();
+ }
+ return INSTANCE;
+ }
-
private MailboxService() {}
- MailboxService(RulesRepository systemRepo) {
- init(systemRepo);
- }
-
public void init(RulesRepository systemRepo) {
log.info("Starting mailbox service");
- this.repository = systemRepo;
+ this.repository = systemRepo;
+ log.info("mailbox service is up");
}
+
+ public void stop() {
+ log.info("Shutting down mailbox service");
+ executor.shutdown();
+
+ try {
+ System.out.println("IS DOWN: " + executor.isTerminated());
+ if (!executor.awaitTermination(10, TimeUnit.SECONDS)) {
+ executor.shutdownNow();
+ System.out.println("IS DOWN2: " + executor.isTerminated());
+ if (!executor.awaitTermination(10, TimeUnit.SECONDS)) {
+ System.err.println("executor did not terminate");
+ }
+ }
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ executor.shutdownNow();
+ Thread.currentThread().interrupt();
+ }
+ INSTANCE=null;
+ log.info("Mailbox service is shutdown.");
+
+ }
-
-
public void wakeUp() {
- log.info("Waking up");
+ log.debug("Waking up");
executor.execute(new Runnable() {
public void run() {
processOutgoing();
@@ -76,7 +96,7 @@
/** Process any waiting messages */
void processOutgoing() {
- log.info("Processing outgoing messages");
+ //log.info("Processing outgoing messages");
if (repository != null) {
UserInbox mailman = new UserInbox(repository, MAILMAN);
final List<UserInfo.InboxEntry> es = mailman.loadIncoming();
@@ -122,12 +142,14 @@
final String from = item.getRulesRepository().getSession().getUserID();
executor.execute(new Runnable() {
public void run() {
- // write the message to the admins outbox
- UserInbox inbox = new UserInbox(repository, MAILMAN);
- inbox.addToIncoming(id, name, from);
- processOutgoing();
-
- repository.save();
+ if (repository!=null) {
+ // write the message to the admins outbox
+ UserInbox inbox = new UserInbox(repository, MAILMAN);
+ inbox.addToIncoming(id, name, from);
+ processOutgoing();
+
+ repository.save();
+ }
}
});
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -33,6 +33,8 @@
+import java.util.Properties;
+
import javax.jcr.LoginException;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
@@ -59,16 +61,27 @@
@Name("repositoryConfiguration")
public class RepositoryStartupService {
- JCRRepositoryConfigurator configurator = new JackrabbitRepositoryConfigurator();
- String repositoryHomeDirectory = null;
+ private RulesRepositoryConfigurator configurator;
+ Properties properties = new Properties();
Repository repository;
private Session sessionForSetup;
private RulesRepository mailmanSession;
+ public Repository getRepositoryInstance() {
+ try {
+ configurator = RulesRepositoryConfigurator.getInstance(properties);
+ repository = configurator.getJCRRepository();
+ } catch (RepositoryException e) {
+ // TODO Kurt Auto-generated catch block
+ e.printStackTrace();
+ }
+ return repository;
+ }
+
@Create
public void create() {
- repository = configurator.getJCRRepository( repositoryHomeDirectory );
+ repository = getRepositoryInstance();
sessionForSetup = newSession("admin");
create( sessionForSetup );
startMailboxService();
@@ -78,6 +91,7 @@
/** Listen for changes to the repository - for inbox purposes */
public static void registerCheckinListener() {
+ System.out.println("Registering check-in listener");
StorageEventManager.registerCheckinEvent(new CheckinEvent() {
public void afterCheckin(AssetItem item) {
UserInbox.recordUserEditEvent(item); //to register that she edited...
@@ -85,6 +99,7 @@
MailboxService.getInstance().wakeUp();
}
});
+ System.out.println("Check-in listener up");
}
/** Start up the mailbox, flush out any messages that were left */
@@ -101,7 +116,12 @@
RulesRepositoryAdministrator admin = new RulesRepositoryAdministrator(sessionForSetup);
if (!admin.isRepositoryInitialized()) {
- configurator.setupRulesRepository( sessionForSetup );
+ try {
+ configurator.setupRepository( sessionForSetup );
+ } catch (RepositoryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
//
@@ -127,17 +147,22 @@
@Destroy
public void close() {
sessionForSetup.logout();
+ MailboxService.getInstance().stop();
mailmanSession.logout();
+
}
public void setHomeDirectory(String home) {
- this.repositoryHomeDirectory = home;
+ if (home!=null) {
+ properties.setProperty(JCRRepositoryConfigurator.REPOSITORY_ROOT_DIRECTORY, home);
+ }
}
public void setRepositoryConfigurator(String clazz) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
- Class cls = Class.forName( clazz );
- this.configurator = (JCRRepositoryConfigurator) cls.newInstance();
+ if (clazz!=null) {
+ properties.setProperty(RulesRepositoryConfigurator.CONFIGURATOR_CLASS, clazz);
+ }
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -36,6 +36,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintWriter;
+import java.util.Properties;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
@@ -43,9 +44,9 @@
import javax.jcr.SimpleCredentials;
import org.drools.repository.JCRRepositoryConfigurator;
-import org.drools.repository.JackrabbitRepositoryConfigurator;
import org.drools.repository.RepositorySessionUtil;
import org.drools.repository.RulesRepositoryAdministrator;
+import org.drools.repository.RulesRepositoryConfigurator;
/**
* This is only to be used for testing, eg in hosted mode, or unit tests.
@@ -74,9 +75,13 @@
System.out.println("TEST repo dir deleted.");
}
- JCRRepositoryConfigurator config = new JackrabbitRepositoryConfigurator();
+ RulesRepositoryConfigurator config = RulesRepositoryConfigurator.getInstance(null);
String home = System.getProperty("guvnor.repository.dir");
- repository = config.getJCRRepository(home);
+ Properties properties = new Properties();
+ if (home!=null) {
+ properties.setProperty(JCRRepositoryConfigurator.REPOSITORY_ROOT_DIRECTORY, home);
+ }
+ repository = config.getJCRRepository();
Session testSession = repository.login(new SimpleCredentials("alan_parsons", "password".toCharArray()));
@@ -84,7 +89,7 @@
if (erase && admin.isRepositoryInitialized()) {
admin.clearRulesRepository( );
}
- config.setupRulesRepository( testSession );
+ config.setupRepository( testSession );
File file = File.createTempFile( "pete", "txt" );
file.deleteOnExit();
PrintWriter out = new PrintWriter(new FileOutputStream(file));
@@ -145,6 +150,12 @@
new SimpleCredentials(userName, "password".toCharArray()));
}
+
+ public static void shutdown() throws RepositoryException {
+ RulesRepositoryConfigurator.getInstance(null).shutdown();
+
+ repository = null;
+ }
Added: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/resources/drools_repository.properties
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/resources/drools_repository.properties (rev 0)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/resources/drools_repository.properties 2010-10-21 03:27:14 UTC (rev 35624)
@@ -0,0 +1,16 @@
+# This file is used to load the properties passed to the JCR 2.0 RepositoryFactory.
+#
+#
+# JACKRABBIT
+org.drools.repository.configurator = org.drools.repository.jackrabbit.JackrabbitRepositoryConfigurator
+#
+org.drools.repository.jcr.impl = org.apache.jackrabbit.core.RepositoryFactoryImpl
+#
+
+# MODESHAPE
+
+# Currently, these properties will be used to load ModeShape from the specified configuration file.
+#
+#org.drools.repository.configurator = org.drools.repository.modeshape.ModeShapeRepositoryConfigurator
+#
+#org.modeshape.jcr.URL = file:src/test/resources/modeshape/configuration.xml
\ No newline at end of file
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/resources/log4j.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/resources/log4j.xml 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/resources/log4j.xml 2010-10-21 03:27:14 UTC (rev 35624)
@@ -18,7 +18,7 @@
</layout>
</appender>
<logger name="org.drools">
- <level value="DEBUG"/>
+ <level value="INFO"/>
</logger>
<root>
<priority value="ERROR"/>
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/CollectionsTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/CollectionsTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/CollectionsTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -24,17 +24,20 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+public class CollectionsTest {
-public class CollectionsTest extends TestCase {
-
+ @Test
public void testList() {
List<String> ls = List("a", "b", "c");
assertEquals(3, ls.size());
assertEquals("b", ls.get(1));
}
+ @SuppressWarnings("unchecked")
+ @Test
public void testMap() {
println("this is less verbose");
Map<String, String> mp = Map(
@@ -44,7 +47,6 @@
assertEquals("michael", mp.get("name"));
assertEquals("42", mp.get("age"));
-
}
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/AsyncInterfaceTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/AsyncInterfaceTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/AsyncInterfaceTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -33,14 +33,16 @@
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
import java.lang.reflect.Method;
-import junit.framework.TestCase;
-
import org.drools.guvnor.client.rpc.RepositoryService;
import org.drools.guvnor.client.rpc.RepositoryServiceAsync;
import org.drools.guvnor.client.rpc.SecurityService;
import org.drools.guvnor.client.rpc.SecurityServiceAsync;
+import org.junit.Test;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -49,8 +51,9 @@
* This will verify that the interfaces are kosher for GWT to use.
* @author Michael Neale
*/
-public class AsyncInterfaceTest extends TestCase {
+public class AsyncInterfaceTest {
+ @Test
public void testService() throws Exception {
try {
checkService( RepositoryService.class, RepositoryServiceAsync.class );
@@ -61,11 +64,11 @@
}
- private void checkService(Class clsInt, Class clsAsync) throws NoSuchMethodException {
+ private void checkService(Class<?> clsInt, Class<?> clsAsync) throws NoSuchMethodException {
for ( Method m : clsInt.getMethods()) {
- Class[] paramClasses = new Class[m.getParameterTypes().length + 1];
- Class[] sourceParamClasses = m.getParameterTypes();
+ Class<?>[] paramClasses = new Class[m.getParameterTypes().length + 1];
+ Class<?>[] sourceParamClasses = m.getParameterTypes();
for ( int i = 0; i < sourceParamClasses.length; i++ ) {
paramClasses[i] = sourceParamClasses[i];
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -33,11 +33,15 @@
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-public class AssetFormatsTest extends TestCase {
+import org.junit.Test;
+public class AssetFormatsTest {
+ @Test
public void testGrouping() {
String[] formats = AssetFormats.BUSINESS_RULE_FORMATS;
for ( int i = 0; i < formats.length; i++ ) {
@@ -57,6 +61,7 @@
}
}
+ @Test
public void testPackageDependencies() {
assertFalse(AssetFormats.isPackageDependency(AssetFormats.BUSINESS_RULE));
assertFalse(AssetFormats.isPackageDependency(AssetFormats.DRL));
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/decisiontable/DecisionTableHandlerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/decisiontable/DecisionTableHandlerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/decisiontable/DecisionTableHandlerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -18,16 +18,17 @@
import java.util.List;
+import junit.framework.Assert;
+
import org.drools.ide.common.client.modeldriven.dt.ActionCol;
import org.drools.ide.common.client.modeldriven.dt.AttributeCol;
import org.drools.ide.common.client.modeldriven.dt.ConditionCol;
import org.drools.ide.common.client.modeldriven.dt.GuidedDecisionTable;
+import org.junit.Test;
-import junit.framework.Assert;
-import junit.framework.TestCase;
+public class DecisionTableHandlerTest {
-public class DecisionTableHandlerTest extends TestCase {
-
+ @Test
public void testMoveAttribute() {
GuidedDecisionTable dt = new GuidedDecisionTable();
@@ -97,6 +98,7 @@
}
+ @Test
public void testMoveCondition() {
GuidedDecisionTable dt = new GuidedDecisionTable();
@@ -168,6 +170,7 @@
}
+ @Test
public void testMoveAction() {
GuidedDecisionTable dt = new GuidedDecisionTable();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/ExplorerLayoutManagerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/ExplorerLayoutManagerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/ExplorerLayoutManagerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,16 +16,22 @@
package org.drools.guvnor.client.explorer;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import org.junit.Test;
/**
* @author Michael Neale
*/
- at SuppressWarnings({"NonJREEmulationClassesInClientCode"})
-public class ExplorerLayoutManagerTest extends TestCase {
+
+public class ExplorerLayoutManagerTest {
+
+ @Test
public void testHistoryToken() {
ExplorerLayoutManager.BookmarkInfo bi = ExplorerLayoutManager.handleHistoryToken("");
assertNotNull(bi);
@@ -43,8 +49,5 @@
assertFalse(bi.showChrome);
assertEquals("123", bi.assetId);
-
-
-
}
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,13 +16,17 @@
package org.drools.guvnor.client.explorer;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import org.drools.guvnor.client.explorer.PackageHierarchy.Folder;
import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.junit.Test;
-public class PackageHierarchyTest extends TestCase {
+public class PackageHierarchyTest {
+ @Test
public void testSimple() {
PackageHierarchy h = new PackageHierarchy();
h.addPackage(new PackageConfigData("com.foo"));
@@ -77,6 +81,7 @@
}
+ @Test
public void testComplex() {
PackageHierarchy h = new PackageHierarchy();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditorTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditorTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditorTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -17,11 +17,13 @@
package org.drools.guvnor.client.modeldriven.ui;
import org.drools.ide.common.client.modeldriven.ui.ConstraintValueEditorHelper;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
-public class ConstraintValueEditorTest extends TestCase {
+public class ConstraintValueEditorTest {
+ @Test
public void testSplit() {
String[] res = ConstraintValueEditorHelper.splitValue( "M=Male" );
assertEquals( "M",
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,10 +16,14 @@
package org.drools.guvnor.client.packages;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-public class NewPackageWizardTest extends TestCase {
+import org.junit.Test;
+public class NewPackageWizardTest {
+
+ @Test
public void testPackageNameValidation() {
assertTrue(PackageNameValidator.validatePackageName("foo.bar"));
assertTrue(PackageNameValidator.validatePackageName("whee.waa2"));
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,14 +16,17 @@
package org.drools.guvnor.client.packages;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
import org.drools.guvnor.client.packages.PackageHeaderWidget.Global;
import org.drools.guvnor.client.packages.PackageHeaderWidget.Import;
import org.drools.guvnor.client.packages.PackageHeaderWidget.Types;
+import org.junit.Test;
-public class PackageHeaderWidgetTest extends TestCase {
+public class PackageHeaderWidgetTest {
+ @Test
public void testEmpty() {
PackageHeaderWidget.Types t = PackageHeaderHelper.parseHeader(null);
@@ -38,6 +41,7 @@
}
+ @Test
public void testImports() {
String s = "import goo.bar.Whee;\n\nimport wee.waah.Foo\nimport nee.Nah";
PackageHeaderWidget.Types t = PackageHeaderHelper.parseHeader(s);
@@ -58,6 +62,7 @@
}
+ @Test
public void testGlobals() {
String s = "global goo.bar.Whee x;\n\nglobal wee.waah.Foo asd\nglobal nee.Nah d";
PackageHeaderWidget.Types t = PackageHeaderHelper.parseHeader(s);
@@ -82,6 +87,7 @@
}
+ @Test
public void testGlobalsImports() {
String s = "import goo.bar.Whee;\n\nglobal wee.waah.Foo asd";
PackageHeaderWidget.Types t = PackageHeaderHelper.parseHeader(s);
@@ -99,11 +105,14 @@
}
+ @Test
public void testAdvanced() {
String s = "import goo.bar.Whee;\nglobal Wee waa;\n \nsomething else maybe dialect !";
assertEquals(null, PackageHeaderHelper.parseHeader(s));
}
+ @SuppressWarnings("unchecked")
+ @Test
public void testRenderTypes() {
Types t = new Types();
t.imports.add(new Import("foo.bar.Baz"));
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -31,33 +31,34 @@
* limitations under the License.
*/
-
-
-import junit.framework.TestCase;
-
import org.drools.guvnor.client.messages.Constants;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+
import com.google.gwt.user.client.Command;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-public class SuggestionCompletionCacheTest extends TestCase {
+public class SuggestionCompletionCacheTest {
private boolean executed;
private boolean loaded;
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
executed = false;
loaded = false;
}
+ @Test
public void testCache() throws Exception {
-
//need to proxy out the constants.
Constants cs = (Constants) Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {Constants.class}, new ConstantsProxy());
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/testscenarios/ScenarioHelperTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/testscenarios/ScenarioHelperTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/testscenarios/ScenarioHelperTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,13 +16,13 @@
package org.drools.guvnor.client.qa.testscenarios;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.drools.guvnor.client.qa.testscenarios.ScenarioHelper;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FactData;
import org.drools.ide.common.client.modeldriven.testing.FieldData;
@@ -30,8 +30,9 @@
import org.drools.ide.common.client.modeldriven.testing.RetractFact;
import org.drools.ide.common.client.modeldriven.testing.VerifyFact;
import org.drools.ide.common.client.modeldriven.testing.VerifyRuleFired;
+import org.junit.Test;
-public class ScenarioHelperTest extends TestCase {
+public class ScenarioHelperTest {
//need to get out chunks, so we get data (insert, update, retract)
@@ -41,7 +42,8 @@
//then execute
//want it in chunks
-
+ @SuppressWarnings("unchecked")
+ @Test
public void testChunks() {
List l = new ArrayList();
l.add(new FactData("Q", "x", new ArrayList(), false));
@@ -133,7 +135,8 @@
}
-
+ @SuppressWarnings("unchecked")
+ @Test
public void testGlobals() {
List l = new ArrayList();
l.add(new FactData("X", "d", new ArrayList(), true));
@@ -154,18 +157,16 @@
assertEquals("a", ((FactData)fd.get(0)).name);
assertEquals("b", ((FactData)fd.get(1)).name);
-
-
}
-
+
+ @SuppressWarnings("unchecked")
+ @Test
public void testRemoveField() {
List fieldData = new ArrayList();
fieldData.add(new FieldData("q", "1"));
fieldData.add(new FieldData("w", "2"));
FactData fd = new FactData("X", "x", fieldData, false);
-
-
-
+
List fieldData2 = new ArrayList();
fieldData2.add(new FieldData("q", "3"));
fieldData2.add(new FieldData("w", "4"));
@@ -186,7 +187,8 @@
assertEquals("w", ((FieldData)fieldData2.get(0)).name);
}
-
+ @SuppressWarnings("unchecked")
+ @Test
public void testEmptyMap() {
//this should check that there is always a map present to force the GUI to show a "GIVEN" section.
List<Fixture> fl = new ArrayList<Fixture>();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/BulkTestRunResultTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/BulkTestRunResultTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/BulkTestRunResultTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,10 +16,14 @@
package org.drools.guvnor.client.rpc;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class BulkTestRunResultTest extends TestCase {
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+public class BulkTestRunResultTest {
+
+ @Test
public void testPrinting() {
BulkTestRunResult res = new BulkTestRunResult();
assertNotNull(res.toString());
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -33,10 +33,13 @@
-import junit.framework.TestCase;
+import org.junit.Test;
-public class MetaDataTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+public class MetaDataTest {
+
+ @Test
public void testAddCats() {
MetaData data = new MetaData();
data.addCategory( "new cat" );
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -33,12 +33,15 @@
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import org.drools.guvnor.client.common.AssetFormats;
+import org.junit.Test;
-public class EditorLauncherTest extends TestCase {
+public class EditorLauncherTest {
+ @Test
public void testIcons() {
assertNotNull(EditorLauncher.TYPE_IMAGES);
assertNotNull(EditorLauncher.getAssetFormatIcon( "drl" ));
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rulelist/TableDataRowTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rulelist/TableDataRowTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/client/rulelist/TableDataRowTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -31,14 +31,14 @@
* limitations under the License.
*/
+import static org.junit.Assert.assertEquals;
-
-import junit.framework.TestCase;
-
import org.drools.guvnor.client.rpc.TableDataRow;
+import org.junit.Test;
-public class TableDataRowTest extends TestCase {
+public class TableDataRowTest {
+ @Test
public void testRow() {
TableDataRow row = new TableDataRow();
row.id = "HJKHFKJHFDJS";
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/BackchannelTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/BackchannelTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/BackchannelTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -17,18 +17,22 @@
package org.drools.guvnor.server;
import org.drools.guvnor.client.rpc.PushResponse;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.List;
import java.util.ArrayList;
-import junit.framework.TestCase;
-
/**
* @author Michael Neale
*/
-public class BackchannelTest extends TestCase {
+public class BackchannelTest {
-
+ @Test
public void testPushAll() throws Exception {
final Backchannel bc = new Backchannel();
@@ -78,6 +82,7 @@
}
+ @Test
public void testSimple() throws Exception {
final Backchannel bc = new Backchannel();
@@ -97,7 +102,8 @@
Thread t = new Thread(new Runnable() {
public void run() {
try {
- List<PushResponse> list = bc.await("mic");
+ @SuppressWarnings("unused")
+ List<PushResponse> list = bc.await("mic");
/*
for (PushResponse resp: list) {
System.err.println(resp.messageType + "," + resp.message);
@@ -130,7 +136,7 @@
bc.push("mic", new PushResponse("Q", "A"));
- final List<List<PushResponse>> container = new ArrayList();
+ final List<List<PushResponse>> container = new ArrayList<List<PushResponse>>();
t = new Thread(new Runnable() {
public void run() {
@@ -158,6 +164,7 @@
}
+ @Test
public void testManyConcurrent() throws Exception {
final Backchannel bc = new Backchannel();
for (int i =0; i < 1000; i++) {
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/CategoryFilterTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/CategoryFilterTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/CategoryFilterTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,10 +16,13 @@
package org.drools.guvnor.server;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class CategoryFilterTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+public class CategoryFilterTest {
+
+ @Test
public void testMakePath() {
CategoryFilter filter = new CategoryFilter();
assertEquals("HR", filter.makePath("/", "HR"));
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -33,14 +33,16 @@
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.rpc.PackageConfigData;
import org.drools.guvnor.server.files.FileManagerUtils;
@@ -50,6 +52,8 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.junit.After;
+import org.junit.Test;
import com.google.gwt.user.client.rpc.SerializationException;
@@ -66,8 +70,9 @@
*
* @author Michael Neale
*/
-public class PopulateDataTest extends TestCase {
+public class PopulateDataTest {
+ @Test
public void testPopulate() throws Exception {
ServiceImplementation serv = new ServiceImplementation();
serv.repository = new RulesRepository(TestEnvironmentSessionHelper.getSession());
@@ -87,6 +92,11 @@
serv.buildPackage(pkg.getUUID(), true);
}
+
+ @After
+ public void tearDown() throws Exception {
+ TestEnvironmentSessionHelper.shutdown();
+ }
private void createPermissions(ServiceImplementation serv) {
Map<String, List<String>> perms = new HashMap<String, List<String>>();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -22,8 +22,6 @@
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.rpc.MetaDataQuery;
import org.drools.guvnor.client.rpc.PackageConfigData;
@@ -45,9 +43,15 @@
import org.jboss.seam.security.AuthorizationException;
import org.jboss.seam.security.permission.PermissionResolver;
import org.jboss.seam.security.permission.RoleBasedPermissionResolver;
+import org.junit.After;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
-public class ServiceImplSecurityTest extends TestCase {
+public class ServiceImplSecurityTest {
+ @Test
public void testLoadRuleAssetAnalyst() throws Exception {
try {
ServiceImplementation impl = getService();
@@ -70,7 +74,7 @@
"testLoadRuleAssetAnalystPack1", AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -98,6 +102,7 @@
Contexts.getSessionContext().set("roleBasedPermissionManager", testManager);
//now lets see if we can access this asset with the permissions
+ @SuppressWarnings("unused")
RuleAsset asset = impl.loadRuleAsset(uuid1);
try {
asset = impl.loadRuleAsset(uuid2);
@@ -109,10 +114,12 @@
}
}
+ @Test
public void testLoadRuleAssetPackageReadonly() throws Exception {
try {
ServiceImplementation impl = getService();
String package1Name = "testLoadRuleAssetPackageReadonlyPack1";
+ @SuppressWarnings("unused")
String package1Uuid = impl.createPackage(package1Name, "desc");
impl.createCategory("",
"testLoadRuleAssetPackageReadonlyCat1",
@@ -132,7 +139,7 @@
"testLoadRuleAssetPackageReadonlyPack2", AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -159,6 +166,7 @@
Contexts.getSessionContext().set("roleBasedPermissionManager", testManager);
//now lets see if we can access this asset with the permissions
+ @SuppressWarnings("unused")
RuleAsset asset = impl.loadRuleAsset(uuid1);
try {
asset = impl.loadRuleAsset(uuid2);
@@ -170,6 +178,7 @@
}
}
+ @Test
// Access an asset that belongs to no category. No role permission defined. RoleBasedAuthorization is not enabled
public void testLoadRuleAssetNoCategory() throws Exception {
try {
@@ -190,7 +199,7 @@
AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -221,6 +230,7 @@
}
}
+ @Test
//Access an asset that belongs to no category.
//The user role is admin
public void testLoadRuleAssetNoCategoryPackageAdmin() throws Exception {
@@ -229,6 +239,7 @@
PackageItem packageItem = impl.repository.createPackage(
"testLoadRuleAssetNoCategoryPackageAdminPack1", "desc");
String packageName = packageItem.getName();
+ @SuppressWarnings("unused")
String packageUuid = packageItem.getUUID();
impl.createCategory("",
"testLoadRuleAssetNoCategoryPackageAdminCat1",
@@ -240,7 +251,7 @@
"testLoadRuleAssetNoCategoryPackageAdminPack1", AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -274,6 +285,7 @@
}
}
+ @Test
//Access an asset that belongs to no category.
//The user role is analyst
public void testLoadRuleAssetNoCategoryAnalystNegative() throws Exception {
@@ -281,6 +293,7 @@
ServiceImplementation impl = getService();
PackageItem packageItem = impl.repository.createPackage(
"testLoadRuleAssetNoCategoryAnalystPack1", "desc");
+ @SuppressWarnings("unused")
String packageUuid = packageItem.getUUID();
impl.createCategory("",
"testLoadRuleAssetNoCategoryAnalystCat1",
@@ -300,7 +313,7 @@
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -327,8 +340,10 @@
Contexts.getSessionContext().set("roleBasedPermissionManager", testManager);
//now lets see if we can access this asset with the permissions
+ @SuppressWarnings("unused")
RuleAsset asset2 = impl.loadRuleAsset(uuid2);
try {
+ @SuppressWarnings("unused")
RuleAsset asset1 = impl.loadRuleAsset(uuid1);
fail("Did not catch expected exception");
} catch (AuthorizationException e) {
@@ -338,6 +353,7 @@
}
}
+ @Test
//Access an asset that belongs to no category.
//The user role is analyst
public void testLoadRuleAssetNoCategoryAnalystPositive() throws Exception {
@@ -345,6 +361,7 @@
ServiceImplementation impl = getService();
PackageItem packageItem = impl.repository.createPackage(
"testLoadRuleAssetNoCategoryAnalystPositivePack1", "desc");
+ @SuppressWarnings("unused")
String packageUuid = packageItem.getUUID();
impl.createCategory("",
"testLoadRuleAssetNoCategoryAnalystPositiveCat1",
@@ -357,6 +374,7 @@
"description",
null,
"testLoadRuleAssetNoCategoryAnalystPositivePack1", AssetFormats.DRL);
+ @SuppressWarnings("unused")
String uuid2 = impl.createNewRule("testLoadRuleAssetNoCategoryAnalystPositiveRule2",
"description",
"testLoadRuleAssetNoCategoryAnalystPositiveCat2",
@@ -364,7 +382,7 @@
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -392,12 +410,14 @@
//now lets see if we can access this asset with the permissions
//RuleAsset asset2 = impl.loadRuleAsset(uuid2);
+ @SuppressWarnings("unused")
RuleAsset asset1 = impl.loadRuleAsset(uuid1);
} finally {
Lifecycle.endApplication();
}
}
+ @Test
public void testLoadRuleAssetWithRoleBasedAuthrozationAssetHasCategory()
throws Exception {
try {
@@ -409,6 +429,7 @@
.createPackage(
"testLoadRuleAssetWithRoleBasedAuthrozationAssetHasCategoryPack",
"desc");
+ @SuppressWarnings("unused")
String packageUuid = packageItem.getUUID();
impl.createCategory("", category1, "this is a cat");
@@ -421,7 +442,7 @@
AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -453,6 +474,7 @@
testManager);
// now lets see if we can access this asset with the permissions
+ @SuppressWarnings("unused")
RuleAsset asset = null;
try {
asset = impl.loadRuleAsset(uuid);
@@ -465,7 +487,7 @@
}
}
-
+ @Test
//Access an asset that belongs to no category. The user role is analyst and package.admin.
//Because the analyst role the user has has no category access to the asset,
//the permission can not be granted even though the package.admin role has package access.
@@ -485,7 +507,7 @@
"testLoadRuleAssetWithRoleBasedAuthrozationAssetNoCategoryMixedPack", AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -525,12 +547,13 @@
}
}
+ @Test
public void testCreateNewRule() throws Exception {
ServiceImplementation impl = getService();
impl.repository.createPackage("testSecurityCreateNewRule", "desc");
impl.createCategory("", "testSecurityCreateNewRule", "this is a cat");
- Lifecycle.beginApplication(new HashMap());
+ Lifecycle.beginApplication(new HashMap<String, Object>());
Lifecycle.beginCall();
MockIdentity mi = new MockIdentity();
mi.inject();
@@ -561,6 +584,7 @@
Lifecycle.endApplication();
}
+ @Test
public void testCheckinWithPackageReadonly() throws Exception {
ServiceImplementation impl = getService();
String packageUuid = impl.createPackage(
@@ -579,7 +603,7 @@
Thread.sleep(100);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -614,10 +638,12 @@
Lifecycle.endApplication();
}
+ @Test
public void testCheckinPackageDeveloper() throws Exception {
//try {
ServiceImplementation impl = getService();
String packageName = "testCheckinPackageDeveloperPack1";
+ @SuppressWarnings("unused")
String packageUuid = impl.createPackage(packageName, "desc");
impl.createCategory("/", "testCheckinPackageDeveloperCat1",
"this is a description");
@@ -635,7 +661,7 @@
Thread.sleep(100);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -673,15 +699,17 @@
//}
}
+ @Test
public void testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyFilter() throws Exception {
try {
ServiceImplementation impl = getService();
String package3Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack3";
+ @SuppressWarnings("unused")
String package3Uuid = impl.createPackage(package3Name, "desc");
impl.createCategory("",
"testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat3",
"this is a cat");
-
+ @SuppressWarnings("unused")
String uuid3 = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
"ReadonlyFilterDescription",
"testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat3",
@@ -689,14 +717,14 @@
String package4Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack4";
impl.repository.createPackage(package4Name, "desc");
-
+ @SuppressWarnings("unused")
String uuid2 = impl.createNewRule("testLoadRuleAssetWithRoleBasedAuthrozation",
"ReadonlyFilterDescription",
"testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat3",
package4Name, AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -729,6 +757,7 @@
}
}
+ @Test
public void testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyMetaDataFilter() throws Exception {
try {
ServiceImplementation impl = getService();
@@ -739,22 +768,25 @@
String package7Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack7";
String category7Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat7";
PackageItem packageItem7 = impl.repository.createPackage(package7Name, "desc");
+ @SuppressWarnings("unused")
String packageItem7UUID = packageItem7.getUUID();
impl.createCategory("", category7Name, "this is a rabbit");
-
+ @SuppressWarnings("unused")
String uuid7 = impl.createNewRule(rule7Name,
"MetaDataFilterDescription7", category7Name, package7Name, AssetFormats.DRL);
String package8Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack8";
String category8Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat8";
PackageItem packageItem8 = impl.repository.createPackage(package8Name, "desc");
+ @SuppressWarnings("unused")
String packageItem8UUID = packageItem8.getUUID();
impl.createCategory("", category8Name, "this is a mouse");
+ @SuppressWarnings("unused")
String uuid8 = impl.createNewRule(rule8Name,
"MetaDataFilterDescription8", category8Name, package8Name, AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -797,6 +829,7 @@
}
}
+ @Test
public void testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyMetaDataFilter2() throws Exception {
try {
ServiceImplementation impl = getService();
@@ -807,21 +840,25 @@
String package5Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack5";
String category5Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat5";
PackageItem packageItem5 = impl.repository.createPackage(package5Name, "desc");
+ @SuppressWarnings("unused")
String packageItem5UUID = packageItem5.getUUID();
impl.createCategory("", category5Name, "this is a cat");
+ @SuppressWarnings("unused")
String uuid7 = impl.createNewRule(rule5Name,
"MetaDataFilter2Description5", category5Name, package5Name, AssetFormats.DRL);
String package6Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack6";
String category6Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat6";
PackageItem packageItem6 = impl.repository.createPackage(package6Name, "desc");
+ @SuppressWarnings("unused")
String packageItem6UUID = packageItem6.getUUID();
impl.createCategory("", category6Name, "this is a dog");
+ @SuppressWarnings("unused")
String uuid6 = impl.createNewRule(rule6Name,
"MetaDataFilter2Description6", category6Name, package6Name, AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -861,6 +898,7 @@
}
}
+ @Test
public void testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyMetaDataFilter3() throws Exception {
try {
ServiceImplementation impl = getService();
@@ -871,21 +909,25 @@
String package9Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack9";
String category9Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat9";
PackageItem packageItem9 = impl.repository.createPackage(package9Name, "desc");
+ @SuppressWarnings("unused")
String packageItem9UUID = packageItem9.getUUID();
impl.createCategory("", category9Name, "this is a pigeon");
+ @SuppressWarnings("unused")
String uuid9 = impl.createNewRule(rule9Name,
"MetaDataFilter3Description9", category9Name, package9Name, AssetFormats.DRL);
String package10Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack10";
String category10Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat10";
PackageItem packageItem10 = impl.repository.createPackage(package10Name, "desc");
+ @SuppressWarnings("unused")
String packageItem10UUID = packageItem10.getUUID();
impl.createCategory("", category10Name, "this is a sparrow");
+ @SuppressWarnings("unused")
String uuid10 = impl.createNewRule(rule10Name,
"MetaDataFilter3Description10", category10Name, package10Name, AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -925,6 +967,7 @@
}
}
+ @Test
public void testTableDisplayHandler() throws Exception {
try {
ServiceImplementation impl = getService();
@@ -935,21 +978,25 @@
String package11Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack11";
String category11Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat11";
PackageItem packageItem11 = impl.repository.createPackage(package11Name, "desc");
+ @SuppressWarnings("unused")
String packageItem11UUID = packageItem11.getUUID();
impl.createCategory("", category11Name, "this is a dock");
+ @SuppressWarnings("unused")
String uuid11 = impl.createNewRule(rule11Name,
"DisplayHandlerDescription11", category11Name, package11Name, AssetFormats.DRL);
String package12Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyPack12";
String category12Name = "testLoadRuleAssetWithRoleBasedAuthrozationPackageReadonlyCat12";
PackageItem packageItem12 = impl.repository.createPackage(package12Name, "desc");
+ @SuppressWarnings("unused")
String packageItem12UUID = packageItem12.getUUID();
impl.createCategory("", category12Name, "this is a sparrow");
+ @SuppressWarnings("unused")
String uuid12 = impl.createNewRule(rule12Name,
"DisplayHandlerDescription12", category12Name, package12Name, AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -1002,6 +1049,7 @@
}
}
+ @Test
//BRMS-282: listPackages only returns packages that the user has package.readonly permission or higher
public void testListPackagesPackageAdminAndAnalyst() throws Exception {
try {
@@ -1009,7 +1057,7 @@
String package1Name = "testListPackagesPackageAdminAndAnalystPack1";
String package2Name = "testListPackagesPackageAdminAndAnalystPack2";
String category1Name = "testListPackagesPackageAdminAndAnalystCat1";
-
+ @SuppressWarnings("unused")
String package1UUID = (impl.repository.createPackage(package1Name, "desc")).getUUID();
impl.repository.createPackage(package2Name, "desc");
impl.createCategory("", category1Name, "this is a cat");
@@ -1024,7 +1072,7 @@
"description", null, package2Name, AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -1060,6 +1108,7 @@
}
}
+ @Test
public void testLoadChildCategories() throws Exception {
try {
ServiceImplementation impl = getService();
@@ -1078,7 +1127,7 @@
"description", category2Name, package1Name, AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -1111,7 +1160,7 @@
}
}
-
+ @Test
public void testloadRuleListForCategoriesPackageReadonly() throws Exception {
try {
ServiceImplementation impl = getService();
@@ -1137,7 +1186,7 @@
"description", category1Name, package3Name, AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -1175,6 +1224,7 @@
}
}
+ @Test
public void testloadRuleListForCategoriesPackageReadonlyPositive() throws Exception {
try {
ServiceImplementation impl = getService();
@@ -1200,7 +1250,7 @@
"description", category1Name, package3Name, AssetFormats.DRL);
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication(application);
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -1248,5 +1298,10 @@
.getSession());
return impl;
}
+
+ @After
+ public void tearDown() throws Exception {
+ TestEnvironmentSessionHelper.shutdown();
+ }
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -32,7 +32,16 @@
* limitations under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.ByteArrayInputStream;
+import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
@@ -42,8 +51,6 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.StatelessSession;
@@ -52,7 +59,6 @@
import org.drools.core.util.DroolsStreamUtils;
import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.common.Inbox;
-import org.drools.guvnor.client.rpc.AnalysisReport;
import org.drools.guvnor.client.rpc.BuilderResult;
import org.drools.guvnor.client.rpc.BulkTestRunResult;
import org.drools.guvnor.client.rpc.DetailedSerializationException;
@@ -77,14 +83,13 @@
import org.drools.guvnor.server.repository.RepositoryStartupService;
import org.drools.guvnor.server.repository.UserInbox;
import org.drools.guvnor.server.security.MockIdentity;
-import org.drools.guvnor.server.util.IO;
import org.drools.guvnor.server.util.TableDisplayHandler;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.ActionFieldValue;
import org.drools.ide.common.client.modeldriven.brl.ActionSetField;
+import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.FactPattern;
-import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.PortableObject;
import org.drools.ide.common.client.modeldriven.brl.RuleModel;
import org.drools.ide.common.client.modeldriven.brl.SingleFieldConstraint;
@@ -113,6 +118,10 @@
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.security.permission.RoleBasedPermissionResolver;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
import com.google.gwt.user.client.rpc.SerializationException;
import org.drools.core.util.KeyStoreHelper;
@@ -122,7 +131,7 @@
* This is really a collection of integration tests.
* @author Michael Neale
*/
-public class ServiceImplementationTest extends TestCase {
+public class ServiceImplementationTest {
static {
@@ -134,7 +143,7 @@
}
}
-
+ @Test
public void testInboxEvents() throws Exception {
ServiceImplementation impl = getService();
assertNotNull( impl.loadInbox( Inbox.RECENT_EDITED ) );
@@ -221,6 +230,7 @@
}
+ @Test @Ignore
public void testCategory() throws Exception {
RepositoryService impl = getService();
@@ -252,12 +262,14 @@
}
+ @Test @Ignore
public void testCleanHTML() {
ServiceImplementation impl = new ServiceImplementation();
assertEquals( "<script>",
impl.cleanHTML( "<script>" ) );
}
+ @Test @Ignore
public void testDeleteUnversionedRule() throws Exception {
ServiceImplementation impl = getService();
@@ -299,6 +311,7 @@
}
}
+ @Test @Ignore
public void testAddRuleAndListPackages() throws Exception {
// ServiceImpl impl = new ServiceImpl(new
// RulesRepository(SessionHelper.getSession()));
@@ -352,6 +365,7 @@
assertTrue( dtItem.getBinaryContentAttachmentFileName().endsWith( ".xls" ) );
}
+ @Test @Ignore
public void testAttemptDupeRule() throws Exception {
ServiceImplementation impl = getService();
CategoryItem cat = impl.repository.loadCategory( "/" );
@@ -377,6 +391,7 @@
}
+ @Test @Ignore
public void testCreateNewRule() throws Exception {
ServiceImplementation impl = getService();
impl.repository.createPackage( "testCreateNewRule",
@@ -397,10 +412,12 @@
assertEquals( dtItem.getDescription(),
"an initial desc" );
}
-
+
+ @Test @Ignore
public void testCreateLinkedAssetItem() throws Exception {
ServiceImplementation impl = getService();
- PackageItem testCreateNewRuleAsLinkPackage1 = impl.repository.createPackage( "testCreateNewRuleAsLinkPackage1",
+ @SuppressWarnings("unused")
+ PackageItem testCreateNewRuleAsLinkPackage1 = impl.repository.createPackage( "testCreateNewRuleAsLinkPackage1",
"desc" );
impl.createCategory( "",
"testCreateNewRuleAsLinkCat1",
@@ -482,9 +499,11 @@
assertEquals( 1, size );
}
+ @Test @Ignore
public void testLinkedAssetItemHistoryRelated() throws Exception {
ServiceImplementation impl = getService();
- PackageItem testCreateNewRuleAsLinkPackage1 = impl.repository.createPackage( "testLinkedAssetItemHistoryRelatedPack",
+ @SuppressWarnings("unused")
+ PackageItem testCreateNewRuleAsLinkPackage1 = impl.repository.createPackage( "testLinkedAssetItemHistoryRelatedPack",
"desc" );
impl.createCategory( "",
"testLinkedAssetItemHistoryRelatedCat",
@@ -517,6 +536,7 @@
//create version head
RuleAsset assetWrapper3 = impl.loadRuleAsset( uuidLink );
assetWrapper3.metaData.description = "version head";
+ @SuppressWarnings("unused")
String uuidLink3 = impl.checkinVersion( assetWrapper3 );
assertEquals( uuidLink,
@@ -578,6 +598,7 @@
newHead.metaData.checkinComment );
}
+ @Test @Ignore
//path name contains Apostrophe is no longer a problem with jackrabbit 2.0
public void testCreateNewRuleContainsApostrophe() throws Exception {
ServiceImplementation impl = getService();
@@ -607,6 +628,7 @@
}
+ @Test @Ignore
public void testRuleTableLoad() throws Exception {
ServiceImplementation impl = getService();
TableConfig conf = impl.loadTableConfig( AssetItemGrid.RULE_LIST_TABLE_ID );
@@ -646,6 +668,7 @@
assertTrue( result.data[0].values[0].startsWith( "testRuleTableLoad" ) );
}
+ @Test @Ignore
public void testDateFormatting() throws Exception {
Calendar cal = Calendar.getInstance();
TableDisplayHandler handler = new TableDisplayHandler( AssetItemGrid.RULE_LIST_TABLE_ID );
@@ -655,6 +678,7 @@
assertTrue( fmt.length() > 8 );
}
+ @Test @Ignore
public void testLoadRuleAsset() throws Exception {
ServiceImplementation impl = getService();
impl.repository.createPackage( "testLoadRuleAsset",
@@ -898,23 +922,39 @@
ib.loadRecentEdited().size() );
}
+ @Test @Ignore
public void testLoadAssetHistoryAndRestore() throws Exception {
+
ServiceImplementation impl = getService();
+ long startTime = System.currentTimeMillis();
impl.repository.createPackage( "testLoadAssetHistory",
"desc" );
+ long nowTime1 = System.currentTimeMillis();
+ System.out.println("CreatePackage: " + (nowTime1 - startTime));
impl.createCategory( "",
"testLoadAssetHistory",
"this is a cat" );
+ long nowTime2 = System.currentTimeMillis();
+ System.out.println("CreateCategory: " + (nowTime2 - nowTime1));
String uuid = impl.createNewRule( "testLoadAssetHistory",
"description",
"testLoadAssetHistory",
"testLoadAssetHistory",
AssetFormats.DRL );
+ long nowTime3 = System.currentTimeMillis();
+ System.out.println("CreateNewRule: " + (nowTime3 - nowTime2));
+
RuleAsset asset = impl.loadRuleAsset( uuid );
impl.checkinVersion( asset ); // 1
+ long nowTime4 = System.currentTimeMillis();
+ System.out.println("Checkin 1: " + (nowTime4 - nowTime3));
asset = impl.loadRuleAsset( uuid );
+ long nowTime5 = System.currentTimeMillis();
+ System.out.println("load ruleasset: " + (nowTime5 - nowTime4));
impl.checkinVersion( asset ); // 2
+ long nowTime6 = System.currentTimeMillis();
+ System.out.println("Checkin 2: " + (nowTime6 - nowTime5));
asset = impl.loadRuleAsset( uuid );
impl.checkinVersion( asset ); // HEAD
@@ -946,6 +986,7 @@
}
+ @Test @Ignore
public void testCheckin() throws Exception {
ServiceImplementation serv = getService();
@@ -1043,6 +1084,7 @@
}
+ @Test @Ignore
public void testArchivePackage() throws Exception {
ServiceImplementation impl = getService();
@@ -1050,6 +1092,7 @@
PackageConfigData[] arch = impl.listArchivedPackages();
+ @SuppressWarnings("unused")
String uuid = impl.createPackage( "testCreateArchivedPackage",
"this is a new package" );
@@ -1077,6 +1120,7 @@
arch.length );
}
+ @Test @Ignore
public void testCreatePackage() throws Exception {
ServiceImplementation impl = getService();
PackageConfigData[] pkgs = impl.listPackages();
@@ -1112,6 +1156,7 @@
}
}
+ @Test @Ignore
public void testLoadPackageConfig() throws Exception {
ServiceImplementation impl = getService();
PackageItem it = impl.repository.loadDefaultPackage();
@@ -1156,6 +1201,7 @@
data.checkinComment );
}
+ @Test @Ignore
public void testArchiveAndUnarchivePackageAndHeader() throws Exception {
ServiceImplementation impl = getService();
String uuid = impl.createPackage( "testArchiveAndUnarchivePackageAndHeader",
@@ -1199,6 +1245,7 @@
}
+ @Test @Ignore
public void testPackageConfSave() throws Exception {
RepositoryService impl = getService();
String uuid = impl.createPackage( "testPackageConfSave",
@@ -1234,6 +1281,7 @@
assertFalse( res.hasErrors );
}
+ @Test @Ignore
public void testListByFormat() throws Exception {
RepositoryService impl = getService();
String cat = "testListByFormat";
@@ -1248,6 +1296,7 @@
cat,
"testListByFormat",
"testListByFormat" );
+ @SuppressWarnings("unused")
String uuid2 = impl.createNewRule( "testListByFormat2",
"x",
cat,
@@ -1258,6 +1307,7 @@
cat,
"testListByFormat",
"testListByFormat" );
+ @SuppressWarnings("unused")
String uuid4 = impl.createNewRule( "testListByFormat4",
"x",
cat,
@@ -1352,6 +1402,7 @@
result.data.length );
}
+ @Test @Ignore
public void testListUnregisteredAssetFormats() throws Exception {
ServiceImplementation impl = getService();
PackageItem pkg = impl.repository.createPackage( "testListUnregisteredAssetFormats",
@@ -1375,6 +1426,7 @@
res.data.length );
}
+ @Test @Ignore
public void testQuickFind() throws Exception {
RepositoryService impl = getService();
String cat = "testQuickFind";
@@ -1426,6 +1478,7 @@
}
+ @Test @Ignore
public void testSearchText() throws Exception {
ServiceImplementation impl = getService();
String cat = "testTextSearch";
@@ -1434,6 +1487,7 @@
"qkfnd" );
impl.createPackage( "testTextSearch",
"for testing search." );
+ @SuppressWarnings("unused")
String uuid = impl.createNewRule( "testTextRule1",
"desc",
cat,
@@ -1447,6 +1501,7 @@
res.data.length );
}
+ @Test @Ignore
public void testSearchMetaData() throws Exception {
ServiceImplementation impl = getService();
PackageItem pkg = impl.repository.createPackage( "testMetaDataSearch",
@@ -1483,6 +1538,7 @@
return new String[]{s};
}
+ @Test @Ignore
public void testStatus() throws Exception {
RepositoryService impl = getService();
String uuid = impl.createState( "testStatus1" );
@@ -1555,6 +1611,7 @@
}
+ @Test @Ignore
public void testMovePackage() throws Exception {
RepositoryService impl = getService();
String[] cats = impl.loadChildCategories( "/" );
@@ -1607,6 +1664,7 @@
}
+ @Test @Ignore
public void testCopyAsset() throws Exception {
RepositoryService impl = getService();
impl.createCategory( "/",
@@ -1631,6 +1689,7 @@
asset.metaData.name );
}
+ @Test @Ignore
public void testSnapshot() throws Exception {
RepositoryService impl = getService();
impl.createCategory( "/",
@@ -1638,6 +1697,7 @@
"y" );
impl.createPackage( "testSnapshot",
"d" );
+ @SuppressWarnings("unused")
String uuid = impl.createNewRule( "testSnapshotRule",
"",
"snapshotTesting",
@@ -1699,13 +1759,14 @@
}
+ @Test @Ignore
public void testSnapshotRebuild() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
// get rid of other snapshot crap
- Iterator pkit = repo.listPackages();
+ Iterator<?> pkit = repo.listPackages();
while ( pkit.hasNext() ) {
PackageItem pkg = (PackageItem) pkit.next();
String[] snaps = repo.listPackageSnapshots( pkg.getName() );
@@ -1767,6 +1828,7 @@
}
+ @Test @Ignore
public void testPackageRebuild() throws Exception {
ServiceImplementation impl = getService();
@@ -1801,6 +1863,7 @@
}
+ @Test @Ignore
public void testRemoveCategory() throws Exception {
RepositoryService impl = getService();
@@ -1816,6 +1879,7 @@
}
+ @Test @Ignore
public void testRemoveAsset() throws Exception {
RepositoryService impl = getService();
String cat = "testRemoveAsset";
@@ -1824,19 +1888,19 @@
"ya" );
String pkgUUID = impl.createPackage( "testRemoveAsset",
"" );
-
+ @SuppressWarnings("unused")
String uuid = impl.createNewRule( "testRemoveAsset",
"x",
cat,
"testRemoveAsset",
"testRemoveAsset" );
-
+ @SuppressWarnings("unused")
String uuid2 = impl.createNewRule( "testRemoveAsset2",
"x",
cat,
"testRemoveAsset",
"testRemoveAsset" );
-
+ @SuppressWarnings("unused")
String uuid3 = impl.createNewRule( "testRemoveAsset3",
"x",
cat,
@@ -1867,6 +1931,7 @@
res.data.length );
}
+ @Test @Ignore
public void testRemovePackage() throws Exception {
ServiceImplementation impl = getService();
int n = impl.listPackages().length;
@@ -1879,6 +1944,7 @@
impl.listPackages().length );
}
+ @Test @Ignore
public void testArchiveAsset() throws Exception {
RepositoryService impl = getService();
String cat = "testArchiveAsset";
@@ -1887,19 +1953,19 @@
"ya" );
String pkgUUID = impl.createPackage( "testArchiveAsset",
"" );
-
+ @SuppressWarnings("unused")
String uuid = impl.createNewRule( "testArchiveAsset",
"x",
cat,
"testArchiveAsset",
"testArchiveAsset" );
-
+ @SuppressWarnings("unused")
String uuid2 = impl.createNewRule( "testArchiveAsset2",
"x",
cat,
"testArchiveAsset",
"testArchiveAsset" );
-
+ @SuppressWarnings("unused")
String uuid3 = impl.createNewRule( "testArchiveAsset3",
"x",
cat,
@@ -1952,6 +2018,7 @@
}
+ @Test @Ignore
public void testArchiveAssetWhenParentPackageArchived() throws Exception {
ServiceImplementation impl = getService();
String packageName = "testArchiveAssetWhenParentPackageArchived";
@@ -1961,19 +2028,19 @@
"ya" );
String pkgUUID = impl.createPackage( packageName,
"" );
-
+ @SuppressWarnings("unused")
String uuid = impl.createNewRule( packageName,
"x",
cat,
packageName,
packageName );
-
+ @SuppressWarnings("unused")
String uuid2 = impl.createNewRule( "testArchiveAssetWhenParentPackageArchived2",
"x",
cat,
packageName,
packageName );
-
+ @SuppressWarnings("unused")
String uuid3 = impl.createNewRule( "testArchiveAssetWhenParentPackageArchived3",
"x",
cat,
@@ -2033,6 +2100,7 @@
}
+ @Test @Ignore
public void testLoadSuggestionCompletionEngine() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -2073,6 +2141,7 @@
}
+ @Test @Ignore
public void testDiscussion() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -2137,6 +2206,7 @@
d_.size() );
}
+ @Test @Ignore
/**
* This will test creating a package, check it compiles, and can exectute
* rules, then take a snapshot, and check that it reports errors.
@@ -2179,7 +2249,7 @@
StatelessSession sess = rb.newStatelessSession();
sess.setGlobal( "ls",
- new ArrayList() );
+ new ArrayList<String>() );
sess.execute( p );
assertEquals( 42,
@@ -2214,6 +2284,7 @@
}
+ @Test @Ignore
/**
* This will test creating a package with a BRL rule, check it compiles, and
* can exectute rules, then take a snapshot, and check that it reports
@@ -2267,13 +2338,16 @@
pkg = repo.loadPackage( "testBinaryPackageCompileBRL" );
byte[] binPackage = pkg.getCompiledPackageBytes();
- // Here is where we write it out if needed... UNCOMMENT if needed for
- // the binary test
- // FileOutputStream out = new
- // FileOutputStream("/Users/michaelneale/RepoBinPackage.pkg");
- // out.write( binPackage );
- // out.flush();
- // out.close();
+ // Here is where we write it out is needed... set to true if needed for
+ // the binary test below "testLoadAndExecBinary"
+ boolean saveBinPackage = false;
+ if (saveBinPackage) {
+ FileOutputStream out = new
+ FileOutputStream("RepoBinPackage.pkg");
+ out.write( binPackage );
+ out.flush();
+ out.close();
+ }
assertNotNull( binPackage );
@@ -2345,11 +2419,13 @@
}
+ @Test @Ignore
/**
* this loads up a precompile binary package. If this fails, then it means
* it needs to be updated. It gets the package form the BRL example above.
+ * Simply set saveBinPackage to true to save a new version of the RepoBinPackage.pkg.
*/
- public void IGNORE_testLoadAndExecBinary() throws Exception {
+ public void testLoadAndExecBinary() throws Exception {
Person p = new Person( "fubar" );
BinaryRuleBaseLoader loader = new BinaryRuleBaseLoader();
loader.addPackage( this.getClass().getResourceAsStream( "/RepoBinPackage.pkg" ) );
@@ -2360,6 +2436,7 @@
p.getAge() );
}
+ @Test @Ignore
public void testSuggestionCompletionLoading() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -2378,6 +2455,7 @@
}
+ @Test @Ignore
public void testPackageSource() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -2434,6 +2512,7 @@
}
+ @Test @Ignore
public void testAssetSource() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -2495,6 +2574,7 @@
}
+ @Test @Ignore
public void testBuildAssetWithError() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -2528,6 +2608,7 @@
}
+ @Test @Ignore
public void testBuildAsset() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -2598,6 +2679,7 @@
}
+ @Test @Ignore
public void testBuildAssetMultipleFunctionsCallingEachOther() throws Exception {
ServiceImplementation impl = getService();
@@ -2639,6 +2721,7 @@
}
+ @Test @Ignore
public void testBuildAssetBRXMLAndCopy() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -2701,7 +2784,7 @@
}
assertNull( result );
- List assets = iteratorToList( pkg.getAssets() );
+ List<AssetItem> assets = iteratorToList( pkg.getAssets() );
assertEquals( 3,
assets.size() );
// now lets copy...
@@ -2725,8 +2808,8 @@
}
- private List iteratorToList(Iterator assets) {
- List result = new ArrayList();
+ private List<AssetItem> iteratorToList(Iterator<AssetItem> assets) {
+ List<AssetItem> result = new ArrayList<AssetItem>();
while ( assets.hasNext() ) {
result.add( assets.next() );
@@ -2734,6 +2817,7 @@
return result;
}
+ @Test @Ignore
public void testBuildAssetWithPackageConfigError() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -2778,6 +2862,7 @@
}
+ @Test @Ignore
public void testRuleNameList() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -2818,6 +2903,7 @@
}
+ @Test @Ignore
/**
* This idea of this is to not compile packages more then we have to.
*/
@@ -2839,8 +2925,8 @@
repo.save();
assertFalse( pkg.isBinaryUpToDate() );
- assertFalse( impl.ruleBaseCache.containsKey( pkg.getUUID() ) );
- impl.ruleBaseCache.remove( "XXX" );
+ assertFalse( ServiceImplementation.ruleBaseCache.containsKey( pkg.getUUID() ) );
+ ServiceImplementation.ruleBaseCache.remove( "XXX" );
BuilderResult results = impl.buildPackage( pkg.getUUID(),
true );
@@ -2853,19 +2939,19 @@
assertTrue( pkg.getNode().getProperty( "drools:binaryUpToDate" ).getBoolean() );
assertTrue( pkg.isBinaryUpToDate() );
- assertFalse( impl.ruleBaseCache.containsKey( pkg.getUUID() ) );
+ assertFalse( ServiceImplementation.ruleBaseCache.containsKey( pkg.getUUID() ) );
RuleAsset asset = impl.loadRuleAsset( rule1.getUUID() );
impl.checkinVersion( asset );
assertFalse( pkg.getNode().getProperty( "drools:binaryUpToDate" ).getBoolean() );
- assertFalse( impl.ruleBaseCache.containsKey( pkg.getUUID() ) );
+ assertFalse( ServiceImplementation.ruleBaseCache.containsKey( pkg.getUUID() ) );
impl.buildPackage( pkg.getUUID(),
false );
assertTrue( pkg.getNode().getProperty( "drools:binaryUpToDate" ).getBoolean() );
- assertFalse( impl.ruleBaseCache.containsKey( pkg.getUUID() ) );
+ assertFalse( ServiceImplementation.ruleBaseCache.containsKey( pkg.getUUID() ) );
PackageConfigData config = impl.loadPackageConfig( pkg.getUUID() );
impl.savePackage( config );
@@ -2879,10 +2965,12 @@
}
+ @Test @Ignore
public void testRunScenario() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
+ System.out.println("create package");
PackageItem pkg = repo.createPackage( "testScenarioRun",
"" );
ServiceImplementation.updateDroolsHeader( "import org.drools.Person\n global org.drools.Cheese cheese\n",
@@ -2929,25 +3017,22 @@
ScenarioRunResult res = impl.runScenario( pkg.getName(),
sc ).result;
- assertEquals( null,
- res.errors );
+ assertNull( res.errors );
assertNotNull( res.scenario );
assertTrue( vf.wasSuccessful() );
assertTrue( vr.wasSuccessful() );
res = impl.runScenario( pkg.getName(),
sc ).result;
- assertEquals( null,
- res.errors );
+ assertNull( res.errors );
assertNotNull( res.scenario );
assertTrue( vf.wasSuccessful() );
assertTrue( vr.wasSuccessful() );
- impl.ruleBaseCache.clear();
+ ServiceImplementation.ruleBaseCache.clear();
res = impl.runScenario( pkg.getName(),
sc ).result;
- assertEquals( null,
- res.errors );
+ assertNull( res.errors );
assertNotNull( res.scenario );
assertTrue( vf.wasSuccessful() );
assertTrue( vr.wasSuccessful() );
@@ -2958,7 +3043,7 @@
rule1.updateContent( "Junk" );
rule1.checkin( "" );
- impl.ruleBaseCache.clear();
+ ServiceImplementation.ruleBaseCache.clear();
pkg.updateBinaryUpToDate( false );
repo.save();
res = impl.runScenario( pkg.getName(),
@@ -2994,6 +3079,7 @@
}
+ @Test @Ignore
public void testRunScenarioWithGeneratedBeans() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -3044,14 +3130,14 @@
logEntry[1] );
ScenarioRunResult res = res_.result;
- assertEquals( null,
- res.errors );
+ assertNull( res.errors );
assertNotNull( res.scenario );
assertTrue( vf.wasSuccessful() );
assertTrue( vr.wasSuccessful() );
}
+ @Test @Ignore
public void testRunPackageScenariosWithDeclaredFacts() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -3164,6 +3250,7 @@
s2.scenarioName );
}
+ @Test @Ignore
public void testRunScenarioWithJar() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -3211,32 +3298,30 @@
ScenarioRunResult res = impl.runScenario( pkg.getName(),
sc ).result;
- assertEquals( null,
- res.errors );
+ assertNull( res.errors );
assertNotNull( res.scenario );
assertTrue( vf.wasSuccessful() );
assertTrue( vr.wasSuccessful() );
res = impl.runScenario( pkg.getName(),
sc ).result;
- assertEquals( null,
- res.errors );
+ assertNull( res.errors );
assertNotNull( res.scenario );
assertTrue( vf.wasSuccessful() );
assertTrue( vr.wasSuccessful() );
- impl.ruleBaseCache.clear();
+ ServiceImplementation.ruleBaseCache.clear();
res = impl.runScenario( pkg.getName(),
sc ).result;
- assertEquals( null,
- res.errors );
+ assertNull( res.errors );
assertNotNull( res.scenario );
assertTrue( vf.wasSuccessful() );
assertTrue( vr.wasSuccessful() );
}
+ @Test @Ignore
public void testRunScenarioWithJarThatHasSourceFiles() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -3279,29 +3364,27 @@
} catch ( ClassFormatError e ) {
fail( "Probably failed when loading a source file instead of class file. " + e );
}
- assertEquals( null,
- res.errors );
+ assertNull( res.errors );
assertNotNull( res.scenario );
assertTrue( vr.wasSuccessful() );
res = impl.runScenario( pkg.getName(),
sc ).result;
- assertEquals( null,
- res.errors );
+ assertNull( res.errors );
assertNotNull( res.scenario );
assertTrue( vr.wasSuccessful() );
- impl.ruleBaseCache.clear();
+ ServiceImplementation.ruleBaseCache.clear();
res = impl.runScenario( pkg.getName(),
sc ).result;
- assertEquals( null,
- res.errors );
+ assertNull( res.errors );
assertNotNull( res.scenario );
assertTrue( vr.wasSuccessful() );
}
+ @Test @Ignore
public void testRunPackageScenarios() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -3424,6 +3507,7 @@
s2.scenarioName );
}
+ @Test @Ignore
public void testListFactTypesAvailableInPackage() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -3460,6 +3544,7 @@
}
+ @Test @Ignore
public void testGuidedDTExecute() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
@@ -3537,6 +3622,7 @@
p.getLikes() );
}
+ @Test @Ignore
public void testPackageNameSorting() {
PackageConfigData c1 = new PackageConfigData( "org.foo" );
PackageConfigData c2 = new PackageConfigData( "org.foo.bar" );
@@ -3552,6 +3638,7 @@
ls.get( 1 ) );
}
+ @Test @Ignore
public void testLoadDropDown() throws Exception {
ServiceImplementation serv = new ServiceImplementation();
String[] pairs = new String[]{"f1=x", "f2=2"};
@@ -3568,6 +3655,7 @@
}
+ @Test @Ignore
public void testLoadDropDownNoValuePairs() throws Exception {
ServiceImplementation serv = new ServiceImplementation();
String[] pairs = new String[]{null};
@@ -3580,12 +3668,14 @@
}
+ @Test @Ignore
public void testListUserPermisisons() throws Exception {
ServiceImplementation serv = getService();
Map<String, List<String>> r = serv.listUserPermissions();
assertNotNull( r );
}
+ @Test @Ignore
public void testManageUserPermissions() throws Exception {
ServiceImplementation serv = getService();
Map<String, List<String>> perms = new HashMap<String, List<String>>();
@@ -3597,6 +3687,7 @@
perms_.size() );
}
+ @Test @Ignore //Ignore
public void testImportSampleRepository() throws Exception {
ServiceImplementation serv = getService();
serv.installSampleRepository();
@@ -3610,6 +3701,7 @@
res.result );
}
+ @Test @Ignore
public void testAddCategories() throws Exception {
ServiceImplementation impl = getService();
impl.repository.createPackage( "testAddCategoriesPackage",
@@ -3646,6 +3738,7 @@
assertTrue( dtItem3.getCategorySummary().contains( "testAddCategoriesCat2" ) );
}
+ @Test @Ignore
public void testSnapshotDiff() throws Exception {
RepositoryService impl = getService();
@@ -3679,7 +3772,8 @@
"snapshotDiffTesting",
"testSnapshotDiff",
AssetFormats.DRL );
- String noChangesRuleUuid = impl.createNewRule( "testRuleNoChanges",
+ @SuppressWarnings("unused")
+ String noChangesRuleUuid = impl.createNewRule( "testRuleNoChanges",
"",
"snapshotDiffTesting",
"testSnapshotDiff",
@@ -3706,7 +3800,8 @@
impl.archiveAsset( archiveRuleUuid );
- String addedRuleUuid = impl.createNewRule( "testRuleAdded",
+ @SuppressWarnings("unused")
+ String addedRuleUuid = impl.createNewRule( "testRuleAdded",
"",
"snapshotDiffTesting",
"testSnapshotDiff",
@@ -3774,10 +3869,17 @@
/**
* Set up enough of the Seam environment to test it.
*/
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
+ try {
+ RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession());
+ MailboxService.getInstance().init( repo );
+ RepositoryStartupService.registerCheckinListener();
+ } catch ( Exception e ) {
+ fail( "unable to init" );
+ e.printStackTrace();
+ }
// setting it to false as most unit tests in this file assume no signing
System.setProperty( KeyStoreHelper.PROP_SIGN, "false" );
Map<String, Object> ap = new HashMap<String, Object>();
@@ -3794,21 +3896,22 @@
resolver.setEnableRoleBasedAuthorization( false );
mi.addPermissionResolver( new RoleBasedPermissionResolver() );
//mi.addPermissionResolver(new PackageBasedPermissionResolver());
-
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
+
if ( Contexts.isApplicationContextActive() ) {
+
Lifecycle.endApplication();
}
+ MailboxService.getInstance().stop();
+ TestEnvironmentSessionHelper.shutdown();
}
private ServiceImplementation getService() throws Exception {
ServiceImplementation impl = new ServiceImplementation();
impl.repository = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
-
return impl;
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServletWrapperTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServletWrapperTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/ServletWrapperTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,18 +16,29 @@
package org.drools.guvnor.server;
-import junit.framework.TestCase;
+import org.drools.guvnor.server.repository.MailboxService;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
+import org.junit.After;
+import org.junit.Test;
-public class ServletWrapperTest extends TestCase {
+public class ServletWrapperTest {
+ @Test
public void testMainService() {
RepositoryServiceServlet serv = new RepositoryServiceServlet();
serv.listPackages();
}
+ @Test
public void testSecurityService() {
SecurityServiceServlet serv = new SecurityServiceServlet();
serv.getCurrentUser();
}
+
+ @After
+ public void tearDown() throws Exception {
+ MailboxService.getInstance().stop();
+ TestEnvironmentSessionHelper.shutdown();
+ }
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/VerificationServiceImplementationTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/VerificationServiceImplementationTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/VerificationServiceImplementationTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,16 +16,21 @@
package org.drools.guvnor.server;
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.rpc.AnalysisReport;
import org.drools.guvnor.client.rpc.VerificationService;
+import org.drools.guvnor.server.repository.MailboxService;
import org.drools.guvnor.server.util.IO;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -40,7 +45,8 @@
try {
serviceImplementation.repository = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
} catch ( Exception e ) {
- Assert.fail( "Failed to set up rules repository" );
+ e.printStackTrace();
+ fail( "Failed to set up rules repository" );
}
verificationService = new VerificationServiceImplementation();
@@ -58,8 +64,8 @@
asset.checkin( "" );
AnalysisReport report = verificationService.analysePackage( pkg.getUUID() );
- Assert.assertNotNull( report );
- Assert.assertEquals( 1,
+ assertNotNull( report );
+ assertEquals( 1,
report.warnings.length );
}
@@ -76,48 +82,54 @@
asset.checkin( "" );
AnalysisReport report = verificationService.analysePackage( pkg.getUUID() );
- Assert.assertNotNull( report );
- Assert.assertEquals( 0,
+ assertNotNull( report );
+ assertEquals( 0,
report.errors.length );
- Assert.assertEquals( 8,
+ assertEquals( 8,
report.warnings.length );
- Assert.assertEquals( 1,
+ assertEquals( 1,
report.notes.length );
- Assert.assertEquals( 3,
+ assertEquals( 3,
report.factUsages.length );
- Assert.assertNotNull( report.notes[0].description );
- Assert.assertNull( report.notes[0].reason );
- Assert.assertEquals( 2,
+ assertNotNull( report.notes[0].description );
+ assertNull( report.notes[0].reason );
+ assertEquals( 2,
report.notes[0].causes.length );
- Assert.assertNotNull( report.notes[0].causes[0] );
- Assert.assertNotNull( report.notes[0].causes[1] );
+ assertNotNull( report.notes[0].causes[0] );
+ assertNotNull( report.notes[0].causes[1] );
- Assert.assertEquals( "Message",
+ assertEquals( "Message",
report.factUsages[0].name );
- Assert.assertEquals( "RedundancyPattern",
+ assertEquals( "RedundancyPattern",
report.factUsages[1].name );
- Assert.assertEquals( "RedundancyPattern2",
+ assertEquals( "RedundancyPattern2",
report.factUsages[2].name );
- Assert.assertEquals( 0,
+ assertEquals( 0,
report.factUsages[0].fields.length );
- Assert.assertEquals( 1,
+ assertEquals( 1,
report.factUsages[1].fields.length );
- Assert.assertEquals( 1,
+ assertEquals( 1,
report.factUsages[2].fields.length );
- Assert.assertEquals( "a",
+ assertEquals( "a",
report.factUsages[1].fields[0].name );
- Assert.assertEquals( "a",
+ assertEquals( "a",
report.factUsages[2].fields[0].name );
- Assert.assertEquals( 3,
+ assertEquals( 3,
report.factUsages[1].fields[0].rules.length );
- Assert.assertEquals( 2,
+ assertEquals( 2,
report.factUsages[2].fields[0].rules.length );
- Assert.assertNotNull( report.factUsages[1].fields[0].rules[0] );
+ assertNotNull( report.factUsages[1].fields[0].rules[0] );
}
+
+ @After
+ public void tearDown() throws Exception {
+ MailboxService.getInstance().stop();
+ TestEnvironmentSessionHelper.shutdown();
+ }
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -40,30 +40,38 @@
import java.util.Properties;
import java.util.jar.JarInputStream;
-import junit.framework.TestCase;
-
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.dsl.DSLTokenizedMappingFile;
import org.drools.rule.Package;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
import org.drools.builder.conf.DefaultPackageNameOption;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-public class BRMSPackageBuilderTest extends TestCase {
+public class BRMSPackageBuilderTest {
// Added this empty test so this class doesn't fail
public void testEmpty() {
}
+ @Before
public void setUp() {
System.getProperties().remove( "drools.dialect.java.compiler" );
}
+ @After
public void tearDown() {
System.getProperties().remove( "drools.dialect.java.compiler" );
}
// @FIXME rule "abc" is null and the Packge has no namespace
+ @Test
public void testPartialPackage() throws Exception {
JarInputStream jis = new JarInputStream( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
@@ -122,6 +130,7 @@
}
+ @Test
public void testGeneratedBeans() throws Exception {
JarInputStream jis = new JarInputStream( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
@@ -158,11 +167,13 @@
}
+ @Test
public void testHasDSL() {
BRMSPackageBuilder builder = new BRMSPackageBuilder();
assertFalse(builder.hasDSL());
}
+ @Test
public void testGetExpander() {
BRMSPackageBuilder builder = new BRMSPackageBuilder();
List<DSLTokenizedMappingFile> files = new ArrayList<DSLTokenizedMappingFile>();
@@ -172,7 +183,7 @@
assertNotNull(builder.getDSLExpander());
}
-
+ @Test
public void testDefaultCompiler() throws Exception {
JarInputStream jis = new JarInputStream( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
@@ -194,6 +205,7 @@
assertEquals(JavaDialectConfiguration.ECLIPSE, javaConf.getCompiler());
}
+ @Test
public void testEclipseCompiler() throws Exception {
System.setProperty( "drools.dialect.java.compiler", "ECLIPSE" );
@@ -213,6 +225,7 @@
assertEquals(JavaDialectConfiguration.ECLIPSE, javaConf.getCompiler());
}
+ @Test
public void testNamespaceSingle() throws Exception {
System.setProperty( "drools.dialect.java.compiler", "ECLIPSE" );
@@ -224,12 +237,14 @@
assertFalse(builder.getPackageBuilderConfiguration().isAllowMultipleNamespaces());
}
+ @Test
public void testRuleFlow() throws Exception {
BRMSPackageBuilder builder = BRMSPackageBuilder.getInstance( new ArrayList<JarInputStream>(), new Properties() );
builder.addProcessFromXml( new InputStreamReader( this.getClass().getResourceAsStream( "evaluation.rf" ) ) );
assertFalse(builder.hasErrors());
}
+ @Test
public void testBPMN2Process() throws Exception {
BRMSPackageBuilder builder = BRMSPackageBuilder.getInstance( new ArrayList<JarInputStream>(), new Properties() );
builder.addProcessFromXml( new InputStreamReader( this.getClass().getResourceAsStream( "Hello.bpmn" ) ) );
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -40,8 +40,6 @@
import java.util.Properties;
import java.util.jar.JarInputStream;
-import junit.framework.TestCase;
-
import org.acme.insurance.Driver;
import org.acme.insurance.Policy;
import org.drools.RuleBase;
@@ -66,18 +64,28 @@
import org.drools.rule.Package;
import org.drools.rule.Rule;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.junit.After;
+import org.junit.Test;
import org.mvel2.MVEL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This will unit test package assembly into a binary.
* @author Michael Neale
*/
-public class ContentPackageAssemblerTest extends TestCase {
+public class ContentPackageAssemblerTest {
/**
* Test package configuration errors,
* including header, functions, DSL files.
*/
+ @Test
public void testPackageConfigWithErrors() throws Exception {
//test the config, no rule assets yet
RulesRepository repo = getRepo();
@@ -166,6 +174,7 @@
assertNotEmpty( assembler.getErrors().get( 0 ).errorReport );
}
+ @Test
public void testLoadConfProperties () throws Exception {
RulesRepository repo = getRepo();
@@ -204,7 +213,7 @@
}
-
+ @Test
public void testPackageWithRuleflow() throws Exception {
RulesRepository repo = getRepo();
@@ -235,7 +244,7 @@
ContentPackageAssembler asm = new ContentPackageAssembler( pkg );
assertFalse( asm.hasErrors() );
- Map flows = asm.getBinaryPackage().getRuleFlows();
+ Map<String, org.drools.definition.process.Process> flows = asm.getBinaryPackage().getRuleFlows();
assertNotNull( flows );
assertEquals( 1,
@@ -264,9 +273,10 @@
Object o2 = builder.getPackageRegistry( "foo" ).getTypeResolver().resolveType( "Board" );
assertNotNull( o2 );
assertEquals( "com.billasurf.Board",
- ((Class) o2).getName() );
+ ((Class<?>) o2).getName() );
}
+ @Test
public void testWithNoDeclaredTypes() throws Exception {
RulesRepository repo = getRepo();
@@ -283,6 +293,7 @@
}
+ @Test
public void testSimplePackageWithDeclaredTypes() throws Exception {
RulesRepository repo = getRepo();
@@ -323,6 +334,7 @@
}
+ @Test
public void testSimplePackageBuildNoErrors() throws Exception {
RulesRepository repo = getRepo();
@@ -387,6 +399,7 @@
}
+ @Test
public void testIgnoreArchivedItems() throws Exception {
RulesRepository repo = getRepo();
@@ -432,6 +445,7 @@
* This this case we will test errors that occur in rule assets,
* not in functions or package header.
*/
+ @Test
public void testErrorsInRuleAsset() throws Exception {
RulesRepository repo = getRepo();
@@ -471,6 +485,7 @@
}
+ @Test
public void testEventingExample() throws Exception {
RulesRepository repo = getRepo();
@@ -505,6 +520,7 @@
* This time, we mix up stuff a bit
*
*/
+ @Test
public void testRuleAndDSLAndFunction() throws Exception {
RulesRepository repo = getRepo();
@@ -569,6 +585,7 @@
}
+ @Test
public void testShowSource() throws Exception {
RulesRepository repo = getRepo();
@@ -636,6 +653,7 @@
}
+ @Test
public void testBuildPackageWithEmptyHeader() throws Exception {
RulesRepository repo = getRepo();
@@ -662,7 +680,7 @@
}
-
+ @Test
public void testSkipDisabledPackageStuff() throws Exception {
RulesRepository repo = getRepo();
@@ -690,11 +708,9 @@
assertFalse(asm.hasErrors());
-
-
-
}
+ @Test
public void testSkipDisabledAssets() throws Exception {
RulesRepository repo = getRepo();
@@ -751,6 +767,7 @@
}
+ @Test
public void testXLSDecisionTable() throws Exception {
RulesRepository repo = getRepo();
@@ -820,6 +837,7 @@
}
+ @Test
public void testSkipDisabledImports() throws Exception {
RulesRepository repo = getRepo();
@@ -848,6 +866,7 @@
2 ) == -1 ); //skip a few, make sure we only have one instance of "package "
}
+ @Test
public void testBRXMLWithDSLMixedIn() throws Exception {
RulesRepository repo = getRepo();
@@ -923,6 +942,7 @@
}
+ @Test
public void testCustomSelector() throws Exception {
RulesRepository repo = getRepo();
@@ -1006,5 +1026,10 @@
private RulesRepository getRepo() throws Exception {
return new RulesRepository( TestEnvironmentSessionHelper.getSession() );
}
+
+ @After
+ public void tearDown() throws Exception {
+ TestEnvironmentSessionHelper.shutdown();
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -32,9 +32,6 @@
*/
-
-import junit.framework.TestCase;
-
import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.rpc.BuilderResult;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
@@ -43,9 +40,17 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.junit.After;
+import org.junit.Test;
-public class ContentHandlerTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+public class ContentHandlerTest {
+
+ @Test
public void testContentFormat() {
assertTrue(ContentManager.getHandler( AssetFormats.DRL ) instanceof DRLFileContentHandler);
assertTrue(ContentManager.getHandler( AssetFormats.DSL ) instanceof DSLDefinitionContentHandler);
@@ -63,6 +68,7 @@
}
+ @Test
public void testRuleAssetType() {
assertTrue(ContentManager.getHandler( AssetFormats.DRL ).isRuleAsset());
assertTrue(ContentManager.getHandler( AssetFormats.DSL_TEMPLATE_RULE ).isRuleAsset());
@@ -76,6 +82,7 @@
assertFalse(ContentManager.getHandler( AssetFormats.ENUMERATION ).isRuleAsset());
}
+ @Test
public void testValidating() throws Exception {
RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
PackageItem pkg = repo.loadDefaultPackage();
@@ -98,6 +105,7 @@
}
+ @Test
public void testEmptyDT() throws Exception {
RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
PackageItem pkg = repo.loadDefaultPackage();
@@ -113,10 +121,14 @@
}
-
-
+ @Test
public void testNameConvertion() {
assertEquals("com.foo.Bar", ModelContentHandler.convertPathToName("com/foo/Bar.class"));
}
+
+ @After
+ public void tearDown() throws Exception {
+ TestEnvironmentSessionHelper.shutdown();
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,12 +16,15 @@
package org.drools.guvnor.server.contenthandler;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import org.drools.guvnor.client.common.AssetFormats;
+import org.junit.Test;
-public class ContentManagerTest extends TestCase {
+public class ContentManagerTest {
+ @Test
public void testConfig() throws Exception {
ContentManager mgr = ContentManager.getInstance();
ContentManager mgr_ = ContentManager.getInstance();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -32,14 +32,17 @@
* limitations under the License.
*/
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
-public class DRLFileContentHandlerTest extends TestCase {
+import org.junit.Test;
+public class DRLFileContentHandlerTest {
+
+ @Test
public void testSniffDRLType() throws Exception {
- DRLFileContentHandler h = new DRLFileContentHandler();
-
// in this case we have package, and N rules
String classic = "package foobar \n rule boo \n when \n then\n end \n rule boo2 \n when \n then\n end";
@@ -59,31 +62,30 @@
String complex = "#some comments about the rule \n#here\n when \n #goo \n foo.bar \n then \n #goo \n end.bar";
- assertTrue( h.isStandAloneRule( newRule ) );
- assertFalse( h.isStandAloneRule( moreRuleClassic ) );
- assertFalse( h.isStandAloneRule( classic ) );
- assertFalse( h.isStandAloneRule( moreSingle ) );
- assertFalse( h.isStandAloneRule( null ) );
- assertFalse( h.isStandAloneRule( emptyRule ) );
- assertTrue( h.isStandAloneRule( moreNewRule ) );
- assertTrue( h.isStandAloneRule( complex ) );
- assertFalse( h.isStandAloneRule( query ) );
+ assertTrue( DRLFileContentHandler.isStandAloneRule( newRule ) );
+ assertFalse( DRLFileContentHandler.isStandAloneRule( moreRuleClassic ) );
+ assertFalse( DRLFileContentHandler.isStandAloneRule( classic ) );
+ assertFalse( DRLFileContentHandler.isStandAloneRule( moreSingle ) );
+ assertFalse( DRLFileContentHandler.isStandAloneRule( null ) );
+ assertFalse( DRLFileContentHandler.isStandAloneRule( emptyRule ) );
+ assertTrue( DRLFileContentHandler.isStandAloneRule( moreNewRule ) );
+ assertTrue( DRLFileContentHandler.isStandAloneRule( complex ) );
+ assertFalse( DRLFileContentHandler.isStandAloneRule( query ) );
}
+ @Test
public void testRuleWithDialect() {
String rule = "rule \"DemoRule\" \n " + " salience 10 \n" + " dialect \"mvel\" \n " + " when \n" + " Driver( age > 65 ) \n" + " then \n" + " insert(new Rejection(\" too old \"));" + "end ";
- DRLFileContentHandler h = new DRLFileContentHandler();
- assertFalse( h.isStandAloneRule( rule ) );
-
- assertFalse( h.isStandAloneRule( "" ) );
-
+ assertFalse( DRLFileContentHandler.isStandAloneRule( rule ) );
+ assertFalse( DRLFileContentHandler.isStandAloneRule( "" ) );
}
+ @Test
public void testStandAlone() throws Exception {
String rule = "when \nFoo()\nthen\n\tbar()";
DRLFileContentHandler h = new DRLFileContentHandler();
- assertTrue( h.isStandAloneRule( rule ) );
+ assertTrue( DRLFileContentHandler.isStandAloneRule( rule ) );
String r = h.wrapRuleDeclaration( "whee",
"",
@@ -106,10 +108,11 @@
* Tests a rule that inherits another.
* @throws Exception
*/
+ @Test
public void testStandAloneWithExtends() throws Exception {
String rule = "when \nFoo()\nthen\n\tbar()";
DRLFileContentHandler h = new DRLFileContentHandler();
- assertTrue( h.isStandAloneRule( rule ) );
+ assertTrue( DRLFileContentHandler.isStandAloneRule( rule ) );
String r = h.wrapRuleDeclaration( "whee",
"parentRule",
@@ -124,13 +127,13 @@
}
+ @Test
public void testRuleWithRuleFlowGroup() {
String rule = "rule \"DemoRule\" \n " + " ruleflow-group \"name-of-ruleflow\" \n" + " dialect \"mvel\" \n " + " when \n" + " Driver( age > 65 ) \n" + " then \n" + " insert(new Rejection(\" too old \"));" + "end ";
- DRLFileContentHandler h = new DRLFileContentHandler();
- assertFalse( h.isStandAloneRule( rule ) );
+ assertFalse( DRLFileContentHandler.isStandAloneRule( rule ) );
rule = " ruleflow-group \"name-of-ruleflow\" \n" + " dialect \"mvel\" \n " + " when \n" + " Driver( age > 65 ) \n" + " then \n" + " insert(new Rejection(\" too old \"));";
- assertTrue( h.isStandAloneRule( rule ) );
+ assertTrue( DRLFileContentHandler.isStandAloneRule( rule ) );
}
}
\ No newline at end of file
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -19,7 +19,10 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.drools.compiler.DroolsParserException;
import org.drools.guvnor.client.factmodel.FactMetaModel;
@@ -31,9 +34,12 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.junit.After;
+import org.junit.Test;
-public class FactModelContentHandlerTest extends TestCase {
+public class FactModelContentHandlerTest {
+ @Test
public void testToDrl() {
List<FieldMetaModel> fields = new ArrayList<FieldMetaModel>();
@@ -49,7 +55,7 @@
assertEquals("declare FooBar\n\tf1: int\n\tf2: String\nend", drl);
- FactMetaModel mm2 = new FactMetaModel("BooBah", new ArrayList());
+ FactMetaModel mm2 = new FactMetaModel("BooBah", new ArrayList<FieldMetaModel>());
List<FactMetaModel> models = new ArrayList<FactMetaModel>();
models.add(mm);
models.add(mm2);
@@ -60,6 +66,7 @@
assertTrue(drl.indexOf("BooBah") > drl.indexOf("FooBar"));
}
+ @Test
public void testFromDrl() throws Exception {
String drl = "declare FooBar\n\tf1: int\n\tf2: String\nend";
@@ -90,13 +97,9 @@
assertNotNull(e.getMessage());
}
-
-
-
-
-
}
+ @Test
public void testAdvanced() throws Exception {
String drl = "#advanced editor \ndeclare FooBar\n\t name: String \nend";
@@ -109,7 +112,7 @@
}
}
-
+ @Test
public void testFromEmptyDrl() throws Exception {
String drl = "";
@@ -120,7 +123,7 @@
}
-
+ @Test
public void testStore() throws Exception {
FactModelContentHandler ch = new FactModelContentHandler();
@@ -162,5 +165,10 @@
assertEquals("rubbish here", asset.getContent());
}
+
+ @After
+ public void tearDown() throws Exception {
+ TestEnvironmentSessionHelper.shutdown();
+ }
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,26 +16,22 @@
package org.drools.guvnor.server.contenthandler;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import junit.framework.TestCase;
-
-import org.drools.compiler.DroolsParserException;
-import org.drools.guvnor.client.factmodel.FactMetaModel;
-import org.drools.guvnor.client.factmodel.FactModels;
-import org.drools.guvnor.client.factmodel.FieldMetaModel;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
import org.drools.guvnor.server.ServiceImplementation;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.junit.After;
+import org.junit.Test;
-public class ModelContentHandlerTest extends TestCase {
+public class ModelContentHandlerTest {
+ @Test
public void testModelAttached() throws Exception {
RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
PackageItem pacakge = repo.createPackage( "testModelAttachedPack",
@@ -53,6 +49,7 @@
assertTrue( header.indexOf( "package-info.class" ) == -1 );
}
+ @Test
public void testModelRemoved() throws Exception {
RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
PackageItem pkg = repo.createPackage( "testModelRemovedPackage",
@@ -78,5 +75,10 @@
header.trim() );
}
+
+ @After
+ public void tearDown() throws Exception {
+ TestEnvironmentSessionHelper.shutdown();
+ }
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/FeedServletTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/FeedServletTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/FeedServletTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,7 +16,6 @@
package org.drools.guvnor.server.files;
-import junit.framework.TestCase;
import org.drools.repository.RulesRepository;
import org.drools.repository.PackageItem;
import org.drools.repository.AssetItem;
@@ -24,6 +23,12 @@
import org.drools.guvnor.server.ServiceImplementation;
import org.apache.util.Base64;
import org.jboss.seam.security.AuthorizationException;
+import org.junit.After;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
@@ -33,8 +38,9 @@
/**
* @author Michael Neale
*/
-public class FeedServletTest extends TestCase {
+public class FeedServletTest {
+ @Test
public void testPackageFeed() throws Exception {
RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession( true ) );
PackageItem pkg = repo.createPackage("testPackageFeed", "");
@@ -114,6 +120,7 @@
}
+ @Test
public void testCategoryFeed() throws Exception {
RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession( true ) );
PackageItem pkg = repo.createPackage("testCategoryFeed", "");
@@ -179,7 +186,7 @@
}
-
+ @Test
public void testDiscussionFeed() throws Exception {
RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession( true ) );
PackageItem pkg = repo.createPackage("testDiscussionFeed", "");
@@ -249,4 +256,9 @@
}
}
+ @After
+ public void tearDown() throws Exception {
+ TestEnvironmentSessionHelper.shutdown();
+ }
+
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -339,5 +339,11 @@
}
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ TestEnvironmentSessionHelper.shutdown();
+ super.tearDown();
+ }
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -163,7 +163,8 @@
res = new MockHTTPResponse(null);
serv.doPost(req, res);
assertEquals("OK", res.stringWriter.toString());
-
+
+ pkg.getNode().refresh(false);
AssetItem ass2 = pkg.loadAsset("asset2");
assertEquals("xls", ass2.getFormat());
assertTrue(ass2.isBinary());
@@ -172,6 +173,7 @@
String out = new String(ass2.getBinaryContentAsBytes());
assertEquals("more content", out);
+
repo.logout();
}
@@ -203,6 +205,7 @@
assertEquals("OK", res.stringWriter.toString());
ass = pkg.loadAsset("asset1");
+ pkg.getNode().refresh(false);
assertEquals("some new content", ass.getContent());
assertEquals(ver + 1, ass.getVersionNumber());
assertEquals("hey ho", ass.getCheckinComment());
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MailboxServiceTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MailboxServiceTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MailboxServiceTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,24 +16,30 @@
package org.drools.guvnor.server.repository;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import java.util.List;
+
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
+import org.drools.repository.AssetItem;
import org.drools.repository.RulesRepository;
-import org.drools.repository.AssetItem;
import org.drools.repository.UserInfo.InboxEntry;
-import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
+import org.junit.After;
+import org.junit.Test;
-import java.util.List;
-
/**
*
* @author Michael Neale
*/
-public class MailboxServiceTest extends TestCase {
+public class MailboxServiceTest {
+ @Test
public void testMailbox() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
- MailboxService service = new MailboxService(repo);
+ MailboxService service = MailboxService.getInstance();
+ service.init(repo);
AssetItem asset = repo.loadDefaultPackage().addAsset("testMailbox", "");
@@ -93,10 +99,12 @@
}
+ @Test
public void testOneToMany() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
- MailboxService service = new MailboxService(repo);
+ MailboxService service = MailboxService.getInstance();
+ service.init(repo);
String sender = repo.getSession().getUserID();
AssetItem asset = repo.loadDefaultPackage().addAsset("testMailboxOneToMany", "");
@@ -125,5 +133,11 @@
assertEquals(1, ib3.loadIncoming().size());
}
+
+ @After
+ public void tearDown() throws Exception {
+ MailboxService.getInstance().stop();
+ TestEnvironmentSessionHelper.shutdown();
+ }
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepositoryConfigurator.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepositoryConfigurator.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepositoryConfigurator.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -33,22 +33,39 @@
package org.drools.guvnor.server.repository;
+import java.util.Properties;
+
import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import javax.jcr.Workspace;
import org.drools.repository.JCRRepositoryConfigurator;
import org.drools.repository.RulesRepositoryException;
-class MockRepositoryConfigurator implements JCRRepositoryConfigurator {
+public class MockRepositoryConfigurator extends JCRRepositoryConfigurator {
-
- public Repository getJCRRepository(String repositoryRootDirectory) {
+ @Override
+ public Repository getJCRRepository(Properties properties) {
return new MockRepo();
}
public void setupRulesRepository(Session session) throws RulesRepositoryException {
}
+
+ @Override
+ public void registerNodeTypesFromCndFile(String cndFileName,
+ Session session, Workspace workspace) throws RepositoryException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void shutdown() {
+ // TODO Auto-generated method stub
+
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -174,7 +174,7 @@
public String getUserID() {
- return null;
+ return "anonymous";
}
public ValueFactory getValueFactory() throws UnsupportedRepositoryOperationException,
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RepositoryStartupServiceTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RepositoryStartupServiceTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RepositoryStartupServiceTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -31,30 +31,32 @@
* limitations under the License.
*/
+import javax.jcr.Repository;
+import org.drools.repository.JCRRepositoryConfigurator;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+public class RepositoryStartupServiceTest {
-
-import junit.framework.TestCase;
-
-public class RepositoryStartupServiceTest extends TestCase {
-
+ @Test
public void testConfiguration() throws Exception {
RepositoryStartupService config = new RepositoryStartupService();
config.setHomeDirectory( "qed" );
- assertEquals("qed", config.repositoryHomeDirectory);
+ assertEquals("qed", config.properties.getProperty(JCRRepositoryConfigurator.REPOSITORY_ROOT_DIRECTORY));
config.setRepositoryConfigurator( MockRepositoryConfigurator.class.getName() );
- assertTrue(config.configurator instanceof MockRepositoryConfigurator);
- config.repository = new MockRepo();
-
+ Repository repository = config.getRepositoryInstance();
+
+ assertEquals(MockRepo.class.getSimpleName(),repository.getClass().getSimpleName());
+
assertNotNull(config.newSession("foo"));
assertNotSame(config.newSession("foo"), config.newSession("foo"));
-
-
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -31,16 +31,16 @@
* limitations under the License.
*/
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import org.junit.Test;
-import junit.framework.TestCase;
+public class RulesRepositoryManagerTest {
-public class RulesRepositoryManagerTest extends TestCase {
- public void test1() {
- // added this so we don't get a failer for now tests
- }
-
- public void IGNORE_testDecorator() {
+ @Test
+ public void testDecorator() {
RulesRepositoryManager dec = new RulesRepositoryManager();
RepositoryStartupService config = new RepositoryStartupService();
MockRepo repo = new MockRepo();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/UserInboxTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/UserInboxTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/UserInboxTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,20 +16,23 @@
package org.drools.guvnor.server.repository;
-import org.drools.repository.RulesRepository;
-import org.drools.repository.AssetItem;
-import org.drools.repository.UserInfo.InboxEntry;
-import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.List;
-import junit.framework.TestCase;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
+import org.drools.repository.AssetItem;
+import org.drools.repository.RulesRepository;
+import org.drools.repository.UserInfo.InboxEntry;
+import org.junit.Test;
/**
* @author Michael Neale
*/
-public class UserInboxTest extends TestCase {
+public class UserInboxTest {
+ @Test
public void testInboxen() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
UserInbox inb = new UserInbox(repo);
@@ -78,6 +81,7 @@
}
+ @Test
public void testRead() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
UserInbox inb = new UserInbox(repo);
@@ -92,6 +96,7 @@
}
+ @Test
public void testDupes() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
UserInbox inb = new UserInbox(repo);
@@ -126,6 +131,7 @@
}
+ @Test
public void testHelper() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
UserInbox ib = new UserInbox(repo);
@@ -144,7 +150,7 @@
assertEquals(asset.getUUID(), es.get(0).assetUUID);
}
-
+ @Test
public void testIncoming() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
AssetItem asset = repo.loadDefaultPackage().addAsset("testIncomingMarkedRead", "");
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -19,27 +19,33 @@
import java.util.ArrayList;
import java.util.List;
import java.util.HashMap;
+import java.util.Map;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
import org.drools.guvnor.client.security.Capabilities;
+import org.junit.Test;
-public class CapabilityCalculatorTest extends TestCase {
+public class CapabilityCalculatorTest {
-
+ @Test
public void testAdmin() {
CapabilityCalculator loader = new CapabilityCalculator();
List<RoleBasedPermission> perms = new ArrayList<RoleBasedPermission>();
perms.add(new RoleBasedPermission("s", RoleTypes.ADMIN, null, null ));
- HashMap hm = new HashMap();
+ Map<String,String> hm = new HashMap<String,String>();
Capabilities caps = loader.calcCapabilities(perms, hm);
assertEquals(7, caps.list.size());
assertSame(hm, caps.prefs);
}
+ @Test
public void testCapabilitiesCalculate() {
- HashMap hm = new HashMap();
+ Map<String,String> hm = new HashMap<String,String>();
CapabilityCalculator loader = new CapabilityCalculator();
List<RoleBasedPermission> perms = new ArrayList<RoleBasedPermission>();
perms.add(new RoleBasedPermission("", RoleTypes.PACKAGE_DEVELOPER, null, null));
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockIdentity.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockIdentity.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockIdentity.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -44,6 +44,8 @@
import org.jboss.seam.security.permission.PermissionResolver;
public class MockIdentity extends Identity {
+
+ private static final long serialVersionUID = 3159602570340648366L;
private boolean hasRole;
private Set<String> roles = new HashSet<String>();
private List<PermissionResolver> resolvers = new ArrayList<PermissionResolver>();
@@ -104,7 +106,10 @@
public Credentials getCredentials() {
return new Credentials() {
- public String getUsername()
+
+ private static final long serialVersionUID = -6746530728283388952L;
+
+ public String getUsername()
{
return "mockedUser";
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/NilAuthenticatorTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/NilAuthenticatorTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/NilAuthenticatorTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,10 +16,13 @@
package org.drools.guvnor.server.security;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
-public class NilAuthenticatorTest extends TestCase {
+import org.junit.Test;
+public class NilAuthenticatorTest {
+
+ @Test
public void testAdmin() {
NilAuthenticator ni = new NilAuthenticator();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -34,15 +34,18 @@
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.RulesRepository;
+import org.junit.Test;
-public class RoleBasedPermissionStoreTest extends TestCase {
+public class RoleBasedPermissionStoreTest {
+
+ @Test
public void testGetRoleBasedPermissionsByUserName() throws Exception {
RoleBasedPermissionStore store = getStore();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleTypesTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleTypesTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleTypesTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,10 +16,13 @@
package org.drools.guvnor.server.security;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
-public class RoleTypesTest extends TestCase {
+import org.junit.Test;
+public class RoleTypesTest {
+
+ @Test
public void testListAllTypes() {
String[] t = RoleTypes.listAvailableTypes();
assertEquals(6, t.length);
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -32,32 +32,40 @@
* limitations under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.drools.guvnor.client.security.Capabilities;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
+import org.jboss.seam.security.AuthorizationException;
import org.jboss.seam.security.permission.RoleBasedPermissionResolver;
-import org.jboss.seam.security.AuthorizationException;
+import org.junit.Test;
-public class SecurityServiceImplTest extends TestCase {
+public class SecurityServiceImplTest {
+ @Test
public void testLogin() throws Exception {
SecurityServiceImpl impl = new SecurityServiceImpl();
assertTrue( impl.login( "XXX",
null ) );
}
+ @Test
public void testUser() throws Exception {
SecurityServiceImpl impl = new SecurityServiceImpl();
assertNotNull( impl.getCurrentUser() );
}
+ @Test
public void testCapabilities() {
SecurityServiceImpl impl = new SecurityServiceImpl();
@@ -65,6 +73,7 @@
assertTrue( c.list.size() > 1 );
}
+ @Test
public void testCapabilitiesWithContext() {
SecurityServiceImpl impl = new SecurityServiceImpl();
@@ -119,6 +128,7 @@
Lifecycle.endApplication();
}
+ @Test
public void testCapabilitiesContext() throws Exception {
SecurityServiceImpl impl = new SecurityServiceImpl();
@@ -138,6 +148,7 @@
}
+ @Test
public void testPreferences() throws Exception {
SecurityServiceImpl impl = new SecurityServiceImpl();
assertNotNull( SecurityServiceImpl.PREFERENCES );
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/BuiltInSelectorTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/BuiltInSelectorTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/BuiltInSelectorTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,17 +16,19 @@
package org.drools.guvnor.server.selector;
-import org.drools.guvnor.client.rpc.RepositoryService;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.drools.guvnor.server.ServiceImplementation;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.CategoryItem;
import org.drools.repository.RulesRepository;
+import org.junit.Test;
-import junit.framework.TestCase;
+public class BuiltInSelectorTest {
-public class BuiltInSelectorTest extends TestCase {
-
+ @Test
public void testBuiltInSelector() throws Exception {
ServiceImplementation impl = getService();
impl.repository.loadDefaultPackage();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,10 +16,18 @@
package org.drools.guvnor.server.selector;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class SelectorManagerTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+public class SelectorManagerTest {
+
+ @Test
public void testSelectorMangerConfig() {
SelectorManager sm = new SelectorManager("/selectors-test.properties");
assertNotNull(sm);
@@ -39,7 +47,6 @@
assertFalse(sel.evalRules( new DummyClass() ));
assertTrue(sel.evalRules( new Allow() ));
-
assertNull(sm.getSelector( "selector3" ));
assertNotNull(sm.getSelector( "" ));
@@ -60,6 +67,7 @@
assertSame( SelectorManager.getInstance(), SelectorManager.getInstance());
}
+ @Test
public void testGetBuiltInSelector() {
SelectorManager sm = new SelectorManager("/selectors-test.properties");
assertNotNull(sm);
@@ -68,6 +76,7 @@
assertTrue(sm.getSelector( "BuiltInSelector" ) instanceof BuiltInSelector);
}
+ @Test
public void testGetCustomSelectors() {
SelectorManager sm = new SelectorManager("/selectors-test.properties");
assertNotNull(sm);
@@ -76,9 +85,10 @@
assertEquals(2, sm.getCustomSelectors().length);
}
+ @Test
public void testBadConfig() throws Exception {
SelectorManager sm = new SelectorManager("/badselectors.properties");
-
+ assertNotNull(sm);
}
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -18,9 +18,7 @@
import org.drools.repository.AssetItem;
-public class TestSelector
- implements
- AssetSelector {
+public class TestSelector implements AssetSelector {
public boolean isAssetAllowed(AssetItem asset) {
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/AssetFormatHelperTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/AssetFormatHelperTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/AssetFormatHelperTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,13 +16,15 @@
package org.drools.guvnor.server.util;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
-public class AssetFormatHelperTest extends TestCase {
+import org.junit.Test;
+public class AssetFormatHelperTest {
+
+ @Test
public void testGetRegisteredAssetFormats() {
- AssetFormatHelper hlp = new AssetFormatHelper();
- String[] ls = hlp.listRegisteredTypes();
+ String[] ls = AssetFormatHelper.listRegisteredTypes();
assertTrue(ls.length > 1);
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/AssetLockManagerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/AssetLockManagerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/AssetLockManagerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,14 +16,20 @@
package org.drools.guvnor.server.util;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
/**
* @author Toni Rikkola
*
*/
-public class AssetLockManagerTest extends TestCase {
+public class AssetLockManagerTest {
+ @Test
public void testLockAndUnlock() throws Exception {
AssetLockManager alm = new AssetLockManager();
@@ -47,6 +53,7 @@
}
+ @Test
public void testLockAndOverWritelock() throws Exception {
AssetLockManager alm = new AssetLockManager();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,37 +16,42 @@
package org.drools.guvnor.server.util;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.util.HashSet;
-import junit.framework.TestCase;
-
import org.drools.ide.common.client.modeldriven.brl.ActionFieldValue;
import org.drools.ide.common.client.modeldriven.brl.ActionInsertFact;
+import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.FactPattern;
import org.drools.ide.common.client.modeldriven.brl.FreeFormLine;
import org.drools.ide.common.client.modeldriven.brl.IAction;
import org.drools.ide.common.client.modeldriven.brl.IPattern;
-import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.SingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.dt.TemplateModel;
import org.drools.ide.common.server.util.BRLPersistence;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class BRDRTPersistenceTest extends TestCase {
+public class BRDRTPersistenceTest {
private static final Logger log = LoggerFactory.getLogger(BRDRTPersistenceTest.class);
private BRLPersistence p;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
p = BRDRTPersistence.getInstance();
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
p = null;
}
+ @Test
public void testGenerateEmptyDRL() {
String expected =
"rule \"null_0\"\n" +
@@ -93,6 +98,7 @@
assertEquals(expected, drl);
}
+ @Test
public void testFreeFormLine() {
String expected =
"rule \"with composite_1\"\n" +
@@ -156,6 +162,7 @@
assertEquals(expected, drl);
}
+ @Test
public void testEmptyDataWithRHS() {
String expected =
"rule \"with composite_1\"\n" +
@@ -212,6 +219,7 @@
assertEquals(expected, drl);
}
+ @Test
public void testWithData() {
String expected =
"rule \"with composite_1\"\n" +
@@ -256,6 +264,7 @@
}
+ @Test
public void testRemoveWithData() {
String expected =
"rule \"with composite_1\"\n" +
@@ -305,6 +314,7 @@
}
+ @Test
public void testWithDataAndSync() {
TemplateModel m = new TemplateModel();
m.name = "with composite";
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -32,17 +32,22 @@
* limitations under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.io.InputStream;
-import junit.framework.TestCase;
-
import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.server.contenthandler.DRLFileContentHandler;
import org.drools.guvnor.server.util.ClassicDRLImporter.Asset;
+import org.junit.Test;
-public class ClassicDRLImporterTest extends TestCase {
+public class ClassicDRLImporterTest {
+ @Test
public void testStandardDRL() throws Exception {
ClassicDRLImporter imp = new ClassicDRLImporter( getDrl( "sample_legacy.drl" ) );
@@ -71,6 +76,7 @@
}
+ @Test
public void testStandardWithQuotes() throws Exception {
ClassicDRLImporter imp = new ClassicDRLImporter( getDrl( "sample_legacy_quotes.drl" ) );
assertEquals( "foo",
@@ -80,6 +86,7 @@
assertEquals(-1, imp.getAssets().get(0).name.indexOf("'"));
}
+ @Test
public void testWithFunction() throws Exception {
// Pattern p = Pattern.compile("function\\s+.*\\s+(.*)\\(.*\\).*");
// Matcher m = p.matcher("function void fooBar() {");
@@ -130,6 +137,7 @@
}
+ @Test
public void testWithDSL() throws Exception {
ClassicDRLImporter imp = new ClassicDRLImporter( getDrl( "sample_legacy_with_dsl.drl" ) );
@@ -155,6 +163,7 @@
}
+ @Test
public void testComplexExample() throws Exception {
ClassicDRLImporter imp = new ClassicDRLImporter( getDrl( "sample_complex.drl" ) );
assertFalse( imp.isDSLEnabled() );
@@ -179,6 +188,7 @@
cleanActual );
}
+ @Test
public void testMergeHeader() {
String header = "import foo.bar\nimport wee.waa\n\nglobal goo.ber baz\n";
String toMerge = "import ninja\nimport foo.bar\nimport slack.bladder\n\nimport wee.waa";
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/DiscussionTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/DiscussionTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/DiscussionTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,17 +16,22 @@
package org.drools.guvnor.server.util;
-import org.drools.guvnor.client.rpc.DiscussionRecord;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
+import org.drools.guvnor.client.rpc.DiscussionRecord;
+import org.junit.Test;
+
/**
* @author Michael Neale
*/
-public class DiscussionTest extends TestCase {
+public class DiscussionTest {
+ @Test
public void testPersist() throws InterruptedException {
DiscussionRecord dr = new DiscussionRecord();
dr.author = "mic";
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -17,6 +17,11 @@
package org.drools.guvnor.server.util;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -28,7 +33,7 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
+import javax.jcr.Session;
import org.apache.commons.fileupload.FileItem;
import org.drools.guvnor.client.common.AssetFormats;
@@ -38,17 +43,24 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-import javax.jcr.Session;
-
-public class FileManagerUtilsTest extends TestCase {
+public class FileManagerUtilsTest {
private Session session;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
session = TestEnvironmentSessionHelper.getSession( true );
}
+
+ @After
+ public void tearDown() throws Exception {
+ TestEnvironmentSessionHelper.shutdown();
+ }
+ @Test
public void testAttachFile() throws Exception {
FileManagerUtils uploadHelper = new FileManagerUtils();
@@ -75,6 +87,7 @@
item2.getBinaryContentAttachmentFileName() );
}
+ @Test
public void testAttachModel() throws Exception {
RulesRepository repo = new RulesRepository( session );
PackageItem pkg = repo.createPackage( "testAttachModelImports",
@@ -117,6 +130,7 @@
}
+ @Test
public void testGetFilebyUUID() throws Exception {
FileManagerUtils uploadHelper = new FileManagerUtils();
RulesRepository repo = new RulesRepository( session );
@@ -142,6 +156,7 @@
filename );
}
+ @Test
public void testGetPackageBinaryAndSource() throws Exception {
RulesRepository repo = new RulesRepository( session );
@@ -236,6 +251,7 @@
}
+ @Test
/**
*
* Tests importing when an archived package with the same name exists.
@@ -272,6 +288,7 @@
}
+ @Test
public void testClassicDRLImport() throws Exception {
FileManagerUtils fm = new FileManagerUtils();
fm.setRepository( new RulesRepository( session ) );
@@ -348,6 +365,7 @@
}
+ @Test
public void testDRLImportWithoutPackageName() throws Exception {
FileManagerUtils fm = new FileManagerUtils();
fm.setRepository( new RulesRepository( session ) );
@@ -399,6 +417,7 @@
}
+ @Test
public void testDRLImportOverrideExistingPackageName() throws Exception {
FileManagerUtils fm = new FileManagerUtils();
fm.setRepository( new RulesRepository( session ) );
@@ -442,6 +461,7 @@
}
+ @Test
public void testClassicDRLImportWithDSL() throws Exception {
FileManagerUtils fm = new FileManagerUtils();
fm.setRepository( new RulesRepository( session ) );
@@ -483,7 +503,8 @@
}
- public void XXtestHeadOOME() throws Exception {
+ @Test
+ public void testHeadOOME() throws Exception {
RulesRepository repo = new RulesRepository( session );
PackageItem pkg = repo.createPackage( "testHeadOOME",
"" );
@@ -495,7 +516,8 @@
int iterations = 0;
- while ( true ) {
+ int maxIteration = 250; //pick a large number to do a stress test
+ while ( iterations < maxIteration) {
iterations++;
FileManagerUtils fm = new FileManagerUtils();
fm.setRepository( new RulesRepository( TestEnvironmentSessionHelper.getSession() ) );
@@ -504,7 +526,7 @@
updatePackage( "testHeadOOME" );
}
- //fm.repository = new RulesRepository(TestEnvironmentSessionHelper.getSession());
+ //fm.setRepository( new RulesRepository(TestEnvironmentSessionHelper.getSession()));
fm.getLastModified( "testHeadOOME",
"LATEST" );
fm.getRepository().logout();
@@ -515,7 +537,7 @@
private void updatePackage(String nm) throws Exception {
System.err.println( "---> Updating the package " );
- RulesRepository repo = new RulesRepository( session );
+ RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
PackageItem pkg = repo.loadPackage( nm );
pkg.updateDescription( System.currentTimeMillis() + "" );
pkg.checkin( "a change" );
@@ -523,9 +545,9 @@
}
- private List iteratorToList(Iterator assets) {
+ private List<AssetItem> iteratorToList(Iterator<AssetItem> assets) {
List<AssetItem> list = new ArrayList<AssetItem>();
- for ( Iterator iter = assets; iter.hasNext(); ) {
+ for ( Iterator<AssetItem> iter = assets; iter.hasNext(); ) {
AssetItem rule = (AssetItem) iter.next();
list.add( rule );
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -16,13 +16,16 @@
package org.drools.guvnor.server.util;
-import junit.framework.TestCase;
-
import org.drools.guvnor.client.rpc.LogEntry;
+import org.junit.Test;
-public class LoggingHelperTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+public class LoggingHelperTest {
+ @Test
public void testMessages() throws Exception {
final MessageList ml = new MessageList();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -31,14 +31,14 @@
* limitations under the License.
*/
+import static org.junit.Assert.assertEquals;
-
-import junit.framework.TestCase;
-
import org.drools.guvnor.client.rpc.MetaData;
+import org.junit.Test;
-public class MetaDataMapperTest extends TestCase {
+public class MetaDataMapperTest {
+ @Test
public void testMapping() {
MetaData data = new MetaData();
assertEquals("", data.coverage);
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -33,12 +33,16 @@
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.lang.reflect.Method;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class TableDisplayHandlerTest extends TestCase {
+public class TableDisplayHandlerTest {
+ @Test
public void testRowLoaders() throws Exception {
RowLoader loader = new RowLoader("rulelist");
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/ide/common/server/rules/BRMSSuggestionCompletionLoaderTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/ide/common/server/rules/BRMSSuggestionCompletionLoaderTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/drools/ide/common/server/rules/BRMSSuggestionCompletionLoaderTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -34,7 +34,10 @@
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.server.ServiceImplementation;
@@ -45,9 +48,12 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.junit.After;
+import org.junit.Test;
-public class BRMSSuggestionCompletionLoaderTest extends TestCase {
+public class BRMSSuggestionCompletionLoaderTest {
+ @Test
public void testLoader() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
@@ -64,6 +70,7 @@
}
+ @Test
public void testLoaderWithComplexFields() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
@@ -100,6 +107,7 @@
}
+ @Test
public void testStripUnNeededFields() {
SuggestionCompletionLoader loader = new SuggestionCompletionLoader();
String[] result = loader.removeIrrelevantFields( Arrays.asList(new String[] {"foo", "toString", "class", "hashCode"} ));
@@ -107,6 +115,7 @@
assertEquals("foo", result[0]);
}
+ @Test
public void testGetShortNameOfClass() {
SuggestionCompletionLoader loader = new SuggestionCompletionLoader();
@@ -115,6 +124,7 @@
assertEquals("Foo", loader.getShortNameOfClass( "Foo" ));
}
+ @Test
public void testFactTemplates() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
@@ -144,6 +154,7 @@
assertEquals( SuggestionCompletionEngine.TYPE_DATE, fieldType );
}
+ @Test
public void testDeclaredTypes() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
PackageItem item = repo.createPackage( "testLoaderDeclaredTypes", "to test the loader for declared types" );
@@ -171,6 +182,7 @@
assertEquals("String", engine.getFieldType("Car", "name"));
}
+ @Test
public void testLoadDSLs() throws Exception {
String dsl = "[when]The agents rating is {rating}=doNothing()\n[then]Send a notification to manufacturing '{message}'=foo()";
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
@@ -195,6 +207,7 @@
}
+ @Test
public void testLoadEnumerations() throws Exception {
String enumeration = "'Person.sex' : ['M', 'F']";
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
@@ -222,6 +235,7 @@
}
+ @Test
public void testErrors() throws Exception {
RulesRepository repo = new RulesRepository(TestEnvironmentSessionHelper.getSession());
PackageItem item = repo.createPackage( "testErrorsInPackage", "to test error handling" );
@@ -246,6 +260,7 @@
}
+ @Test
/**
* This shows we need to load up the model without anything attached yet.
*/
@@ -264,5 +279,10 @@
}
+
+ @After
+ public void tearDown() throws Exception {
+ TestEnvironmentSessionHelper.shutdown();
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java 2010-10-21 02:28:20 UTC (rev 35623)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java 2010-10-21 03:27:14 UTC (rev 35624)
@@ -32,13 +32,14 @@
* limitations under the License.
*/
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.drools.guvnor.server.ServiceImplementation;
import org.drools.guvnor.server.security.CategoryPathType;
import org.drools.guvnor.server.security.MockIdentity;
@@ -52,13 +53,15 @@
import org.drools.repository.RulesRepository;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
+import org.junit.Test;
-public class RoleBasedPermissionResolverTest extends TestCase {
+public class RoleBasedPermissionResolverTest {
public void testDummy() throws Exception {
assertTrue( true );
}
+ @Test
public void testCategoryBasedPermissionAnalyst() throws Exception {
//NOTE: Have to have this call, otherwise this test will fail others tests. Seems to be related to
//how Seam context initializes the JCR repository, but dont know the exact cause yet.
@@ -67,7 +70,7 @@
.getSession());
//Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication( application );
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -129,9 +132,10 @@
Lifecycle.endApplication();
}
+ @Test
public void testCategoryBasedPermissionAnalystReadOnly() throws Exception {
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication( application );
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -192,9 +196,10 @@
Lifecycle.endApplication();
}
+ @Test
public void testCategoryBasedPermissionAnalystReadOnly2() throws Exception {
// Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication( application );
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -229,6 +234,7 @@
Lifecycle.endApplication();
}
+ @Test
public void testIsSubPath() {
RoleBasedPermissionResolver pr = new RoleBasedPermissionResolver();
assertTrue( pr.isSubPath( "foo",
@@ -255,12 +261,13 @@
"foo1" ) );
}
+ @Test
/**
* This tests that we can navigate the tree if we have sub path permissions.
*/
public void testCategoryBasedSubPerms() throws Exception {
//Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication( application );
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -329,10 +336,11 @@
}
+ @Test
//admin: everything
public void testPackageBasedPermissionAdmin() throws Exception {
//Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication( application );
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -371,10 +379,11 @@
Lifecycle.endApplication();
}
+ @Test
//Package.admin: everything for that package, including creating snapshots for that package.
public void testPackageBasedPermissionPackageAdmin() throws Exception {
//Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication( application );
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -414,10 +423,11 @@
Lifecycle.endApplication();
}
+ @Test
//Package.admin: everything for that package, including creating snapshots for that package.
public void testPackageBasedWebDavPermissionPackageAdmin() throws Exception {
//Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication( application );
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -454,10 +464,11 @@
Lifecycle.endApplication();
}
+ @Test
//Package.developer: everything for that package, NOT snapshots (can view snapshots of that package only)
public void testPackageBasedPermissionPackageDeveloper() throws Exception {
//Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication( application );
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -497,10 +508,11 @@
Lifecycle.endApplication();
}
+ @Test
//Package.readonly: read only as the name suggested
public void testPackageBasedPermissionPackageReadOnly() throws Exception {
//Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication( application );
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
@@ -540,9 +552,10 @@
Lifecycle.endApplication();
}
+ @Test
public void testPackageBasedPermissionAnalyst() throws Exception {
//Mock up SEAM contexts
- Map application = new HashMap<String, Object>();
+ Map<String, Object> application = new HashMap<String, Object>();
Lifecycle.beginApplication( application );
Lifecycle.beginCall();
MockIdentity midentity = new MockIdentity();
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/test/resources/RepoBinPackage.pkg
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list