Make CreateRequest compatible with the Java version

2012-06-26 09:33:37 -04:00
parent 4b5bc38835
commit 7e8312d1ee
10 changed files with 465 additions and 385 deletions
--- a/testApp/client/testCreateRequest.cpp
+++ b/testApp/client/testCreateRequest.cpp
@@ -16,174 +16,125 @@
 using namespace epics::pvData;
 using namespace epics::pvAccess;

+class RequesterImpl : public Requester,
+     public std::tr1::enable_shared_from_this<RequesterImpl>
+{
+public:
+
+    virtual String getRequesterName()
+    {
+        return "RequesterImpl";
+    };
+
+    virtual void message(String message,MessageType messageType)
+    {
+        std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
+    }
+};
+
 void testCreateRequest() {
-	printf("testCreateRequest... ");
+    printf("testCreateRequest... \n");
+    Requester::shared_pointer requester(new RequesterImpl());
+    CreateRequest::shared_pointer  createRequest = getCreateRequest();

-	String out;
-	String request = "";
-	std::tr1::shared_ptr<PVStructure> pvRequest(getCreateRequest()->createRequest(request));
-	assert(pvRequest);
-	out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;
+    String out;
+    String request = "";
+        std::cout << std::endl << String("request") <<std::endl << request <<std::endl;
+        epics::pvData::PVStructure::shared_pointer pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get());
+    out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;

-	request = "alarm,timeStamp,power.value";
-	pvRequest = getCreateRequest()->createRequest(request);
-	assert(pvRequest);
-	out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;
+    request = "alarm,timeStamp,power.value";
+        std::cout << std::endl << String("request") <<std::endl << request <<std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get());
+    out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;

-	request = "record[process=true]field(alarm,timeStamp,power.value)";
-	pvRequest = getCreateRequest()->createRequest(request);
-	assert(pvRequest);
-	out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;
+    request = "record[process=true]field(alarm,timeStamp,power.value)";
+        std::cout << std::endl << String("request") <<std::endl << request <<std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get());
+    out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;

-	request = "record[process=true]field(alarm,timeStamp[algorithm=onChange,causeMonitor=false],power{power.value,power.alarm})";
-	pvRequest = getCreateRequest()->createRequest(request);
-	assert(pvRequest);
-	out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;
+    request = "record[process=true]field(alarm,timeStamp[algorithm=onChange,causeMonitor=false],power{value,alarm})";
+        std::cout << String("request") <<std::endl << request <<std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get());
+    out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;

-	request = "record[process=true,xxx=yyy]field(alarm,timeStamp[shareData=true],power.value)";
-	pvRequest = getCreateRequest()->createRequest(request);
-	assert(pvRequest);
-	out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;
+    request = "record[process=true,xxx=yyy]field(alarm,timeStamp[shareData=true],power.value)";
+        std::cout << String("request") <<std::endl << request <<std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get());
+    out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;

-	request = String("record[process=true,xxx=yyy]")
-    			+ "putField(power.value)"
-    			+ "getField(alarm,timeStamp,power{power.value,power.alarm},"
-    			+ "current{current.value,current.alarm},voltage{voltage.value,voltage.alarm})";
-	pvRequest = getCreateRequest()->createRequest(request);
-	assert(pvRequest);
-	out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;
+    request = String("record[process=true,xxx=yyy]")
+        + "putField(power.value)"
+    	+ "getField(alarm,timeStamp,power{value,alarm},"
+    	+ "current{value,alarm},voltage{value,alarm})";
+        std::cout << String("request") <<std::endl << request <<std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get());
+    out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;

-	request = String("record[process=true,xxx=yyy]")
-    			+ "putField(power.value)"
-    			+ "getField(alarm,timeStamp,power{power.value,power.alarm},"
-    			+ "current{current.value,current.alarm},voltage{voltage.value,voltage.alarm},"
-    			+ "ps0{"
-    			+ "ps0.alarm,ps0.timeStamp,power{ps0.power.value,ps0.power.alarm},"
-    			+ "current{ps0.current.value,ps0.current.alarm},voltage{ps0.voltage.value,ps0.voltage.alarm}},"
-    			+ "ps1{"
-    			+ "ps1.alarm,ps1.timeStamp,power{ps1.power.value,ps1.power.alarm},"
-    			+ "current{ps1.current.value,ps1.current.alarm},voltage{ps1.voltage.value,ps1.voltage.alarm}"
-    			+ "})";
-	pvRequest = getCreateRequest()->createRequest(request);
-	assert(pvRequest);
-	out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;
+    request = String("field(alarm,timeStamp,supply{")
+    	+ "0{voltage.value,current.value,power.value},"
+        + "1{voltage.value,current.value,power.value}"
+        + "})";
+        std::cout << String("request") <<std::endl << request <<std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get());
+    out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;

-	request = "a{b{c{d}}}";
-	pvRequest = getCreateRequest()->createRequest(request);
-	assert(pvRequest);
-	out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;
+    request = String("record[process=true,xxx=yyy]")
+    	+ "putField(power.value)"
+    	+ "getField(alarm,timeStamp,power{value,alarm},"
+    	+ "current{value,alarm},voltage{value,alarm},"
+    	+ "ps0{alarm,timeStamp,power{value,alarm},current{value,alarm},voltage{value,alarm}},"
+        + "ps1{alarm,timeStamp,power{value,alarm},current{value,alarm},voltage{value,alarm}}"
+        + ")";
+        std::cout << String("request") <<std::endl << request <<std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get());
+    out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;

-	request = "record[process=true,xxx=yyy]field(alarm,timeStamp[shareData=true],power.value";
-	std::cout << std::endl << "Error Expected for next call!!" << std::endl;
-	try
-	{
-		pvRequest = getCreateRequest()->createRequest(request);
-		assert(false);
-	}
-	catch(std::exception& e)
-	{
-		std::cout << e.what() << std::endl;
-	}
-
-	request = String("record[process=true,xxx=yyy]")
-    			+ "putField(power.value)"
-    			+ "getField(alarm,timeStamp,power{power.value,power.alarm},"
-    			+ "current{current.value,current.alarm},voltage{voltage.value,voltage.alarm},"
-    			+ "ps0{"
-    			+ "ps0.alarm,ps0.timeStamp,power{ps0.power.value,ps0.power.alarm},"
-    			+ "current{ps0.current.value,ps0.current.alarm},voltage{ps0.voltage.value,ps0.voltage.alarm}},"
-    			+ "ps1{"
-    			+ "ps1.alarm,ps1.timeStamp,power{ps1.power.value,ps1.power.alarm},"
-    			+ "current{ps1.current.value,ps1.current.alarm},voltage{ps1.voltage.value,ps1.voltage.alarm}"
-    			+ ")";
-	std::cout << std::endl << "Error Expected for next call!!" << std::endl;
-	try
-	{
-		pvRequest = getCreateRequest()->createRequest(request);
-		assert(false);
-	}
-	catch(std::exception& e)
-	{
-		std::cout << e.what() << std::endl;
-	}
-
-
-	request = "record[process=true,power.value";
-	std::cout << std::endl << "Error Expected for next call!!" << std::endl;
-	try
-	{
-		pvRequest = getCreateRequest()->createRequest(request);
-		assert(false);
-	}
-	catch(std::exception& e)
-	{
-		std::cout << e.what() << std::endl;
-	}
-
-
-	request = "field(power.value";
-	std::cout << std::endl << "Error Expected for next call!!" << std::endl;
-	try
-	{
-		pvRequest = getCreateRequest()->createRequest(request);
-		assert(false);
-	}
-	catch(std::exception& e)
-	{
-		std::cout << e.what() << std::endl;
-	}
-
-
-	request = "putField(power.value";
-	std::cout << std::endl << "Error Expected for next call!!" << std::endl;
-	try
-	{
-		pvRequest = getCreateRequest()->createRequest(request);
-		assert(false);
-	}
-	catch(std::exception& e)
-	{
-		std::cout << e.what() << std::endl;
-	}
-
-
-	request = "getField(power.value";
-	std::cout << std::endl << "Error Expected for next call!!" << std::endl;\
-	try
-	{
-		pvRequest = getCreateRequest()->createRequest(request);
-		assert(false);
-	}
-	catch(std::exception& e)
-	{
-		std::cout << e.what() << std::endl;
-	}
-
-
-	request = "record[process=true=power.value]";
-	std::cout << std::endl << "Error Expected for next call!!" << std::endl;
-	try
-	{
-		pvRequest = getCreateRequest()->createRequest(request);
-		assert(false);
-	}
-	catch(std::exception& e)
-	{
-		std::cout << e.what() << std::endl;
-	}
-
-	printf("PASSED\n");
+    request = "a{b{c{d}}}";
+        std::cout << String("request") <<std::endl << request <<std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get());
+    out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;

+    request = "record[process=true,xxx=yyy]field(alarm,timeStamp[shareData=true],power.value";
+        std::cout << String("request") <<std::endl << request <<std::endl;
+    std::cout << std::endl << "Error Expected for next call!!" << std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get()==NULL);
+    request = String("record[process=true,xxx=yyy]")
+        + "putField(power.value)"
+        + "getField(alarm,timeStamp,power{value,alarm},"
+        + "current{value,alarm},voltage{value,alarm},"
+        + "ps0{alarm,timeStamp,power{value,alarm},current{value,alarm},voltage{value,alarm}},"
+        + "ps1{alarm,timeStamp,power{value,alarm},current{value,alarm},voltage{value,alarm}"
+        + ")";
+        std::cout << String("request") <<std::endl << request <<std::endl;
+    std::cout << std::endl << "Error Expected for next call!!" << std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get()==NULL);
+    request = "record[process=true,power.value";
+        std::cout << String("request") <<std::endl << request <<std::endl;
+    std::cout << std::endl << "Error Expected for next call!!" << std::endl;
+    pvRequest = getCreateRequest()->createRequest(request,requester);
+    assert(pvRequest.get()==NULL);
 }

 int main(int argc,char *argv[])
 {
-	testCreateRequest();
+    testCreateRequest();

-	std::cout << "-----------------------------------------------------------------------" << std::endl;
-	epicsExitCallAtExits();
-	CDRMonitor::get().show(stdout, true);
-	return 0;
+    std::cout << "-----------------------------------------------------------------------" << std::endl;
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(stdout, true);
+    return 0;
 }