From 7ec992906e8ffeb8515335980ba4a4f46c7cdd2c Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <unknown>
Date: Mon, 12 Nov 2012 21:52:55 +0100
Subject: [PATCH] tests apps fixed to used new testServer channel names, test
 prefix

---
 configure/RELEASE                       | 4 ++--
 testApp/remote/testChannelConnect.cpp   | 2 +-
 testApp/remote/testGetPerformance.cpp   | 2 +-
 testApp/remote/testRemoteClientImpl.cpp | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure/RELEASE b/configure/RELEASE
index 44f2ca0..050bcc3 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -26,8 +26,8 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 
 # EPICS_BASE usually appears last so other apps can override stuff:
 
-#PVDATA=/opt/epics/pvDataCPP
-#EPICS_BASE=/opt/epics/base
+PVDATA=/Users/msekoranja/b2/pvDataCPP
+EPICS_BASE=/opt/epics/base
 
 #GTEST=/opt/epics/gtest
 
diff --git a/testApp/remote/testChannelConnect.cpp b/testApp/remote/testChannelConnect.cpp
index 6f3aa67..0cd8f37 100644
--- a/testApp/remote/testChannelConnect.cpp
+++ b/testApp/remote/testChannelConnect.cpp
@@ -79,7 +79,7 @@ int main()
         char buf[16];
         for (int i = 0; i < N_CHANNELS; i++)
         {
-            sprintf(buf, "record%d", (i+1));
+            sprintf(buf, "test%d", (i+1));
             channels[i] = provider->createChannel(buf, channelRequester);
         }
         
diff --git a/testApp/remote/testGetPerformance.cpp b/testApp/remote/testGetPerformance.cpp
index 9ab2f03..afe2add 100644
--- a/testApp/remote/testGetPerformance.cpp
+++ b/testApp/remote/testGetPerformance.cpp
@@ -304,7 +304,7 @@ return -1;
     char buf[64];
     for (int i = 0; i < CHANNELS; i++)
     {
-        sprintf(buf, "array%d_%d", ARRAY_SIZE, i);
+        sprintf(buf, "testArray%d_%d", ARRAY_SIZE, i);
         pvs.push_back(buf);
         //printf("%s\n", buf);
     }
diff --git a/testApp/remote/testRemoteClientImpl.cpp b/testApp/remote/testRemoteClientImpl.cpp
index f2da5fc..c97ca3b 100644
--- a/testApp/remote/testRemoteClientImpl.cpp
+++ b/testApp/remote/testRemoteClientImpl.cpp
@@ -458,12 +458,12 @@ int main()
     ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pvAccess");
 
     ChannelFindRequester::shared_pointer findRequester(new ChannelFindRequesterImpl());
-    ChannelFind::shared_pointer channelFind = provider->channelFind("something", findRequester);
+    ChannelFind::shared_pointer channelFind = provider->channelFind("testSomething", findRequester);
     epicsThreadSleep ( 1.0 );
     //channelFind->destroy();
 
     ChannelRequester::shared_pointer channelRequester(new ChannelRequesterImpl());
-    Channel::shared_pointer channel = provider->createChannel("structureArrayTest", channelRequester);
+    Channel::shared_pointer channel = provider->createChannel("testStructureArrayTest", channelRequester);
     epicsThreadSleep ( 1.0 );
     channel->printInfo();