From b5c892a2a2912e5539b408668a4f5293cc0dc80d Mon Sep 17 00:00:00 2001
From: jagatha <jagatha@wso2.com>
Date: Tue, 16 Aug 2016 17:09:18 +0530
Subject: [PATCH 1/2] Event Streams corrected in SequenceStatisticsTest

---
 ...b.analytics.stream.ConfigEntry_1.0.0.json} |   8 +-
 ...esb.analytics.stream.FlowEntry_1.0.0.json} |  10 +-
 .../tests-other/src/test/resources/testng.xml | 152 +++++++++---------
 3 files changed, 90 insertions(+), 80 deletions(-)
 rename modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/{esb-config-entry-stream_1.0.0.json => org.wso2.esb.analytics.stream.ConfigEntry_1.0.0.json} (71%)
 rename modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/{esb-flow-entry-stream_1.0.0.json => org.wso2.esb.analytics.stream.FlowEntry_1.0.0.json} (58%)

diff --git a/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-config-entry-stream_1.0.0.json b/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.ConfigEntry_1.0.0.json
similarity index 71%
rename from modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-config-entry-stream_1.0.0.json
rename to modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.ConfigEntry_1.0.0.json
index ac5ba7626..12fc7e55f 100644
--- a/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-config-entry-stream_1.0.0.json
+++ b/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.ConfigEntry_1.0.0.json
@@ -1,8 +1,14 @@
 {
-  "name": "esb-config-entry-stream",
+  "name": "org.wso2.esb.analytics.stream.ConfigEntry",
   "version": "1.0.0",
   "nickName": "",
   "description": "This stream is use by WSO2 ESB to publish component schemas",
+  "metaData": [
+    {
+      "name": "tenantId",
+      "type": "INT"
+    }
+  ],
   "payloadData": [
     {
       "name": "hashcode",
diff --git a/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-flow-entry-stream_1.0.0.json b/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.FlowEntry_1.0.0.json
similarity index 58%
rename from modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-flow-entry-stream_1.0.0.json
rename to modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.FlowEntry_1.0.0.json
index f2dddc408..9ddb101db 100644
--- a/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-flow-entry-stream_1.0.0.json
+++ b/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.FlowEntry_1.0.0.json
@@ -1,12 +1,16 @@
 {
-  "name": "esb-flow-entry-stream",
+  "name": "org.wso2.esb.analytics.stream.FlowEntry",
   "version": "1.0.0",
   "nickName": "",
-  "description": "",
+  "description": "This stream is use by WSO2 ESB to publish statistical data",
   "metaData": [
     {
       "name": "compressed",
       "type": "BOOL"
+    },
+    {
+      "name": "tenantId",
+      "type": "INT"
     }
   ],
   "payloadData": [
@@ -19,4 +23,4 @@
       "type": "STRING"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/modules/integration/tests-integration/tests-other/src/test/resources/testng.xml b/modules/integration/tests-integration/tests-other/src/test/resources/testng.xml
index b27838740..44971103f 100644
--- a/modules/integration/tests-integration/tests-other/src/test/resources/testng.xml
+++ b/modules/integration/tests-integration/tests-other/src/test/resources/testng.xml
@@ -9,77 +9,77 @@
         <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestReportListener"/>
     </listeners>
 
-    <test name="Server-Startup-verification" preserve-order="true" verbose="2">
-        <classes>
-            <class name="org.wso2.carbon.esb.ServerStartupTestCase"/>
-        </classes>
-    </test>
-
-    <test name="Resource-MediaType-Test" preserve-order="true" verbose="2">
-        <packages>
-            <package name="org.wso2.carbon.esb.resource.test.*"/>
-        </packages>
-    </test>
-
-    <test name="GZIP-Compression-Test" preserve-order="true" verbose="2">
-        <packages>
-            <package name="org.wso2.carbon.esb.compression.test.gzip.*"/>
-        </packages>
-    </test>
-
-    <test name="SecureVault-Test" preserve-order="true" verbose="2">
-        <packages>
-            <package name="org.wso2.carbon.esb.securevalut.test.*"/>
-        </packages>
-    </test>
-
-    <test name="Scenario-health-care" preserve-order="true" verbose="2">
-        <packages>
-            <package name="org.wso2.carbon.esb.scenarios.test.healthcare.*"/>
-        </packages>
-    </test>
-
-    <test name="Test-Multiple-servers" preserve-order="true" verbose="2">
-        <classes>
-            <class name="org.wso2.carbon.esb.test.servers.CarbonTestServerManager"/>
-            <class name="org.wso2.carbon.esb.test.servers.NewInstanceTestCase"/>
-            <class name="org.wso2.carbon.esb.test.servers.OSGIUnsatisfiedServerBundlesTestCase">
-		<methods>
-                    <exclude name=".*"/>
-                </methods>
-	    </class>
-        </classes>
-    </test>
-
-    <test name="PostRequest-Test" preserve-order="true" verbose="2">
-        <packages>
-            <package name="org.wso2.carbon.esb.synapse.common.formatters"/>
-        </packages>
-    </test>
-    <!-- Test are not written correctly need to review the pr
-          https://github.com/wso2/product-esb/commit/6785fc470085f258de2709c995955354bfa95b15#diff-c1a07fd98068afcfb9702a5f9f597270-->
-    <!--test name="Content-Type-Test" preserve-order="true" verbose="2">
-        <packages>
-            <package name="org.wso2.carbon.esb.contenttype.json.*"/>
-        </packages>
-    </test-->
-    <test name="Mediation-Stat-Test" preserve-order="true" verbose="2">
-        <packages>
-            <package name="org.wso2.carbon.esb.mediationstats.*"/>
-        </packages>
-    </test>
-
-    <test name="Eager-Loading-Test" preserve-order="true" verbose="2">
-        <packages>
-            <package name="org.wso2.carbon.esb.eager.loading"/>
-        </packages>
-    </test>
-
-    <test name="Template-Test" preserve-order="true" verbose="2">
-        <packages>
-            <package name="org.wso2.carbon.esb.template"/>
-        </packages>
-    </test>
+    <!--<test name="Server-Startup-verification" preserve-order="true" verbose="2">-->
+        <!--<classes>-->
+            <!--<class name="org.wso2.carbon.esb.ServerStartupTestCase"/>-->
+        <!--</classes>-->
+    <!--</test>-->
+
+    <!--<test name="Resource-MediaType-Test" preserve-order="true" verbose="2">-->
+        <!--<packages>-->
+            <!--<package name="org.wso2.carbon.esb.resource.test.*"/>-->
+        <!--</packages>-->
+    <!--</test>-->
+
+    <!--<test name="GZIP-Compression-Test" preserve-order="true" verbose="2">-->
+        <!--<packages>-->
+            <!--<package name="org.wso2.carbon.esb.compression.test.gzip.*"/>-->
+        <!--</packages>-->
+    <!--</test>-->
+
+    <!--<test name="SecureVault-Test" preserve-order="true" verbose="2">-->
+        <!--<packages>-->
+            <!--<package name="org.wso2.carbon.esb.securevalut.test.*"/>-->
+        <!--</packages>-->
+    <!--</test>-->
+
+    <!--<test name="Scenario-health-care" preserve-order="true" verbose="2">-->
+        <!--<packages>-->
+            <!--<package name="org.wso2.carbon.esb.scenarios.test.healthcare.*"/>-->
+        <!--</packages>-->
+    <!--</test>-->
+
+    <!--<test name="Test-Multiple-servers" preserve-order="true" verbose="2">-->
+        <!--<classes>-->
+            <!--<class name="org.wso2.carbon.esb.test.servers.CarbonTestServerManager"/>-->
+            <!--<class name="org.wso2.carbon.esb.test.servers.NewInstanceTestCase"/>-->
+            <!--<class name="org.wso2.carbon.esb.test.servers.OSGIUnsatisfiedServerBundlesTestCase">-->
+		<!--<methods>-->
+                    <!--<exclude name=".*"/>-->
+                <!--</methods>-->
+	    <!--</class>-->
+        <!--</classes>-->
+    <!--</test>-->
+
+    <!--<test name="PostRequest-Test" preserve-order="true" verbose="2">-->
+        <!--<packages>-->
+            <!--<package name="org.wso2.carbon.esb.synapse.common.formatters"/>-->
+        <!--</packages>-->
+    <!--</test>-->
+    <!--&lt;!&ndash; Test are not written correctly need to review the pr-->
+          <!--https://github.com/wso2/product-esb/commit/6785fc470085f258de2709c995955354bfa95b15#diff-c1a07fd98068afcfb9702a5f9f597270&ndash;&gt;-->
+    <!--&lt;!&ndash;test name="Content-Type-Test" preserve-order="true" verbose="2">-->
+        <!--<packages>-->
+            <!--<package name="org.wso2.carbon.esb.contenttype.json.*"/>-->
+        <!--</packages>-->
+    <!--</test&ndash;&gt;-->
+    <!--<test name="Mediation-Stat-Test" preserve-order="true" verbose="2">-->
+        <!--<packages>-->
+            <!--<package name="org.wso2.carbon.esb.mediationstats.*"/>-->
+        <!--</packages>-->
+    <!--</test>-->
+
+    <!--<test name="Eager-Loading-Test" preserve-order="true" verbose="2">-->
+        <!--<packages>-->
+            <!--<package name="org.wso2.carbon.esb.eager.loading"/>-->
+        <!--</packages>-->
+    <!--</test>-->
+
+    <!--<test name="Template-Test" preserve-order="true" verbose="2">-->
+        <!--<packages>-->
+            <!--<package name="org.wso2.carbon.esb.template"/>-->
+        <!--</packages>-->
+    <!--</test>-->
 
     <test name="Stats-Test" preserve-order="true" verbose="2">
         <packages>
@@ -94,11 +94,11 @@
         </classes>
     </test>
 
-    <test name="LocalEntry-Test" preserve-order="true" verbose="2">
-        <packages>
-            <package name="org.wso2.carbon.esb.localentry.test.*"/>
-        </packages>
-    </test>
+    <!--<test name="LocalEntry-Test" preserve-order="true" verbose="2">-->
+        <!--<packages>-->
+            <!--<package name="org.wso2.carbon.esb.localentry.test.*"/>-->
+        <!--</packages>-->
+    <!--</test>-->
 
 
 </suite>

From e198d939343f7fb7d909f363abb6d699ccd38779 Mon Sep 17 00:00:00 2001
From: jagatha <jagatha@wso2.com>
Date: Tue, 16 Aug 2016 17:11:48 +0530
Subject: [PATCH 2/2] testng file corrected in tests-other module

---
 .../tests-other/src/test/resources/testng.xml | 152 +++++++++---------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/modules/integration/tests-integration/tests-other/src/test/resources/testng.xml b/modules/integration/tests-integration/tests-other/src/test/resources/testng.xml
index 44971103f..b27838740 100644
--- a/modules/integration/tests-integration/tests-other/src/test/resources/testng.xml
+++ b/modules/integration/tests-integration/tests-other/src/test/resources/testng.xml
@@ -9,77 +9,77 @@
         <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestReportListener"/>
     </listeners>
 
-    <!--<test name="Server-Startup-verification" preserve-order="true" verbose="2">-->
-        <!--<classes>-->
-            <!--<class name="org.wso2.carbon.esb.ServerStartupTestCase"/>-->
-        <!--</classes>-->
-    <!--</test>-->
-
-    <!--<test name="Resource-MediaType-Test" preserve-order="true" verbose="2">-->
-        <!--<packages>-->
-            <!--<package name="org.wso2.carbon.esb.resource.test.*"/>-->
-        <!--</packages>-->
-    <!--</test>-->
-
-    <!--<test name="GZIP-Compression-Test" preserve-order="true" verbose="2">-->
-        <!--<packages>-->
-            <!--<package name="org.wso2.carbon.esb.compression.test.gzip.*"/>-->
-        <!--</packages>-->
-    <!--</test>-->
-
-    <!--<test name="SecureVault-Test" preserve-order="true" verbose="2">-->
-        <!--<packages>-->
-            <!--<package name="org.wso2.carbon.esb.securevalut.test.*"/>-->
-        <!--</packages>-->
-    <!--</test>-->
-
-    <!--<test name="Scenario-health-care" preserve-order="true" verbose="2">-->
-        <!--<packages>-->
-            <!--<package name="org.wso2.carbon.esb.scenarios.test.healthcare.*"/>-->
-        <!--</packages>-->
-    <!--</test>-->
-
-    <!--<test name="Test-Multiple-servers" preserve-order="true" verbose="2">-->
-        <!--<classes>-->
-            <!--<class name="org.wso2.carbon.esb.test.servers.CarbonTestServerManager"/>-->
-            <!--<class name="org.wso2.carbon.esb.test.servers.NewInstanceTestCase"/>-->
-            <!--<class name="org.wso2.carbon.esb.test.servers.OSGIUnsatisfiedServerBundlesTestCase">-->
-		<!--<methods>-->
-                    <!--<exclude name=".*"/>-->
-                <!--</methods>-->
-	    <!--</class>-->
-        <!--</classes>-->
-    <!--</test>-->
-
-    <!--<test name="PostRequest-Test" preserve-order="true" verbose="2">-->
-        <!--<packages>-->
-            <!--<package name="org.wso2.carbon.esb.synapse.common.formatters"/>-->
-        <!--</packages>-->
-    <!--</test>-->
-    <!--&lt;!&ndash; Test are not written correctly need to review the pr-->
-          <!--https://github.com/wso2/product-esb/commit/6785fc470085f258de2709c995955354bfa95b15#diff-c1a07fd98068afcfb9702a5f9f597270&ndash;&gt;-->
-    <!--&lt;!&ndash;test name="Content-Type-Test" preserve-order="true" verbose="2">-->
-        <!--<packages>-->
-            <!--<package name="org.wso2.carbon.esb.contenttype.json.*"/>-->
-        <!--</packages>-->
-    <!--</test&ndash;&gt;-->
-    <!--<test name="Mediation-Stat-Test" preserve-order="true" verbose="2">-->
-        <!--<packages>-->
-            <!--<package name="org.wso2.carbon.esb.mediationstats.*"/>-->
-        <!--</packages>-->
-    <!--</test>-->
-
-    <!--<test name="Eager-Loading-Test" preserve-order="true" verbose="2">-->
-        <!--<packages>-->
-            <!--<package name="org.wso2.carbon.esb.eager.loading"/>-->
-        <!--</packages>-->
-    <!--</test>-->
-
-    <!--<test name="Template-Test" preserve-order="true" verbose="2">-->
-        <!--<packages>-->
-            <!--<package name="org.wso2.carbon.esb.template"/>-->
-        <!--</packages>-->
-    <!--</test>-->
+    <test name="Server-Startup-verification" preserve-order="true" verbose="2">
+        <classes>
+            <class name="org.wso2.carbon.esb.ServerStartupTestCase"/>
+        </classes>
+    </test>
+
+    <test name="Resource-MediaType-Test" preserve-order="true" verbose="2">
+        <packages>
+            <package name="org.wso2.carbon.esb.resource.test.*"/>
+        </packages>
+    </test>
+
+    <test name="GZIP-Compression-Test" preserve-order="true" verbose="2">
+        <packages>
+            <package name="org.wso2.carbon.esb.compression.test.gzip.*"/>
+        </packages>
+    </test>
+
+    <test name="SecureVault-Test" preserve-order="true" verbose="2">
+        <packages>
+            <package name="org.wso2.carbon.esb.securevalut.test.*"/>
+        </packages>
+    </test>
+
+    <test name="Scenario-health-care" preserve-order="true" verbose="2">
+        <packages>
+            <package name="org.wso2.carbon.esb.scenarios.test.healthcare.*"/>
+        </packages>
+    </test>
+
+    <test name="Test-Multiple-servers" preserve-order="true" verbose="2">
+        <classes>
+            <class name="org.wso2.carbon.esb.test.servers.CarbonTestServerManager"/>
+            <class name="org.wso2.carbon.esb.test.servers.NewInstanceTestCase"/>
+            <class name="org.wso2.carbon.esb.test.servers.OSGIUnsatisfiedServerBundlesTestCase">
+		<methods>
+                    <exclude name=".*"/>
+                </methods>
+	    </class>
+        </classes>
+    </test>
+
+    <test name="PostRequest-Test" preserve-order="true" verbose="2">
+        <packages>
+            <package name="org.wso2.carbon.esb.synapse.common.formatters"/>
+        </packages>
+    </test>
+    <!-- Test are not written correctly need to review the pr
+          https://github.com/wso2/product-esb/commit/6785fc470085f258de2709c995955354bfa95b15#diff-c1a07fd98068afcfb9702a5f9f597270-->
+    <!--test name="Content-Type-Test" preserve-order="true" verbose="2">
+        <packages>
+            <package name="org.wso2.carbon.esb.contenttype.json.*"/>
+        </packages>
+    </test-->
+    <test name="Mediation-Stat-Test" preserve-order="true" verbose="2">
+        <packages>
+            <package name="org.wso2.carbon.esb.mediationstats.*"/>
+        </packages>
+    </test>
+
+    <test name="Eager-Loading-Test" preserve-order="true" verbose="2">
+        <packages>
+            <package name="org.wso2.carbon.esb.eager.loading"/>
+        </packages>
+    </test>
+
+    <test name="Template-Test" preserve-order="true" verbose="2">
+        <packages>
+            <package name="org.wso2.carbon.esb.template"/>
+        </packages>
+    </test>
 
     <test name="Stats-Test" preserve-order="true" verbose="2">
         <packages>
@@ -94,11 +94,11 @@
         </classes>
     </test>
 
-    <!--<test name="LocalEntry-Test" preserve-order="true" verbose="2">-->
-        <!--<packages>-->
-            <!--<package name="org.wso2.carbon.esb.localentry.test.*"/>-->
-        <!--</packages>-->
-    <!--</test>-->
+    <test name="LocalEntry-Test" preserve-order="true" verbose="2">
+        <packages>
+            <package name="org.wso2.carbon.esb.localentry.test.*"/>
+        </packages>
+    </test>
 
 
 </suite>