[overlord-commits] Overlord SVN: r168 - in sam/trunk: src/test/java/org/jboss/test/sam/database and 1 other directory.

Author: heiko.braun(a)jboss.com Date: 2008-07-15 10:04:23 -0400 (Tue, 15 Jul 2008) New Revision: 168 Modified: sam/trunk/SAM.iws sam/trunk/pom.xml sam/trunk/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java Log: Verify ESPER-254 Modified: sam/trunk/SAM.iws =================================================================== --- sam/trunk/SAM.iws 2008-07-15 12:34:49 UTC (rev 167) +++ sam/trunk/SAM.iws 2008-07-15 14:04:23 UTC (rev 168) @@ -21,6 +21,7 @@ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/std/SizeView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/std/SizeView.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServiceProviderImpl.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServiceProviderImpl.java" /> <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/adapter/invm/Alert.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServicesContextFactoryDefault.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServicesContextFactoryDefault.java" /> <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/adapter/invm/InVMAdapterTestCase.java" afterPath="" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/RegressionLinestView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/RegressionLinestView.java" /> @@ -30,15 +31,10 @@ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/indicator/jmx/TestJMXLastElementDynamicMBean.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/indicator/jmx/TestJMXLastElementDynamicMBean.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/WeightedAverageView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/WeightedAverageView.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/pattern/PatternContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/pattern/PatternContext.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sam-trunk.iml" afterPath="$PROJECT_DIR$/sam-trunk.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/CorrelationView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/CorrelationView.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/UnivariateStatisticsView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/UnivariateStatisticsView.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/event/BeanEventAdapter.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/event/BeanEventAdapter.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/resources/viz/esper-cfg.xml" afterPath="$PROJECT_DIR$/src/test/resources/viz/esper-cfg.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/resources/adapter/invm/esper-cfg.xml" afterPath="$PROJECT_DIR$/src/test/resources/adapter/invm/esper-cfg.xml" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/ViewFactoryContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/ViewFactoryContext.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/Configuration.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/Configuration.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationInformation.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationInformation.java" /> @@ -46,11 +42,6 @@ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/MultiDimStatsView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/MultiDimStatsView.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/plugin/PlugInEventRepresentationContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/plugin/PlugInEventRepresentationContext.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/regression/client/MyTrendSpotterView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/regression/client/MyTrendSpotterView.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/Alert.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/Alert.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/adapter/invm" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/InVMAdapterTestCase.java" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/adapter" afterPath="" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/client/TestConfigurationParser.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/client/TestConfigurationParser.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationPluginLoader.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationPluginLoader.java" /> </list> @@ -137,6 +128,32 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java" line="101" class="org.jboss.test.sam.database.DatabaseTestCase" package="org.jboss.test.sam.database"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java" line="126" class="org.jboss.test.sam.database.DatabaseTestCase" package="org.jboss.test.sam.database"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -209,7 +226,7 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="InVMStreamTestCase.java" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="InVMStreamTestCase.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java"> <provider selected="true" editor-type-id="text-editor"> <state line="29" column="24" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.012987013"> @@ -218,6 +235,33 @@ </provider> </entry> </file> + <file leaf-file-name="DatabaseTestCase.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="135" column="8" selection-start="4971" selection-end="4971" vertical-scroll-proportion="0.95513576"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="EsperProcessingStatement.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EsperProcessingStatement.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="29" column="37" selection-start="1229" selection-end="1253" vertical-scroll-proportion="0.1794569"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SamTestSetup.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/SamTestSetup.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="54" column="15" selection-start="2086" selection-end="2086" vertical-scroll-proportion="0.26564345"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -523,13 +567,31 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/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> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm" /> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam-trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -552,6 +614,22 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/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$/src/main/java/org/jboss/sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -590,6 +668,10 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/sam" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -629,7 +711,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/sam/internal" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -639,6 +721,52 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="sam-trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/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$/src/main/java/org/jboss/sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/sam/internal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="esper-2.1.0-src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> @@ -753,15 +881,15 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="JUnit.AggregationTestCase.testEventAggregation"> - <tempConfiguration default="false" name="AggregationTestCase.testEventAggregation" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> - <pattern value="org.jboss.test.sam.samples.aggregation.*" /> + <component name="RunManager" selected="JUnit.DatabaseTestCase.testEsperPullAPI"> + <tempConfiguration default="false" name="DatabaseTestCase.testEsperPullAPI" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <pattern value="org.jboss.test.sam.database.*" /> <module name="sam-trunk" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" value="org.jboss.test.sam.samples.aggregation" /> - <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.samples.aggregation.AggregationTestCase" /> - <option name="METHOD_NAME" value="testEventAggregation" /> + <option name="PACKAGE_NAME" value="org.jboss.test.sam.database" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.database.DatabaseTestCase" /> + <option name="METHOD_NAME" value="testEsperPullAPI" /> <option name="TEST_OBJECT" value="method" /> <option name="VM_PARAMETERS" /> <option name="PARAMETERS" /> @@ -770,7 +898,13 @@ <option name="TEST_SEARCH_SCOPE"> <value defaultName="wholeProject" /> </option> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="37688" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> <ConfigurationWrapper RunnerId="Run" /> <method> <option name="Make" value="false" /> @@ -952,7 +1086,7 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="6" /> - <editor active="false" /> + <editor active="true" /> <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="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -972,7 +1106,7 @@ <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27590436" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27590436" order="0" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15757205" order="2" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.69020504" order="2" /> @@ -1067,34 +1201,6 @@ <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMapping.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="59" selection-start="1488" selection-end="1488" vertical-scroll-proportion="0.24321133"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMappingRegistry.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="17" selection-start="1175" selection-end="1175" vertical-scroll-proportion="0.1794569"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartServer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="17" selection-start="1397" selection-end="1397" vertical-scroll-proportion="0.26918536"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/PropertyMapping.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="22" selection-start="1434" selection-end="1434" vertical-scroll-proportion="0.1570248"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartBuilder.java"> <provider selected="true" editor-type-id="text-editor"> <state line="32" column="10" selection-start="1254" selection-end="1254" vertical-scroll-proportion="0.26918536"> @@ -1172,6 +1278,34 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/SamTestSetup.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="54" column="15" selection-start="2086" selection-end="2086" vertical-scroll-proportion="0.26564345"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EsperProcessingStatement.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="29" column="37" selection-start="1229" selection-end="1253" vertical-scroll-proportion="0.1794569"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/InMemoryDatabase.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="113" column="22" selection-start="3497" selection-end="3497" vertical-scroll-proportion="0.25974026"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="135" column="8" selection-start="4971" selection-end="4971" vertical-scroll-proportion="0.95513576"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: sam/trunk/pom.xml =================================================================== --- sam/trunk/pom.xml 2008-07-15 12:34:49 UTC (rev 167) +++ sam/trunk/pom.xml 2008-07-15 14:04:23 UTC (rev 168) @@ -15,7 +15,7 @@ <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args> <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> - <esper.version>2.1.0</esper.version> + <esper.version>2.2.0-SNAPSHOT</esper.version> <junit.version>3.8.2</junit.version> <commons-logging.version>1.1</commons-logging.version> <antlr.version>3.0.1</antlr.version> Modified: sam/trunk/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java 2008-07-15 12:34:49 UTC (rev 167) +++ sam/trunk/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java 2008-07-15 14:04:23 UTC (rev 168) @@ -27,6 +27,8 @@ import com.espertech.esper.event.EventBean; import org.jboss.sam.ProcessingStatement; import org.jboss.sam.EventMessage; +import org.jboss.sam.StreamOutput; +import org.jboss.sam.internal.esper.EsperProcessingStatement; import org.jboss.test.sam.SamTestSetup; import org.jboss.test.sam.InMemoryDatabase; @@ -68,11 +70,11 @@ db.update("INSERT INTO quotes (symbol, name, price) VALUES('ORCL', 'Oracle', 22.85)"); db.update("INSERT INTO quotes (symbol, name, price) VALUES('JAVA', 'Sun', 12.42)" ); db.update("INSERT INTO quotes (symbol, name, price) VALUES('GOOG', 'Goole', 572.51)"); - + + // database dump db.query("SELECT symbol, price FROM quotes"); } - protected void tearDown() throws Exception { db.shutdown(); @@ -87,17 +89,17 @@ String epl = "select symbol, price from Query.win:length(1) as query," + " sql:SamTestDB ['SELECT symbol, price FROM quotes WHERE symbol like (${query.criteria})']"; - ProcessingStatement view = eventProcessor.registerBoundStatement("InVM","TriggerSQL", epl); + eventProcessor.registerBoundStatement("InVM","TriggerSQL", epl); // trigger generateInVMEvent( new Query("%") ); // evaluate assertTrue("Listener not invoked", bufferedOutput.isInvoked()); - EventMessage[] lastnews = bufferedOutput.getLastNewData(); - assertFalse(lastnews.length==0); + EventMessage[] eventMessages = bufferedOutput.getLastNewData(); + assertTrue(eventMessages.length==7); - for(EventMessage event : lastnews) + for(EventMessage event : eventMessages) { System.out.println("symbol/price -> " + event.getProperty("symbol") + "/" + event.getProperty("price")); } @@ -107,47 +109,30 @@ { System.out.println("FIXME ESPER-254: testPullAPI on database queries"); - /* - Is going to be fixed in Esper 2.0.2 - See http://jira.codehaus.org/browse/ESPER-254 + /*See http://jira.codehaus.org/browse/ESPER-254 - String aggregate = "insert into NewQuotes " + + String aggregateStmt = "insert into NewQuotes " + "select symbol, price from " + "pattern [every timer:interval(1 sec)], "+ - "sql:SamTestDB ['select * from quotes']"; + "sql:SamTestDB ['select symbol, price from quotes']"; - String action = "select * from NewQuotes.win:length(1)"; + String pullStmt = "select * from NewQuotes.win:keepall()"; // create two views - EPLStatement aggregateView = runtime.registerStatement("PullAPI", aggregate); - EPLStatement actionView = runtime.registerStatement("PullAPIAction", action); + eventProcessor.registerStatement("PullAPI", aggregateStmt); + ProcessingStatement stmt = eventProcessor.registerStatement("QuotestPull", pullStmt); - // bind pull listener to it - PullListener pullListener = new PullListener(); - ((EsperEPLStatement)actionView).getUnderlying().addListener(pullListener); + boolean receivedData = false; + Iterator<EventBean> it = ((EsperProcessingStatement)stmt).getUnderlying().iterator(); + while(it.hasNext()) + { + EventBean event = it.next(); + System.out.println("symbol/price -> " + event.get("symbol") + "/" + event.get("price")); + receivedData = true; + } - // evaluate results - assertTrue("PullListener not invoked", pullListener.invoked); - assertTrue("No data pulled fronm DB", pullListener.lastData.length>0); + assertTrue("Pull API failed, no data received", receivedData); + */ } - - class PullListener implements StatementAwareUpdateListener - { - public EventBean[] lastData = new EventBean[]{}; - public boolean invoked; - - public void update(EventBean[] newEvents, EventBean[] oldEvents, - EPStatement statement, EPServiceProvider epServiceProvider) - { - List<EventBean> batch = new ArrayList<EventBean>(); - Iterator<EventBean> it = statement.iterator(); - while(it.hasNext()) - { - batch.add(it.next()); - } - this.invoked = true; - this.lastData = batch.toArray(new EventBean[]{}); - } - } }