Author: heiko.braun(a)jboss.com Date: 2009-07-15 07:58:01 -0400 (Wed, 15 Jul 2009) New Revision: 666 Added: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/ResultCollection.java sam/trunk/modules/core/src/test/resources/database/sql-join.drl Removed: sam/trunk/modules/core/src/test/resources/database/sampleJoin.drl sam/trunk/modules/core/src/test/resources/database/triggerPull.drl Modified: sam/trunk/SAMM.iws sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml sam/trunk/modules/sim/src/test/resources/simulation/sam-cfg.xml Log: Fix database test case Modified: sam/trunk/SAMM.iws =================================================================== --- sam/trunk/SAMM.iws 2009-07-15 10:24:59 UTC (rev 665) +++ sam/trunk/SAMM.iws 2009-07-15 11:58:01 UTC (rev 666) @@ -17,18 +17,14 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/resources/simulation/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/sim/src/test/resources/simulation/sam-cfg.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAMM.iws" afterPath="$PROJECT_DIR$/SAMM.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/drools/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/drools/sam-cfg.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/sam-cfg.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/database/sampleJoin.drl" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/database/sampleJoin.drl" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/pom.xml" afterPath="$PROJECT_DIR$/modules/core/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/database/triggerPull.drl" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/database/triggerPull.drl" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/database/sampleJoin.drl" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/ResultCollection.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/database/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/database/sam-cfg.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/database/sql-join.drl" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/database/triggerPull.drl" afterPath="" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -198,96 +194,44 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="triggerPull.drl" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/triggerPull.drl"> + <file leaf-file-name="DatabaseTestCase.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="23" column="0" selection-start="587" selection-end="587" vertical-scroll-proportion="0.45828146"> - <folding /> + <state line="100" column="39" selection-start="3376" selection-end="3376" vertical-scroll-proportion="0.7237164"> + <folding> + <element signature="method#setUp#0;class#DatabaseTestCase#0" expanded="false" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="sam-cfg.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/sam-cfg.xml"> + <file leaf-file-name="sql-join.drl" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sql-join.drl"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.23471883"> + <state line="23" column="29" selection-start="694" selection-end="694" vertical-scroll-proportion="0.45828146"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ConfigurationDef.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="27" selection-start="1360" selection-end="1360" vertical-scroll-proportion="0.19559902"> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="sam-cfg.xml" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sam-cfg.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="1" column="20" selection-start="62" selection-end="81" vertical-scroll-proportion="0.01992528"> + <state line="24" column="0" selection-start="728" selection-end="728" vertical-scroll-proportion="0.47820672"> <folding /> </state> </provider> </entry> </file> <file leaf-file-name="sam-cfg.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/sam-cfg.xml"> + <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/simulation/sam-cfg.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="0" selection-start="719" selection-end="719" vertical-scroll-proportion="0.41075796"> + <state line="15" column="21" selection-start="342" selection-end="342" vertical-scroll-proportion="0.29339853"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="DroolsEventProcessorImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="119" column="60" selection-start="4172" selection-end="4172" vertical-scroll-proportion="0.37235367"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Configuration.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="64" column="15" selection-start="2253" selection-end="2253" vertical-scroll-proportion="-0.039119806"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="SAMAdapter.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="90" column="80" selection-start="3112" selection-end="3112" vertical-scroll-proportion="0.52552927"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="UpdateListener.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/UpdateListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="10" selection-start="1171" selection-end="1171" vertical-scroll-proportion="0.15647922"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="StreamOutputAdapter.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="80" column="66" selection-start="2380" selection-end="2380" vertical-scroll-proportion="0.84352076"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -442,6 +386,10 @@ <option name="myItemId" value="SAMM.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -449,6 +397,126 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/resources/simulation" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test/resources/samples" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> @@ -492,10 +560,36 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/resources" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/resources/drools" /> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/resources/database" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -519,9 +613,25 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -544,6 +654,30 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -563,6 +697,28 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -877,13 +1033,13 @@ </component> <component name="ToolWindowManager"> <frame x="316" y="39" width="1328" height="965" extended-state="0" /> - <editor active="true" /> + <editor active="false" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="14" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30414388" order="0" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30414388" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718894" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24706802" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="9" /> @@ -987,107 +1143,109 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/modules/sim/pom.xml"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="6" column="24" selection-start="340" selection-end="340" vertical-scroll-proportion="-0.992528"> + <state line="64" column="15" selection-start="2253" selection-end="2253" vertical-scroll-proportion="-0.039119806"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/pom.xml"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/sam-cfg.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="105" column="54" selection-start="2728" selection-end="2728" vertical-scroll-proportion="0.5180573"> + <state line="21" column="0" selection-start="719" selection-end="719" vertical-scroll-proportion="0.41075796"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sampleJoin.drl"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="0" selection-start="436" selection-end="436" vertical-scroll-proportion="0.2789539"> + <state line="33" column="27" selection-start="1360" selection-end="1360" vertical-scroll-proportion="0.19559902"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/sam-cfg.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="127" column="5" selection-start="3968" selection-end="3968" vertical-scroll-proportion="1.0501223"> + <state line="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.23471883"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/UpdateListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="80" column="66" selection-start="2380" selection-end="2380" vertical-scroll-proportion="0.84352076"> + <state line="28" column="10" selection-start="1171" selection-end="1171" vertical-scroll-proportion="0.15647922"> <folding /> </state> </provider> </entry> - <entry file="jar:///Users/hbraun/.m2/repository/org/mvel/mvel2/2.0.10/mvel2-2.0.10.jar!/org/mvel2/optimizers/impl/refl/ReflectiveAccessorOptimizer.class"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="0" selection-start="3038" selection-end="3038" vertical-scroll-proportion="0.38231632"> + <state line="80" column="66" selection-start="2380" selection-end="2380" vertical-scroll-proportion="0.84352076"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/UpdateListener.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="10" selection-start="1171" selection-end="1171" vertical-scroll-proportion="0.15647922"> + <state line="38" column="9" selection-start="1564" selection-end="1564" vertical-scroll-proportion="0.31880447"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/Query.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="90" column="80" selection-start="3112" selection-end="3112" vertical-scroll-proportion="0.52552927"> + <state line="28" column="3" selection-start="1149" selection-end="1149" vertical-scroll-proportion="0.15647922"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/triggerPull.drl"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="23" column="0" selection-start="587" selection-end="587" vertical-scroll-proportion="0.45828146"> + <state line="80" column="59" selection-start="3131" selection-end="3131" vertical-scroll-proportion="0.59153175"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="64" column="15" selection-start="2253" selection-end="2253" vertical-scroll-proportion="-0.039119806"> + <state line="118" column="66" selection-start="3733" selection-end="3733" vertical-scroll-proportion="0.7310087"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/ResultCollection.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="119" column="60" selection-start="4172" selection-end="4172" vertical-scroll-proportion="0.37235367"> + <state line="28" column="29" selection-start="1167" selection-end="1183" vertical-scroll-proportion="0.15647922"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/sam-cfg.xml"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sql-join.drl"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.23471883"> + <state line="23" column="29" selection-start="694" selection-end="694" vertical-scroll-proportion="0.45828146"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="27" selection-start="1360" selection-end="1360" vertical-scroll-proportion="0.19559902"> - <folding /> + <state line="100" column="39" selection-start="3376" selection-end="3376" vertical-scroll-proportion="0.7237164"> + <folding> + <element signature="method#setUp#0;class#DatabaseTestCase#0" expanded="false" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sam-cfg.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="1" column="20" selection-start="62" selection-end="81" vertical-scroll-proportion="0.01992528"> + <state line="24" column="0" selection-start="728" selection-end="728" vertical-scroll-proportion="0.47820672"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/sam-cfg.xml"> + <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/simulation/sam-cfg.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="0" selection-start="719" selection-end="719" vertical-scroll-proportion="0.41075796"> + <state line="15" column="21" selection-start="342" selection-end="342" vertical-scroll-proportion="0.29339853"> <folding /> </state> </provider> Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java =================================================================== --- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java 2009-07-15 10:24:59 UTC (rev 665) +++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java 2009-07-15 11:58:01 UTC (rev 666) @@ -68,47 +68,22 @@ protected void tearDown() throws Exception { + eventProcessor.stop(); db.shutdown(); } /** - * Fire a event to trigger the SQL query - * (Constraints applied to SQL statement) - */ - public void testSQLQuery() throws Exception - { - // setup - eventProcessor.registerStatement( - "TriggerSQL", - loadDRL("database/triggerPull.drl") - ); - - eventProcessor.start(); - - // trigger - Query queryMessage = new Query("%"); - generateInVMEvent(queryMessage); - - // evaluate - assertTrue("Listener not invoked", bufferedOutput.isInvoked()); - EventMessage[] eventMessages = bufferedOutput.getLastNewData(); - assertEquals(7, eventMessages.length); - - dump(eventMessages); - } - - /** * Join SQL data into event processing * (Constraints applied to working memory) * @throws Exception */ - /* public void testSQLJoin() throws Exception + public void testSQLJoin() throws Exception { // setup eventProcessor.registerStatement( "" + "SQLJoin", - loadDRL("database/sampleJoin.drl") + loadDRL("database/sql-join.drl") ); eventProcessor.start(); @@ -122,11 +97,11 @@ // evaluate assertTrue("Listener not invoked", bufferedOutput.isInvoked()); EventMessage[] eventMessages = bufferedOutput.getLastNewData(); - assertEquals(3, eventMessages.length); + assertEquals(1, eventMessages.length); + assertEquals("Wrong results", "GOOG", eventMessages[0].getProperty("symbol")); + //dump(eventMessages); + } - dump(eventMessages); - }*/ - private void dump(EventMessage[] eventMessages) { for(EventMessage event : eventMessages) Added: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/ResultCollection.java =================================================================== --- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/ResultCollection.java (rev 0) +++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/ResultCollection.java 2009-07-15 11:58:01 UTC (rev 666) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.sam.database; + +import java.util.ArrayList; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class ResultCollection extends ArrayList +{ + +} Modified: sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml =================================================================== --- sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml 2009-07-15 10:24:59 UTC (rev 665) +++ sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml 2009-07-15 11:58:01 UTC (rev 666) @@ -4,7 +4,7 @@ xmlns:ns2="http://org.jboss.sam/08/2008/"> <runtime-configuration> - <property name="drools.runtimelog.enable" value="true"/> + <property name="drools.runtimelog.enable" value="false"/> </runtime-configuration> <database-references> Deleted: sam/trunk/modules/core/src/test/resources/database/sampleJoin.drl =================================================================== --- sam/trunk/modules/core/src/test/resources/database/sampleJoin.drl 2009-07-15 10:24:59 UTC (rev 665) +++ sam/trunk/modules/core/src/test/resources/database/sampleJoin.drl 2009-07-15 11:58:01 UTC (rev 666) @@ -1,15 +0,0 @@ -package org.jboss.test.sam.database; - -import java.util.*; - -global org.jboss.sam.internal.drools.SAMAdapter SAM; - -rule "Pull any quote for certain threshold" -when - $query: Query(threshold>99) from entry-point "in-channel" - $sqlStream: ArrayList() from collect ( - Map(this['price']>$query.threshold) from SAM.query("hsqlDB", "SELECT symbol, price FROM quotes") - ); -then - SAM.getListener("out-channel").update($sqlStream); -end \ No newline at end of file Copied: sam/trunk/modules/core/src/test/resources/database/sql-join.drl (from rev 665, sam/trunk/modules/core/src/test/resources/database/sampleJoin.drl) =================================================================== --- sam/trunk/modules/core/src/test/resources/database/sql-join.drl (rev 0) +++ sam/trunk/modules/core/src/test/resources/database/sql-join.drl 2009-07-15 11:58:01 UTC (rev 666) @@ -0,0 +1,28 @@ +package org.jboss.test.sam.database; + +import java.util.*; + +global org.jboss.sam.internal.drools.SAMAdapter SAM; + +rule "Pull any quote for certain threshold" + lock-on-active true +when + $query: Query(threshold>99) from entry-point "in-channel" + $results: ArrayList() from collect ( + Map(this['price']>$query.threshold) from SAM.query("hsqlDB", "SELECT symbol, price FROM quotes") + ); +then + //SAM.getListener("out-channel").update($results); + //retract($query); + entryPoints["sql-stream"].insert($results); +end + +rule "filter symbols" +when + $results : ArrayList() from entry-point "sql-stream" + $filtered : ArrayList(empty==false) from collect ( + Map(this['symbol']=="GOOG") from $results + ) +then + SAM.getListener("out-channel").update($filtered); +end Deleted: sam/trunk/modules/core/src/test/resources/database/triggerPull.drl =================================================================== --- sam/trunk/modules/core/src/test/resources/database/triggerPull.drl 2009-07-15 10:24:59 UTC (rev 665) +++ sam/trunk/modules/core/src/test/resources/database/triggerPull.drl 2009-07-15 11:58:01 UTC (rev 666) @@ -1,23 +0,0 @@ -package org.jboss.test.sam.database; - -import java.util.*; - -global org.jboss.sam.internal.drools.SAMAdapter SAM; - -# default dialect for the semantic code will be MVEL -dialect "mvel" - -declare Query - @role( event ) -end - -rule "Pull any quote by symbol" -when - $query: Query() from entry-point "in-channel" - $sqlStream: ArrayList() from collect ( - List() from SAM.query("hsqlDB", "SELECT symbol, price FROM quotes WHERE symbol like ('"+$query.criteria+"')") - ) -then - System.out.println("ResultSet: "+ $sqlStream); - SAM.getListener("out-channel").update($sqlStream); -end Modified: sam/trunk/modules/sim/src/test/resources/simulation/sam-cfg.xml =================================================================== --- sam/trunk/modules/sim/src/test/resources/simulation/sam-cfg.xml 2009-07-15 10:24:59 UTC (rev 665) +++ sam/trunk/modules/sim/src/test/resources/simulation/sam-cfg.xml 2009-07-15 11:58:01 UTC (rev 666) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> -<ns2:processingNode name="DatabaseTestCase" +<ns2:activityMonitor name="DatabaseTestCase" domain="http://org.jboss.sam/test/database" xmlns:ns2="http://org.jboss.sam/08/2008/"> @@ -13,4 +13,4 @@ <statements/> -</ns2:processingNode> \ No newline at end of file +</ns2:activityMonitor> \ No newline at end of file