You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2018/05/01 17:59:56 UTC
svn commit: r1830702 - in
/uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc:
ph/Client.java ph/transport/JunitProtocolHandlerTestSuite.java
ph/transport/JunitTransportTestSuite.java
ps/service/JunitPullServiceTestSuite.java
Author: cwiklik
Date: Tue May 1 17:59:56 2018
New Revision: 1830702
URL: http://svn.apache.org/viewvc?rev=1830702&view=rev
Log:
UIMA-5756 modified tests to use AAE descriptor from src/test/resources
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/Client.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/transport/JunitProtocolHandlerTestSuite.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/transport/JunitTransportTestSuite.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/JunitPullServiceTestSuite.java
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/Client.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/Client.java?rev=1830702&r1=1830701&r2=1830702&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/Client.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/Client.java Tue May 1 17:59:56 2018
@@ -68,19 +68,7 @@ public class Client {
public void startJetty(boolean block) throws Exception {
this.block = block;
- /*
- // Create Server
- server = new Server(8080);
- ServletContextHandler context = new ServletContextHandler();
- ServletHolder defaultServ = new ServletHolder("default", DefaultServlet.class);
- defaultServ.setInitParameter("resourceBase",System.getProperty("user.dir"));
- defaultServ.setInitParameter("dirAllowed","true");
- context.addServlet(defaultServ,"/");
- server.setHandler(context);
-
- // Start Server
- server.start();
- */
+
QueuedThreadPool threadPool = new QueuedThreadPool();
if (maxThreads < threadPool.getMinThreads()) {
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/transport/JunitProtocolHandlerTestSuite.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/transport/JunitProtocolHandlerTestSuite.java?rev=1830702&r1=1830701&r2=1830702&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/transport/JunitProtocolHandlerTestSuite.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/transport/JunitProtocolHandlerTestSuite.java Tue May 1 17:59:56 2018
@@ -26,7 +26,6 @@ import java.util.concurrent.ScheduledThr
import org.apache.uima.ducc.ph.Client;
import org.apache.uima.ducc.ps.ServiceThreadFactory;
-import org.apache.uima.ducc.ps.net.iface.ITransport;
import org.apache.uima.ducc.ps.service.IService;
import org.apache.uima.ducc.ps.service.errors.ServiceException;
import org.apache.uima.ducc.ps.service.errors.ServiceInitializationException;
@@ -66,8 +65,7 @@ public class JunitProtocolHandlerTestSui
IServiceTransport transport =
initializeTransport();
- String analysisEngineDescriptor =
- "/users/cwiklik/releases/builds/uima-as/trunk/target/checkout/target/apache-uima-as-2.10.3/examples/descriptors/analysis_engine/PersonTitleAnnotator.xml";
+ String analysisEngineDescriptor = "TestAAE";
UimaServiceProcessor processor =
new UimaServiceProcessor(analysisEngineDescriptor);
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/transport/JunitTransportTestSuite.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/transport/JunitTransportTestSuite.java?rev=1830702&r1=1830701&r2=1830702&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/transport/JunitTransportTestSuite.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ph/transport/JunitTransportTestSuite.java Tue May 1 17:59:56 2018
@@ -54,19 +54,7 @@ public class JunitTransportTestSuite {
@Before
public void startJetty() throws Exception
{
- /*
- // Create Server
- server = new Server(8080);
- ServletContextHandler context = new ServletContextHandler();
- ServletHolder defaultServ = new ServletHolder("default", DefaultServlet.class);
- defaultServ.setInitParameter("resourceBase",System.getProperty("user.dir"));
- defaultServ.setInitParameter("dirAllowed","true");
- context.addServlet(defaultServ,"/");
- server.setHandler(context);
- // Start Server
- server.start();
- */
QueuedThreadPool threadPool = new QueuedThreadPool();
if (maxThreads < threadPool.getMinThreads()) {
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/JunitPullServiceTestSuite.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/JunitPullServiceTestSuite.java?rev=1830702&r1=1830701&r2=1830702&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/JunitPullServiceTestSuite.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/JunitPullServiceTestSuite.java Tue May 1 17:59:56 2018
@@ -37,14 +37,12 @@ public class JunitPullServiceTestSuite e
@Test
public void testPullService() throws Exception {
int scaleout = 2;
- //super.startJetty(false); // don't block
- String analysisEngineDescriptor =
- "/users/cwiklik/releases/builds/uima-as/trunk/target/checkout/target/apache-uima-as-2.10.3/examples/descriptors/analysis_engine/NamesAndGovernmentOfficials_TAE.xml";
+ super.startJetty(false); // don't block
+ String analysisEngineDescriptor = "TestAAE";
IServiceProcessor processor = new
UimaServiceProcessor(analysisEngineDescriptor);
- String tasURL = "http://192.168.6.65:8088/test";
- //"http://localhost:8080/test";
+ String tasURL = "http://localhost:8080/test";
IService service = PullServiceStepBuilder.newBuilder().withProcessor(processor)
.withClientURL(tasURL).withType("Note Service").withScaleout(scaleout)
@@ -68,8 +66,7 @@ public class JunitPullServiceTestSuite e
public void testPullServiceTimeout() throws Exception {
super.startJetty(true); // true=client blocks all POST requests
int scaleout = 12;
- String analysisEngineDescriptor =
- "/users/cwiklik/releases/builds/uima-as/trunk/target/checkout/target/apache-uima-as-2.10.3/examples/descriptors/analysis_engine/NamesAndGovernmentOfficials_TAE.xml";
+ String analysisEngineDescriptor = "TestAAE";
IServiceProcessor processor = new
UimaServiceProcessor(analysisEngineDescriptor);
@@ -95,13 +92,12 @@ public class JunitPullServiceTestSuite e
throw e;
}
}
-
+ /*
@Test
public void testPullServiceBadClientURL() throws Exception {
int scaleout = 2;
super.startJetty(false); // don't block
- String analysisEngineDescriptor =
- "/users/cwiklik/releases/builds/uima-as/trunk/target/checkout/target/apache-uima-as-2.10.3/examples/descriptors/analysis_engine/NamesAndGovernmentOfficials_TAE.xml";
+ String analysisEngineDescriptor = "TestAAE";
IServiceProcessor processor = new
UimaServiceProcessor(analysisEngineDescriptor);
@@ -122,6 +118,7 @@ public class JunitPullServiceTestSuite e
throw e;
}
}
+ */
class MyTimerTask extends TimerTask {
final IService service;
final Timer fTimer;