[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Oct 8 09:04:59 CDT 2010
branch "master" has been updated
via 59a3dd89ae5ab9d7ca544695ac85c08405f21250 (commit)
from 279a390c88364bfe694abd1feeb01003ee4226d0 (commit)
Summary of changes:
config/test_channel.conf | 26 ++++++++++++++++++++++++++
slice | 2 +-
src/ConsoleDriver.cpp | 2 ++
src/ConsoleDriver.h | 6 ++++++
src/MediaEchoThread.cpp | 2 ++
src/MediaEchoThread.h | 7 +++++++
src/MediaSession.cpp | 2 ++
src/MediaSession.h | 8 +++++++-
src/Service.cpp | 3 +++
src/TestEndpoint.cpp | 6 ++++++
src/main.cpp | 7 +++++--
11 files changed, 67 insertions(+), 4 deletions(-)
create mode 100644 config/test_channel.conf
- Log -----------------------------------------------------------------
commit 59a3dd89ae5ab9d7ca544695ac85c08405f21250
Author: Brent Eagles <beagles at digium.com>
Date: Fri Oct 8 11:33:22 2010 -0230
Moving some classes into explicit test session manager namespaces or
anonymous namespaces to avoid issues collisions.
Added config file for sparking up the test "session manager" in
a standalone icebox instance.
diff --git a/config/test_channel.conf b/config/test_channel.conf
new file mode 100644
index 0000000..d1e7bcd
--- /dev/null
+++ b/config/test_channel.conf
@@ -0,0 +1,26 @@
+IceBox.InheritProperties=1
+HydraIceStorm.InstanceName=HydraIceStorm
+HydraIceStorm.TopicManager.Endpoints=default -p 55555
+HydraIceStorm.Publish.Endpoints=default -p 55556
+HydraIceStorm.Transient=1
+
+LoggerAdapter.Endpoints=default
+AsteriskSCF.LoggingService.Endpoints=default
+AsteriskSCF.LoggingClient.Endpoints=default
+AsteriskSCF.TestChannelService.Endpoints=default -p 55560
+
+LocatorService.Proxy=LocatorService:default -p 55558
+
+ServiceLocatorManagementAdapter.Endpoints=tcp -p 55557
+ServiceLocatorAdapter.Endpoints=tcp -p 55558
+
+ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 55557
+
+TopicManager.Proxy=HydraIceStorm/TopicManager:default -p 55555
+
+IceBox.Service.Logger=logging-service:createLoggingService
+IceBox.Service.TestServiceLocator=service_locator:create
+IceBox.Service.TestChannel=test_channel:create
+
+IceBox.LoadOrder=Logger TestServiceLocator TestChannel
+IceBox.ServiceManager.Endpoints=default -p 56000
diff --git a/slice b/slice
index 200c642..03ea08a 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 200c642ce49b3daabeabe2d8ad105bfa980fec02
+Subproject commit 03ea08a0f749b5f36ae4dc36d25493689f9e273c
diff --git a/src/ConsoleDriver.cpp b/src/ConsoleDriver.cpp
index a2ca5da..622ac10 100644
--- a/src/ConsoleDriver.cpp
+++ b/src/ConsoleDriver.cpp
@@ -10,6 +10,8 @@
#include "ConsoleDriver.h"
+using namespace AsteriskSCF::TestUtil;
+
#ifndef _WIN32
#include <unistd.h>
int _kbhit()
diff --git a/src/ConsoleDriver.h b/src/ConsoleDriver.h
index 9746b71..178ad24 100644
--- a/src/ConsoleDriver.h
+++ b/src/ConsoleDriver.h
@@ -12,6 +12,10 @@
#include <string>
#include <CommandsIf.h>
+namespace AsteriskSCF
+{
+namespace TestUtil
+{
class ConsoleDriver : virtual public IceUtil::Thread
{
public:
@@ -28,3 +32,5 @@ private:
};
typedef IceUtil::Handle<ConsoleDriver> ConsoleDriverPtr;
+} /* End of namespace TestUtil */
+} /* End of namespace AsteriskSCF */
diff --git a/src/MediaEchoThread.cpp b/src/MediaEchoThread.cpp
index 155e59f..7aa8217 100644
--- a/src/MediaEchoThread.cpp
+++ b/src/MediaEchoThread.cpp
@@ -7,6 +7,8 @@
*/
#include "MediaEchoThread.h"
+using namespace AsteriskSCF::TestUtil;
+
MediaEchoThread::MediaEchoThread():
mDone(false),
mPaused(true)
diff --git a/src/MediaEchoThread.h b/src/MediaEchoThread.h
index 9f350b5..7bba4d3 100644
--- a/src/MediaEchoThread.h
+++ b/src/MediaEchoThread.h
@@ -9,6 +9,10 @@
#include <Ice/Ice.h>
#include <Media/MediaIf.h>
+namespace AsteriskSCF
+{
+namespace TestUtil
+{
//
// A thread that handles taking frames that were written to the sink
// implementation and writing them out to another sink (usually the one
@@ -38,3 +42,6 @@ private:
bool mPaused;
};
typedef IceUtil::Handle<MediaEchoThread> MediaEchoThreadPtr;
+
+} /* end of namespace TestUtil */
+} /* end of namespace AsteriskSCF */
diff --git a/src/MediaSession.cpp b/src/MediaSession.cpp
index 1a45cc5..2539ffd 100644
--- a/src/MediaSession.cpp
+++ b/src/MediaSession.cpp
@@ -7,6 +7,8 @@
*/
#include "MediaSession.h"
+using namespace AsteriskSCF::TestUtil;
+
//
// The test media session echoes media received on its sink object to its
// associated source object.
diff --git a/src/MediaSession.h b/src/MediaSession.h
index a49c0d1..191dfa6 100644
--- a/src/MediaSession.h
+++ b/src/MediaSession.h
@@ -15,7 +15,10 @@
//
// TODO: Inline methods should be moved into CPP file.
//
-
+namespace AsteriskSCF
+{
+namespace TestUtil
+{
//
// Test Sink.
//
@@ -172,3 +175,6 @@ private:
};
typedef IceUtil::Handle<MediaSessionI> MediaSessionIPtr;
+
+} /* End of namespace TestUtil */
+} /* End of namespace AsteriskSCF */
diff --git a/src/Service.cpp b/src/Service.cpp
index 9fe103e..6463ffd 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -13,6 +13,8 @@
#include "Logger.h"
#include "TestEndpoint.h"
+namespace
+{
class TestChannelDriver : public IceBox::Service
{
public:
@@ -27,6 +29,7 @@ private:
Ice::ObjectAdapterPtr mAdapter;
AsteriskSCF::Core::Discovery::V1::ServiceManagementPrx mServiceManagement;
};
+}
TestChannelDriver::TestChannelDriver()
{
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index b49bf05..d90d487 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -23,6 +23,11 @@
#include "CommandsIf.h"
+using namespace AsteriskSCF::TestUtil;
+
+namespace
+{
+
//
// Forward declarations.
//
@@ -471,6 +476,7 @@ public:
private:
EndpointManagerPtr mMgr;
};
+}
namespace AsteriskSCF
{
diff --git a/src/main.cpp b/src/main.cpp
index 1228126..dbf4e94 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,6 +10,8 @@
#include "ConsoleDriver.h"
#include <iostream>
+namespace
+{
class ConsoleApp : public Ice::Application
{
public:
@@ -21,8 +23,9 @@ protected:
int run(int argc, char* argv[]);
void interruptCallback(int);
- ConsoleDriverPtr mConsoleDriver;
+ AsteriskSCF::TestUtil::ConsoleDriverPtr mConsoleDriver;
};
+}
int ConsoleApp::run(int, char**)
@@ -36,7 +39,7 @@ int ConsoleApp::run(int, char**)
std::cerr << "Unable to access command interface, check configuration and if the service is running." << std::endl;
return EXIT_FAILURE;
}
- mConsoleDriver = new ConsoleDriver;
+ mConsoleDriver = new AsteriskSCF::TestUtil::ConsoleDriver;
mConsoleDriver->setHandler(commandIf);
mConsoleDriver->start();
return EXIT_SUCCESS;
-----------------------------------------------------------------------
--
asterisk-scf/integration/test_channel.git
More information about the asterisk-scf-commits
mailing list