svn commit: r1770048 - in /uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima: ae/noop/NoOpAnnotator.java ee/test/TestUimaASExtended.java

[cw...@apache.org]

Author: cwiklik
Date: Wed Nov 16 19:54:33 2016
New Revision: 1770048

URL: http://svn.apache.org/viewvc?rev=1770048&view=rev
Log:
UIMA-5180 Added new test

Modified:
    uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java
    uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java?rev=1770048&r1=1770047&r2=1770048&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java Wed Nov 16 19:54:33 2016
@@ -81,8 +81,6 @@ public class NoOpAnnotator extends CasAn
   }
 
   public void collectionProcessComplete() throws AnalysisEngineProcessException {
-    System.out
-            .println("NoOpAnnotator.collectionProcessComplete() Called -------------------------------------");
 
     if (cpcDelay > 0) {
       try {
@@ -116,7 +114,8 @@ public class NoOpAnnotator extends CasAn
                 + "th time, delaying Response For:" + processDelay + " millis");
         synchronized (this) {
           try {
-            wait(processDelay);
+           wait(processDelay);
+           // Thread.sleep((long)(Math.random() * processDelay));
           } catch (InterruptedException e) {
           }
         }

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java?rev=1770048&r1=1770047&r2=1770048&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java Wed Nov 16 19:54:33 2016
@@ -134,7 +134,23 @@ public class TestUimaASExtended extends
       
       String sid1= deployService(uimaAsEngine1, relativePath + "/Deploy_AggregateMultiplierWith30SecDelay.xml");
       String sid2 = deployService(uimaAsEngine2, relativePath + "/Deploy_AggregateMultiplierWith30SecDelay.xml");
+      
+      uimaAsEngine1.undeploy(sid1);
+      
+      uimaAsEngine2.undeploy(sid2);
+    }
+    
+    @Test
+    public void testClientWithPrimitives() throws Exception {
+      System.out.println("-------------- testClientRecoveryFromBrokerFailure -------------");
+      System.setProperty("BrokerURL", broker.getConnectorByName(DEFAULT_BROKER_URL_KEY).getUri().toString());
+
+      BaseUIMAAsynchronousEngine_impl uimaAsEngine1 = new BaseUIMAAsynchronousEngine_impl();
+      BaseUIMAAsynchronousEngine_impl uimaAsEngine2 = new BaseUIMAAsynchronousEngine_impl();
 
+      String sid1= deployService(uimaAsEngine1, relativePath + "/Deploy_NoOpAnnotator.xml");
+      String sid2 = deployService(uimaAsEngine2, relativePath + "/Deploy_NoOpAnnotator.xml");
+      
       uimaAsEngine1.undeploy(sid1);
       
       uimaAsEngine2.undeploy(sid2);
@@ -1061,7 +1077,13 @@ public class TestUimaASExtended extends
   //      System.out.println("UIMA AS Client Sending CAS#" + (i + 1) + " Request to a Service");
         try {
           uimaAsEngine.sendAndReceiveCAS(cas,componentMetricsList);
-  //        System.out.println("-------> Client Received Performance Metrics of Size:"+componentMetricsList.size());
+          System.out.println("-------> Client Received Performance Metrics of Size:"+componentMetricsList.size());
+          for( AnalysisEnginePerformanceMetrics m :componentMetricsList ) {
+        	  System.out.println(".............. Component:"+m.getName()+" AnalysisTime:"+m.getAnalysisTime());
+          }
+        	uimaAsEngine.sendCAS(cas);
+          System.out.println("----------------------------------------------------");
+          componentMetricsList.clear();
         } catch( Exception e) {
           errorCount++;
         } finally {
@@ -2420,6 +2442,7 @@ public class TestUimaASExtended extends
     deployService(eeUimaEngine, relativePath + "/Deploy_ScaledPrimitiveAggregateAnnotator.xml");
     runTest(null, eeUimaEngine, String.valueOf(getMasterConnectorURI(broker)), "TopLevelTaeQueue",
             5, PROCESS_LATCH);
+    System.out.println(eeUimaEngine.getPerformanceReport());
   }
 
   @Test