Fixes to JS test scripts and more work on iOS C++ controller

4 files changed, 88 insertions, 443 deletions

diff --git a/cpp/test/ios/controller/Classes/C++11-Info.plist b/cpp/test/ios/controller/Classes/C++11-Info.plist
deleted file mode 100644
index d0524738680..00000000000
--- a/cpp/test/ios/controller/Classes/C++11-Info.plist
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/cpp/test/ios/controller/Classes/ViewController.h b/cpp/test/ios/controller/Classes/ViewController.h
index 82e72ca876a..1ce9af06153 100644
--- a/cpp/test/ios/controller/Classes/ViewController.h
+++ b/cpp/test/ios/controller/Classes/ViewController.h
@@ -9,10 +9,16 @@
 
 #import <UIKit/UIKit.h>
 
-@interface ViewController : UIViewController
+@protocol ViewController
+-(void) print:(NSString*)msg;
+-(void) println:(NSString*)msg;
+@end
+
+@interface ViewController : UIViewController<ViewController>
 {
 @private
     IBOutlet UITextView* output;
+    void (*stopController)(id<ViewController>);
 }
 @end
 
diff --git a/cpp/test/ios/controller/Classes/ViewController.m b/cpp/test/ios/controller/Classes/ViewController.m
new file mode 100644
index 00000000000..10f99f408c6
--- /dev/null
+++ b/cpp/test/ios/controller/Classes/ViewController.m
@@ -0,0 +1,81 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#import "ViewController.h"
+
+@implementation ViewController
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    NSString* bundlePath = [[NSBundle mainBundle] privateFrameworksPath];
+#ifdef ICE_CPP11_MAPPING
+    const char* bundle = "Cpp11ControllerBundle.bundle";
+#else
+    const char* bundle = "Cpp98ControllerBundle.bundle";
+#endif
+    bundlePath = [bundlePath stringByAppendingPathComponent:[NSString stringWithUTF8String:bundle]];
+    
+    NSURL* bundleURL = [NSURL fileURLWithPath:bundlePath];
+    CFBundleRef handle = CFBundleCreate(NULL, (CFURLRef)bundleURL);
+    if(!handle)
+    {
+        [self println:[NSString stringWithFormat:@"Could not find bundle %@", bundlePath]];
+        return;
+    }
+    
+    CFErrorRef error = nil;
+    Boolean loaded = CFBundleLoadExecutableAndReturnError(handle, &error);
+    if(error != nil || !loaded)
+    {
+        [self println:[(__bridge NSError *)error description]];
+        return;
+    }
+    
+    void (*startController)(id<ViewController>) = CFBundleGetFunctionPointerForName(handle, CFSTR("startController"));
+    if(startController == 0)
+    {
+        NSString* err = [NSString stringWithFormat:@"Could not get function pointer startController from bundle %@",
+                         bundlePath];
+        [self println:err];
+        return;
+    }
+
+    stopController = CFBundleGetFunctionPointerForName(handle, CFSTR("stopController"));
+    if(stopController == 0)
+    {
+        NSString* err = [NSString stringWithFormat:@"Could not get function pointer stopController from bundle %@",
+                         bundlePath];
+        [self println:err];
+        return;
+    }
+
+    
+    (*startController)(self);
+}
+- (void) dealloc
+{
+    (*stopController)(self);
+}
+-(void) write:(NSString*)msg
+{
+    [output insertText:msg];
+    [output layoutIfNeeded];
+    [output scrollRangeToVisible:NSMakeRange([output.text length] - 1, 1)];
+}
+-(void) print:(NSString*)msg
+{
+    [self performSelectorOnMainThread:@selector(write:) withObject:msg waitUntilDone:NO];
+}
+-(void) println:(NSString*)msg
+{
+    [self print:[msg stringByAppendingString:@"\n"]];
+}
+@end
diff --git a/cpp/test/ios/controller/Classes/ViewController.mm b/cpp/test/ios/controller/Classes/ViewController.mm
deleted file mode 100644
index e1d2e95fa32..00000000000
--- a/cpp/test/ios/controller/Classes/ViewController.mm
+++ /dev/null
@@ -1,397 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#import "ViewController.h"
-
-#include <Ice/Ice.h>
-#include <Controller.h>
-#include <TestHelper.h>
-
-#include <dlfcn.h>
-
-using namespace std;
-using namespace Test::Common;
-
-@interface ViewController()
--(void) print:(NSString*)msg;
--(void) println:(NSString*)msg;
-@end
-
-
-namespace
-{
-
-typedef int (*MAIN_ENTRY_POINT)(int argc, char** argv, Test::MainHelper* helper);
-typedef int (*SHUTDOWN_ENTRY_POINT)();
-
-class MainHelperI : public Test::MainHelper, private IceUtil::Monitor<IceUtil::Mutex>, public IceUtil::Thread
-{
-public:
-
-    MainHelperI(ViewController*, const string&, const StringSeq&);
-    virtual ~MainHelperI();
-
-    virtual void serverReady();
-    virtual void shutdown();
-    virtual void waitForCompleted() {}
-    virtual bool redirect();
-    virtual void print(const std::string&);
-
-    virtual void run();
-
-    void completed(int);
-    void waitReady(int) const;
-    int waitSuccess(int) const;
-    string getOutput() const;
-
-private:
-
-    ViewController* _controller;
-    std::string _dll;
-    StringSeq _args;
-    CFBundleRef _handle;
-    SHUTDOWN_ENTRY_POINT _dllTestShutdown;
-    bool _ready;
-    bool _completed;
-    int _status;
-    std::ostringstream _out;
-};
-
-class ProcessI : public Process
-{
-public:
-
-    ProcessI(ViewController*, MainHelperI*);
-    virtual ~ProcessI();
-
-    void waitReady(int, const Ice::Current&);
-    int waitSuccess(int, const Ice::Current&);
-    string terminate(const Ice::Current&);
-
-private:
-
-    ViewController* _controller;
-    IceUtil::Handle<MainHelperI> _helper;
-};
-
-class ProcessControllerI : public ProcessController
-{
-public:
-
-    ProcessControllerI(ViewController*);
-
-#ifdef ICE_CPP11_MAPPING
-    virtual shared_ptr<ProcessPrx>
-    start(string, string, StringSeq, const Ice::Current&);
-#else
-    virtual ProcessPrx
-    start(const string&, const string&, const StringSeq&, const Ice::Current&);
-#endif
-    
-private:
-
-    ViewController* _controller;
-};
-
-class ControllerHelper
-{
-public:
-
-    ControllerHelper(ViewController*);
-    virtual ~ControllerHelper();
-
-private:
-
-    Ice::CommunicatorPtr _communicator;
-};
-
-}
-
-MainHelperI::MainHelperI(ViewController* controller, const string& dll, const StringSeq& args) :
-    _controller(controller),
-    _dll(dll),
-    _args(args),
-    _ready(false),
-    _completed(false),
-    _status(0)
-{
-}
-
-MainHelperI::~MainHelperI()
-{
-    if(_handle)
-    {
-        CFBundleUnloadExecutable(_handle);
-    }
-}
-
-void
-MainHelperI::serverReady()
-{
-    Lock sync(*this);
-    _ready = true;
-    notifyAll();
-}
-
-void
-MainHelperI::shutdown()
-{
-    Lock sync(*this);
-    if(_completed)
-    {
-        return;
-    }
-
-    if(_dllTestShutdown)
-    {
-        _dllTestShutdown();
-    }
-}
-
-bool
-MainHelperI::redirect()
-{
-    return _dll.find("client") != string::npos || _dll.find("collocated") != string::npos;
-}
-
-void
-
-MainHelperI::print(const std::string& msg)
-{
-    _out << msg;
-}
-
-void
-MainHelperI::run()
-{
-    NSString* bundlePath = [[NSBundle mainBundle] privateFrameworksPath];
-
-    bundlePath = [bundlePath stringByAppendingPathComponent:[NSString stringWithUTF8String:_dll.c_str()]];
-
-    NSURL* bundleURL = [NSURL fileURLWithPath:bundlePath];
-    _handle = CFBundleCreate(NULL, (CFURLRef)bundleURL);
-    if(!_handle)
-    {
-        print([[NSString stringWithFormat:@"Could not find bundle %@", bundlePath] UTF8String]);
-        completed(EXIT_FAILURE);
-        return;
-    }
-
-    CFErrorRef error = nil;
-    Boolean loaded = CFBundleLoadExecutableAndReturnError(_handle, &error);
-    if(error != nil || !loaded)
-    {
-        print([[(__bridge NSError *)error description] UTF8String]);
-        completed(EXIT_FAILURE);
-        return;
-    }
-
-    void* sym = dlsym(_handle, "dllTestShutdown");
-    sym = CFBundleGetFunctionPointerForName(_handle, CFSTR("dllTestShutdown"));
-    if(sym == 0)
-    {
-        NSString* err = [NSString stringWithFormat:@"Could not get function pointer dllTestShutdown from bundle %@",
-                                  bundlePath];
-        print([err UTF8String]);
-        completed(EXIT_FAILURE);
-        return;
-    }
-    _dllTestShutdown = (SHUTDOWN_ENTRY_POINT)sym;
-
-    sym = CFBundleGetFunctionPointerForName(_handle, CFSTR("dllMain"));
-    if(sym == 0)
-    {
-        NSString* err = [NSString stringWithFormat:@"Could not get function pointer dllMain from bundle %@",
-                                  bundlePath];
-        print([err UTF8String]);
-        completed(EXIT_FAILURE);
-        return;
-    }
-
-    MAIN_ENTRY_POINT dllMain = (MAIN_ENTRY_POINT)sym;
-    char** argv = new char*[_args.size() + 1];
-    for(unsigned int i = 0; i < _args.size(); ++i)
-    {
-        argv[i] = const_cast<char*>(_args[i].c_str());
-    }
-    argv[_args.size()] = 0;
-    try
-    {
-        completed(dllMain(static_cast<int>(_args.size()), argv, this));
-    }
-    catch(const std::exception& ex)
-    {
-        print("unexpected exception while running `" + _args[0] + "':\n" + ex.what());
-    }
-    catch(...)
-    {
-        print("unexpected unknown exception while running `" + _args[0] + "'");
-    }
-    delete[] argv;
-}
-
-void
-MainHelperI::completed(int status)
-{
-    Lock sync(*this);
-    _completed = true;
-    _status = status;
-    notifyAll();
-}
-
-void
-MainHelperI::waitReady(int timeout) const
-{
-    Lock sync(*this);
-    while(!_ready && !_completed)
-    {
-        if(!timedWait(IceUtil::Time::seconds(timeout)))
-        {
-            throw ProcessFailedException("timed out waiting for the process to be ready");
-        }
-    }
-    if(_completed && _status == EXIT_FAILURE)
-    {
-        throw ProcessFailedException(_out.str());
-    }
-}
-
-int
-MainHelperI::waitSuccess(int timeout) const
-{
-    Lock sync(*this);
-    while(!_completed)
-    {
-        if(!timedWait(IceUtil::Time::seconds(timeout)))
-        {
-            throw ProcessFailedException("timed out waiting for the process to succeed");
-        }
-    }
-    return _status;
-}
-
-string
-MainHelperI::getOutput() const
-{
-    assert(_completed);
-    return _out.str();
-}
-
-ProcessI::ProcessI(ViewController* controller, MainHelperI* helper) : _controller(controller), _helper(helper)
-{
-}
-
-ProcessI::~ProcessI()
-{
-}
-
-void
-ProcessI::waitReady(int timeout, const Ice::Current&)
-{
-    _helper->waitReady(timeout);
-}
-
-int
-ProcessI::waitSuccess(int timeout, const Ice::Current&)
-{
-    return _helper->waitSuccess(timeout);
-}
-
-string
-ProcessI::terminate(const Ice::Current& current)
-{
-    _helper->shutdown();
-    current.adapter->remove(current.id);
-    _helper->getThreadControl().join();
-    return _helper->getOutput();
-}
-
-ProcessControllerI::ProcessControllerI(ViewController* controller) : _controller(controller)
-{
-}
-
-#ifdef ICE_CPP11_MAPPING
-shared_ptr<ProcessPrx>
-ProcessControllerI::start(string testSuite, string exe, StringSeq args, const Ice::Current& c)
-#else
-ProcessPrx
-ProcessControllerI::start(const string& testSuite, const string& exe, const StringSeq& args, const Ice::Current& c)
-#endif
-{
-    std::string prefix = std::string("test/") + testSuite;
-    replace(prefix.begin(), prefix.end(), '/', '_');
-    [_controller println:[NSString stringWithFormat:@"starting %s %s... ", testSuite.c_str(), exe.c_str()]];
-    IceUtil::Handle<MainHelperI> helper = new MainHelperI(_controller, prefix + '/' + exe + ".bundle", args);
-    helper->start();
-    return ICE_UNCHECKED_CAST(ProcessPrx, c.adapter->addWithUUID(ICE_MAKE_SHARED(ProcessI, _controller, helper.get())));
-}
-
-ControllerHelper::ControllerHelper(ViewController* controller)
-{
-    Ice::registerIceDiscovery();
-
-    Ice::InitializationData initData = Ice::InitializationData();
-    initData.properties = Ice::createProperties();
-    initData.properties->setProperty("Ice.ThreadPool.Server.SizeMax", "10");
-    initData.properties->setProperty("IceDiscovery.DomainId", "TestController");
-    initData.properties->setProperty("IceDiscovery.Interface", "127.0.0.1");
-    initData.properties->setProperty("Ice.Default.Host", "127.0.0.1");
-    initData.properties->setProperty("ControllerAdapter.Endpoints", "tcp");
-    //initData.properties->setProperty("Ice.Trace.Network", "2");
-    //initData.properties->setProperty("Ice.Trace.Protocol", "2");
-    initData.properties->setProperty("ControllerAdapter.AdapterId", Ice::generateUUID());
-
-    _communicator = Ice::initialize(initData);
-
-    Ice::ObjectAdapterPtr adapter = _communicator->createObjectAdapter("ControllerAdapter");
-    Ice::Identity ident;
-#if TARGET_IPHONE_SIMULATOR != 0
-    ident.category = "iPhoneSimulator";
-#else
-    ident.category = "iPhoneOS";
-#endif
-    ident.name = [[[NSBundle mainBundle] bundleIdentifier] UTF8String];
-    adapter->add(ICE_MAKE_SHARED(ProcessControllerI, controller), ident);
-    adapter->activate();
-}
-
-ControllerHelper::~ControllerHelper()
-{
-    _communicator->destroy();
-    _communicator = 0;
-}
-
-static ControllerHelper* controllerHelper = 0;
-
-@implementation ViewController
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    controllerHelper = new ControllerHelper(self);
-}
-- (void) dealloc
-{
-    delete controllerHelper;
-}
--(void) write:(NSString*)msg
-{
-    [output insertText:msg];
-    [output layoutIfNeeded];
-    [output scrollRangeToVisible:NSMakeRange([output.text length] - 1, 1)];
-}
--(void) print:(NSString*)msg
-{
-    [self performSelectorOnMainThread:@selector(write:) withObject:msg waitUntilDone:NO];
-}
--(void) println:(NSString*)msg
-{
-    [self print:[msg stringByAppendingString:@"\n"]];
-}
-@end