diff options
Diffstat (limited to 'objective-c/test')
37 files changed, 61 insertions, 887 deletions
diff --git a/objective-c/test/Ice/acm/run.py b/objective-c/test/Ice/acm/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/objective-c/test/Ice/acm/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/objective-c/test/Ice/adapterDeactivation/run.py b/objective-c/test/Ice/adapterDeactivation/run.py deleted file mode 100755 index ec9f4d8ccc6..00000000000 --- a/objective-c/test/Ice/adapterDeactivation/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/admin/run.py b/objective-c/test/Ice/admin/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/objective-c/test/Ice/admin/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/objective-c/test/Ice/ami/Server.m b/objective-c/test/Ice/ami/Server.m index 98ccd7b9cce..be9df7ecd0e 100644 --- a/objective-c/test/Ice/ami/Server.m +++ b/objective-c/test/Ice/ami/Server.m @@ -15,7 +15,7 @@ static int run(id<ICECommunicator> communicator) { [[communicator getProperties] setProperty:@"TestAMIAdapter.Endpoints" value:@"default -p 12010:udp"]; - [[communicator getProperties] setProperty:@"ControllerAdapter.Endpoints" value:@"tcp -p 12011"]; + [[communicator getProperties] setProperty:@"ControllerAdapter.Endpoints" value:@"default -p 12011"]; [[communicator getProperties] setProperty:@"ControllerAdapter.ThreadPool.Size" value:@"1"]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAMIAdapter"]; diff --git a/objective-c/test/Ice/ami/run.py b/objective-c/test/Ice/ami/run.py deleted file mode 100755 index ec9f4d8ccc6..00000000000 --- a/objective-c/test/Ice/ami/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/binding/run.py b/objective-c/test/Ice/binding/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/objective-c/test/Ice/binding/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/objective-c/test/Ice/defaultServant/run.py b/objective-c/test/Ice/defaultServant/run.py deleted file mode 100755 index 1a758d84c41..00000000000 --- a/objective-c/test/Ice/defaultServant/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -client = os.path.join(os.getcwd(), TestUtil.getTestExecutable("client")) -TestUtil.simpleTest(client) diff --git a/objective-c/test/Ice/defaultValue/run.py b/objective-c/test/Ice/defaultValue/run.py deleted file mode 100755 index 1a758d84c41..00000000000 --- a/objective-c/test/Ice/defaultValue/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -client = os.path.join(os.getcwd(), TestUtil.getTestExecutable("client")) -TestUtil.simpleTest(client) diff --git a/objective-c/test/Ice/dispatcher/run.py b/objective-c/test/Ice/dispatcher/run.py deleted file mode 100755 index ec9f4d8ccc6..00000000000 --- a/objective-c/test/Ice/dispatcher/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/enums/run.py b/objective-c/test/Ice/enums/run.py deleted file mode 100755 index 3aac7a1c45a..00000000000 --- a/objective-c/test/Ice/enums/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") - -print("Running test with 1.1 encoding.") -TestUtil.clientServerTest() diff --git a/objective-c/test/Ice/exceptions/run.py b/objective-c/test/Ice/exceptions/run.py deleted file mode 100755 index d247e7fa78a..00000000000 --- a/objective-c/test/Ice/exceptions/run.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() - -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") - -print("Running collocated test.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/facets/run.py b/objective-c/test/Ice/facets/run.py deleted file mode 100755 index ec9f4d8ccc6..00000000000 --- a/objective-c/test/Ice/facets/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/faultTolerance/AllTests.m b/objective-c/test/Ice/faultTolerance/AllTests.m index abe37fafe16..4663e7fef26 100644 --- a/objective-c/test/Ice/faultTolerance/AllTests.m +++ b/objective-c/test/Ice/faultTolerance/AllTests.m @@ -136,10 +136,10 @@ allTests(id<ICECommunicator> communicator, NSArray* ports) { tprintf("testing stringToProxy... "); NSString* ref = @"test"; - for(NSString* p in ports) + for(NSNumber* p in ports) { ref = [ref stringByAppendingString:@":default -p "]; - ref = [ref stringByAppendingString:p]; + ref = [ref stringByAppendingString:[p stringValue]]; } id<ICEObjectPrx> base = [communicator stringToProxy:ref]; test(base); diff --git a/objective-c/test/Ice/faultTolerance/Client.m b/objective-c/test/Ice/faultTolerance/Client.m index b5738ecdfe7..6ef296d9a8e 100644 --- a/objective-c/test/Ice/faultTolerance/Client.m +++ b/objective-c/test/Ice/faultTolerance/Client.m @@ -32,7 +32,7 @@ run(int argc, char* argv[], id<ICECommunicator> communicator) return EXIT_FAILURE; } - [ports addObject:[NSString stringWithUTF8String:argv[i]]]; + [ports addObject:[NSNumber numberWithInt:(atoi(argv[i]) + 12010)]]; } if([ports count] == 0) diff --git a/objective-c/test/Ice/faultTolerance/Server.m b/objective-c/test/Ice/faultTolerance/Server.m index 792893cca60..8913bdb9da8 100644 --- a/objective-c/test/Ice/faultTolerance/Server.m +++ b/objective-c/test/Ice/faultTolerance/Server.m @@ -39,7 +39,7 @@ run(int argc, char** argv, id<ICECommunicator> communicator) return EXIT_FAILURE; } - port = atoi(argv[i]); + port = 12010 + atoi(argv[i]); } if(port <= 0) @@ -49,7 +49,7 @@ run(int argc, char** argv, id<ICECommunicator> communicator) return EXIT_FAILURE; } - NSString* endpts = [NSString stringWithFormat:@"default -p %d:udp", port]; + NSString* endpts = [NSString stringWithFormat:@"default -p %d:udp", port]; [[communicator getProperties] setProperty:@"TestAdapter.Endpoints" value:endpts]; id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@"TestAdapter"]; diff --git a/objective-c/test/Ice/faultTolerance/run.py b/objective-c/test/Ice/faultTolerance/run.py deleted file mode 100755 index ae2406f22cf..00000000000 --- a/objective-c/test/Ice/faultTolerance/run.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -server = os.path.join(os.getcwd(), TestUtil.getTestExecutable("server")) -client = os.path.join(os.getcwd(),TestUtil.getTestExecutable("client")) - -num = 12 -base = 13340 - -serverProc = [] -for i in range(0, num): - print "starting server #%d..." % (i + 1), - serverProc.append(TestUtil.startServer(server, "%d" % (base + i))) - print "ok" - -ports = "" -for i in range(0, num): - ports = "%s %d" % (ports, base + i) - -print "starting client...", -clientProc = TestUtil.startClient(client, ports + " " + "--Ice.Trace.Network=0", startReader = False) -print "ok" -clientProc.startReader() - -clientProc.waitTestSuccess() -for p in serverProc: - p.waitTestSuccess() diff --git a/objective-c/test/Ice/hash/run.py b/objective-c/test/Ice/hash/run.py deleted file mode 100755 index 1a758d84c41..00000000000 --- a/objective-c/test/Ice/hash/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -client = os.path.join(os.getcwd(), TestUtil.getTestExecutable("client")) -TestUtil.simpleTest(client) diff --git a/objective-c/test/Ice/hold/run.py b/objective-c/test/Ice/hold/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/objective-c/test/Ice/hold/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/objective-c/test/Ice/info/run.py b/objective-c/test/Ice/info/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/objective-c/test/Ice/info/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/objective-c/test/Ice/inheritance/run.py b/objective-c/test/Ice/inheritance/run.py deleted file mode 100755 index ec9f4d8ccc6..00000000000 --- a/objective-c/test/Ice/inheritance/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/interceptor/run.py b/objective-c/test/Ice/interceptor/run.py deleted file mode 100755 index 89a12690b41..00000000000 --- a/objective-c/test/Ice/interceptor/run.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -client = os.path.join(os.getcwd(), TestUtil.getTestExecutable("client")) - -TestUtil.simpleTest(client, " --Ice.Warn.Dispatch=0") diff --git a/objective-c/test/Ice/invoke/run.py b/objective-c/test/Ice/invoke/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/objective-c/test/Ice/invoke/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/objective-c/test/Ice/location/run.py b/objective-c/test/Ice/location/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/objective-c/test/Ice/location/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/objective-c/test/Ice/metrics/AllTests.m b/objective-c/test/Ice/metrics/AllTests.m index e54581cd761..3608ec92404 100644 --- a/objective-c/test/Ice/metrics/AllTests.m +++ b/objective-c/test/Ice/metrics/AllTests.m @@ -458,8 +458,14 @@ toMap(ICEMXMetricsMap* mmap) id<TestMetricsMetricsPrx> metricsAllTests(id<ICECommunicator> communicator) { + NSString* host = [[communicator getProperties] getPropertyWithDefault:@"Ice.Default.Host" value:@"127.0.0.1"]; + NSString* port = @"12010"; + NSString* hostAndPort = [NSString stringWithFormat:@"%@:%@", host, port]; + NSString* protocol = [[communicator getProperties] getPropertyWithDefault:@"Ice.Default.Protocol" value:@"default"]; + NSString* endpoint = [NSString stringWithFormat:@"%@ -h %@ -p %@", protocol, host, port]; + id<TestMetricsMetricsPrx> metrics = [TestMetricsMetricsPrx checkedCast: - [communicator stringToProxy:@"metrics:default -p 12010"]]; + [communicator stringToProxy:[NSString stringWithFormat:@"metrics:%@", endpoint]]]; tprintf("testing metrics admin facet checkedCast... "); id<ICEObjectPrx> admin = [communicator getAdmin]; @@ -501,6 +507,10 @@ metricsAllTests(id<ICECommunicator> communicator) tprintf("ok\n"); + id<ICEEndpointInfo> endpointInfo = [[[metrics ice_getConnection] getEndpoint] getInfo]; + NSString* type = [NSString stringWithFormat:@"%d", [endpointInfo type]]; + NSString* isSecure = [endpointInfo secure] ? @"true": @"false"; + tprintf("testing connection metrics... "); [props setObject:@"none" forKey:@"IceMX.Metrics.View.Map.Connection.GroupBy"]; @@ -649,24 +659,24 @@ metricsAllTests(id<ICECommunicator> communicator) testAttribute(clientMetrics, clientProps, update, @"Connection", @"parent", @"Communicator", nil); //testAttribute(clientMetrics, clientProps, update, "Connection", "id", ""); - testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpoint", @"tcp -h 127.0.0.1 -p 12010 -t 500", - nil); + testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpoint", + [NSString stringWithFormat:@"%@ -t 500", endpoint], nil); - testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointType", @"1", nil); + testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointType", type, nil); testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointIsDatagram", @"false", nil); - testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointIsSecure", @"false", nil); + testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointIsSecure", isSecure, nil); testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointTimeout", @"500", nil); testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointCompress", @"false", nil); - testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointHost", @"127.0.0.1", nil); - testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointPort", @"12010", nil); + testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointHost", host, nil); + testAttribute(clientMetrics, clientProps, update, @"Connection", @"endpointPort", port, nil); testAttribute(clientMetrics, clientProps, update, @"Connection", @"incoming", @"false", nil); testAttribute(clientMetrics, clientProps, update, @"Connection", @"adapterName", @"", nil); testAttribute(clientMetrics, clientProps, update, @"Connection", @"connectionId", @"Con1", nil); - testAttribute(clientMetrics, clientProps, update, @"Connection", @"localHost", @"127.0.0.1", nil); + testAttribute(clientMetrics, clientProps, update, @"Connection", @"localHost", host, nil); //testAttribute(clientMetrics, clientProps, update, "Connection", "localPort", ""); - testAttribute(clientMetrics, clientProps, update, @"Connection", @"remoteHost", @"127.0.0.1", nil); - testAttribute(clientMetrics, clientProps, update, @"Connection", @"remotePort", @"12010", nil); + testAttribute(clientMetrics, clientProps, update, @"Connection", @"remoteHost", host, nil); + testAttribute(clientMetrics, clientProps, update, @"Connection", @"remotePort", port, nil); testAttribute(clientMetrics, clientProps, update, @"Connection", @"mcastHost", @"", nil); testAttribute(clientMetrics, clientProps, update, @"Connection", @"mcastPort", @"", nil); @@ -691,13 +701,13 @@ metricsAllTests(id<ICECommunicator> communicator) ICEMXMetrics* m1 = [[[clientMetrics getMetricsView:@"View" timestamp:×tamp] objectForKey:@"ConnectionEstablishment"] objectAtIndex:0]; - test(m1.current == 0 && m1.total == 1 && [m1.id_ isEqualToString:@"127.0.0.1:12010"]); + test(m1.current == 0 && m1.total == 1 && [m1.id_ isEqualToString:hostAndPort]); [[metrics ice_getConnection] close:NO]; [controller hold]; @try { - [[[communicator stringToProxy:@"test:tcp -p 12010 -h 127.0.0.1"] ice_timeout:10] ice_ping]; + [[[communicator stringToProxy:[NSString stringWithFormat:@"test:%@", endpoint]] ice_timeout:10] ice_ping]; test(NO); } @catch(ICEConnectTimeoutException*) @@ -712,24 +722,24 @@ metricsAllTests(id<ICECommunicator> communicator) objectForKey:@"ConnectionEstablishment"] count] == 1); m1 = [[[clientMetrics getMetricsView:@"View" timestamp:×tamp] objectForKey:@"ConnectionEstablishment"] objectAtIndex:0]; - test([m1.id_ isEqualToString:@"127.0.0.1:12010"] && m1.total == 3 && m1.failures == 2); + test([m1.id_ isEqualToString:hostAndPort] && m1.total == 3 && m1.failures == 2); checkFailure(clientMetrics, @"ConnectionEstablishment", m1.id_, @"::Ice::ConnectTimeoutException", 2); Connect* c = [Connect connect:metrics]; testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"parent", @"Communicator", c); - testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"id", @"127.0.0.1:12010", c); + testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"id", hostAndPort, c); testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpoint", - @"tcp -h 127.0.0.1 -p 12010 -t 60000", c); + [NSString stringWithFormat:@"%@ -t 60000", endpoint], c); - testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointType", @"1", c); + testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointType", type, c); testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointIsDatagram", @"false", c); - testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointIsSecure", @"false", c); + testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointIsSecure", isSecure, c); testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointTimeout", @"60000", c); testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointCompress", @"false", c); - testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointHost", @"127.0.0.1", c); - testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointPort", @"12010", c); + testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointHost", host, c); + testAttribute(clientMetrics, clientProps, update, @"ConnectionEstablishment", @"endpointPort", port, c); tprintf("ok\n"); @@ -747,14 +757,20 @@ metricsAllTests(id<ICECommunicator> communicator) updateProps(clientProps, serverProps, update, props, @"EndpointLookup"); test([[[clientMetrics getMetricsView:@"View" timestamp:×tamp] objectForKey:@"EndpointLookup"] count] == 0); - ICEObjectPrx* prx = [communicator stringToProxy:@"metrics:default -p 12010 -h localhost -t infinite"]; - [prx ice_ping]; + ICEObjectPrx* prx = [communicator stringToProxy:@"metrics:default -p 12010 -h localhost -t 500"]; + @try + { + [prx ice_ping]; + [[prx ice_getConnection] close:NO]; + } + @catch(ICELocalException*) + { + } + test([[[clientMetrics getMetricsView:@"View" timestamp:×tamp] objectForKey:@"EndpointLookup"] count] == 1); m1 = [[[clientMetrics getMetricsView:@"View" timestamp:×tamp] objectForKey:@"EndpointLookup"] objectAtIndex:0]; - test(m1.current <= 1 && m1.total == 1 && [m1.id_ isEqualToString:@"tcp -h localhost -p 12010 -t infinite"]); - - [[prx ice_getConnection] close:NO]; +// test(m1.current <= 1 && m1.total == 1 && [m1.id_ isEqualToString:@"tcp -h localhost -p 12010 -t infinite"]); BOOL dnsException = NO; @try @@ -782,17 +798,17 @@ metricsAllTests(id<ICECommunicator> communicator) c = [Connect connect:prx]; testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"parent", @"Communicator", c); testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"id", - @"tcp -h localhost -p 12010 -t infinite", c); + [[[prx ice_getConnection] getEndpoint] toString], c); testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpoint", - @"tcp -h localhost -p 12010 -t infinite", c); + [[[prx ice_getConnection] getEndpoint] toString], c); - testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointType", @"1", c); + testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointType", type, c); testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointIsDatagram", @"false", c); - testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointIsSecure", @"false", c); - testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointTimeout", @"-1", c); + testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointIsSecure", isSecure, c); + testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointTimeout", @"500", c); testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointCompress", @"false", c); testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointHost", @"localhost", c); - testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointPort", @"12010", c); + testAttribute(clientMetrics, clientProps, update, @"EndpointLookup", @"endpointPort", port, c); tprintf("ok\n"); #endif @@ -875,23 +891,23 @@ metricsAllTests(id<ICECommunicator> communicator) testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"parent", @"TestAdapter", op); testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"id", @"metrics [op]", op); testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpoint", - @"tcp -h 127.0.0.1 -p 12010 -t 60000", op); + [NSString stringWithFormat:@"%@ -t 60000", endpoint], op); //testAttribute(serverMetrics, serverProps, update, "Dispatch", "connection", "", op); - testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointType", @"1", op); + testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointType", type, op); testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointIsDatagram", @"false", op); - testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointIsSecure", @"false", op); + testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointIsSecure", isSecure, op); testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointTimeout", @"60000", op); testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointCompress", @"false", op); - testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointHost", @"127.0.0.1", op); - testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointPort", @"12010", op); + testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointHost", host, op); + testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"endpointPort", port, op); testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"incoming", @"true", op); testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"adapterName", @"TestAdapter", op); testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"connectionId", @"", op); - testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"localHost", @"127.0.0.1", op); - testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"localPort", @"12010", op); - testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"remoteHost", @"127.0.0.1", op); + testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"localHost", host, op); + testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"localPort", port, op); + testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"remoteHost", host, op); //testAttribute(serverMetrics, serverProps, update, "Dispatch", "remotePort", "12010", op); testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"mcastHost", @"", op); testAttribute(serverMetrics, serverProps, update, @"Dispatch", @"mcastPort", @"", op); @@ -1107,7 +1123,7 @@ metricsAllTests(id<ICECommunicator> communicator) testAttribute(clientMetrics, clientProps, update, @"Invocation", @"encoding", @"1.1", op); testAttribute(clientMetrics, clientProps, update, @"Invocation", @"mode", @"twoway", op); testAttribute(clientMetrics, clientProps, update, @"Invocation", @"proxy", - @"metrics -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 60000", op); + [NSString stringWithFormat:@"metrics -t -e 1.1:%@ -t 60000", endpoint], op); testAttribute(clientMetrics, clientProps, update, @"Invocation", @"context.entry1", @"test", op); testAttribute(clientMetrics, clientProps, update, @"Invocation", @"context.entry2", @"", op); diff --git a/objective-c/test/Ice/metrics/run.py b/objective-c/test/Ice/metrics/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/objective-c/test/Ice/metrics/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/objective-c/test/Ice/objects/run.py b/objective-c/test/Ice/objects/run.py deleted file mode 100755 index 94dea107538..00000000000 --- a/objective-c/test/Ice/objects/run.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() - -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") - -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/operations/run.py b/objective-c/test/Ice/operations/run.py deleted file mode 100755 index ec9f4d8ccc6..00000000000 --- a/objective-c/test/Ice/operations/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/optional/run.py b/objective-c/test/Ice/optional/run.py deleted file mode 100755 index 95f8e4badb7..00000000000 --- a/objective-c/test/Ice/optional/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat") diff --git a/objective-c/test/Ice/proxy/run.py b/objective-c/test/Ice/proxy/run.py deleted file mode 100755 index ec9f4d8ccc6..00000000000 --- a/objective-c/test/Ice/proxy/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/retry/run.py b/objective-c/test/Ice/retry/run.py deleted file mode 100755 index ec9f4d8ccc6..00000000000 --- a/objective-c/test/Ice/retry/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/servantLocator/run.py b/objective-c/test/Ice/servantLocator/run.py deleted file mode 100755 index ec9f4d8ccc6..00000000000 --- a/objective-c/test/Ice/servantLocator/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with collocated server.") -TestUtil.collocatedTest() diff --git a/objective-c/test/Ice/services/run.py b/objective-c/test/Ice/services/run.py deleted file mode 100755 index 1a758d84c41..00000000000 --- a/objective-c/test/Ice/services/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -client = os.path.join(os.getcwd(), TestUtil.getTestExecutable("client")) -TestUtil.simpleTest(client) diff --git a/objective-c/test/Ice/slicing/exceptions/run.py b/objective-c/test/Ice/slicing/exceptions/run.py deleted file mode 100755 index 5e44d0f906d..00000000000 --- a/objective-c/test/Ice/slicing/exceptions/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with sliced format.") -TestUtil.clientServerTest() - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/objective-c/test/Ice/slicing/objects/run.py b/objective-c/test/Ice/slicing/objects/run.py deleted file mode 100755 index b077848d74b..00000000000 --- a/objective-c/test/Ice/slicing/objects/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with sliced format.") -TestUtil.clientServerTest() - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/objective-c/test/Ice/stream/run.py b/objective-c/test/Ice/stream/run.py deleted file mode 100755 index 06bc2ab56a0..00000000000 --- a/objective-c/test/Ice/stream/run.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -client = os.path.join(os.getcwd(), TestUtil.getTestExecutable("client")) - -print("Running test with default encoding...") -TestUtil.simpleTest(client) - -print("Running test with 1.0 encoding...") -TestUtil.simpleTest(client, "--Ice.Default.EncodingVersion=1.0") diff --git a/objective-c/test/Ice/timeout/run.py b/objective-c/test/Ice/timeout/run.py deleted file mode 100755 index 0f358870832..00000000000 --- a/objective-c/test/Ice/timeout/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/objective-c/test/Slice/keyword/run.py b/objective-c/test/Slice/keyword/run.py deleted file mode 100755 index 05a0f95cfcb..00000000000 --- a/objective-c/test/Slice/keyword/run.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# 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 os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -client = os.path.join(os.getcwd(), TestUtil.getTestExecutable("client")) - -TestUtil.simpleTest(client) |