From c2c725044a0986e04b72a8c75b86ee703fcb8a35 Mon Sep 17 00:00:00 2001 From: Johannes Weiss Date: Wed, 27 Nov 2019 14:26:51 +0000 Subject: [PATCH] allow deprecated tests to test deprecated functionality (#1271) Motivation: It's important to also test deprecated functionliaty. One way of achieving this without warnings is to also deprecate the tests that test this deprecated functionality. Unfortunately, on Linux we need to generate lists of tests which would then reference deprecated tests (which gives us a warning). Modifications: Deprecate test suites and the main test runner all the way to the top so never get warnings. Result: Possible to test deprecated functionlity without warnings. --- Tests/LinuxMain.swift | 155 ++++++++++-------- .../NIOConcurrencyHelpersTests+XCTest.swift | 1 + .../Codable+ByteBufferTest+XCTest.swift | 1 + .../ByteBufferUtilsTest+XCTest.swift | 1 + .../HTTPClientUpgradeTests+XCTest.swift | 1 + .../HTTPDecoderLengthTest+XCTest.swift | 1 + .../HTTPDecoderTest+XCTest.swift | 1 + .../HTTPHeadersTest+XCTest.swift | 1 + .../HTTPRequestEncoderTest+XCTest.swift | 1 + .../HTTPResponseEncoderTest+XCTest.swift | 1 + .../HTTPResponseStatusTests+XCTest.swift | 1 + .../HTTPServerClientTest+XCTest.swift | 1 + ...HTTPServerPipelineHandlerTest+XCTest.swift | 1 + ...erverProtocolErrorHandlerTest+XCTest.swift | 1 + .../HTTPServerUpgradeTests+XCTest.swift | 1 + Tests/NIOHTTP1Tests/HTTPTest+XCTest.swift | 1 + .../NIOHTTP1Tests/HTTPTypesTest+XCTest.swift | 1 + ...otocolNegotiationHandlerTests+XCTest.swift | 1 + .../NIOTLSTests/SNIHandlerTests+XCTest.swift | 1 + ...eToMessageDecoderVerifierTest+XCTest.swift | 1 + .../EventCounterHandlerTest+XCTest.swift | 1 + .../NIOHTTP1TestServerTest+XCTest.swift | 1 + .../AcceptBackoffHandlerTest+XCTest.swift | 1 + Tests/NIOTests/BaseObjectsTest+XCTest.swift | 1 + .../BlockingIOThreadPoolTest+XCTest.swift | 1 + Tests/NIOTests/BootstrapTest+XCTest.swift | 1 + Tests/NIOTests/ByteBufferTest+XCTest.swift | 2 + Tests/NIOTests/ByteBufferTest.swift | 9 + .../ChannelNotificationTest+XCTest.swift | 1 + .../ChannelOptionStorageTest+XCTest.swift | 1 + .../NIOTests/ChannelPipelineTest+XCTest.swift | 1 + Tests/NIOTests/ChannelTests+XCTest.swift | 1 + .../NIOTests/CircularBufferTests+XCTest.swift | 1 + Tests/NIOTests/CodecTest+XCTest.swift | 3 + .../NIOTests/CustomChannelTests+XCTest.swift | 1 + .../DatagramChannelTests+XCTest.swift | 1 + .../EchoServerClientTest+XCTest.swift | 1 + .../NIOTests/EmbeddedChannelTest+XCTest.swift | 1 + .../EmbeddedEventLoopTest+XCTest.swift | 1 + .../NIOTests/EventLoopFutureTest+XCTest.swift | 1 + Tests/NIOTests/EventLoopTest+XCTest.swift | 1 + Tests/NIOTests/FileRegionTest+XCTest.swift | 1 + .../GetAddrInfoResolverTest+XCTest.swift | 1 + Tests/NIOTests/HappyEyeballsTest+XCTest.swift | 1 + Tests/NIOTests/HeapTests+XCTest.swift | 1 + .../IdleStateHandlerTest+XCTest.swift | 1 + Tests/NIOTests/IntegerTypesTest+XCTest.swift | 1 + .../MarkedCircularBufferTests+XCTest.swift | 1 + Tests/NIOTests/MulticastTest+XCTest.swift | 1 + Tests/NIOTests/NIOAnyDebugTest+XCTest.swift | 1 + .../NIOCloseOnErrorHandlerTest+XCTest.swift | 1 + .../NonBlockingFileIOTest+XCTest.swift | 1 + ...ingDatagramWritesManagerTests+XCTest.swift | 1 + Tests/NIOTests/PipeChannelTest+XCTest.swift | 1 + .../NIOTests/PriorityQueueTests+XCTest.swift | 1 + .../RecvByteBufAllocatorTest+XCTest.swift | 1 + Tests/NIOTests/SelectorTest+XCTest.swift | 1 + Tests/NIOTests/SocketAddressTest+XCTest.swift | 1 + Tests/NIOTests/SocketChannelTest+XCTest.swift | 1 + .../SocketOptionProviderTest+XCTest.swift | 1 + .../NIOTests/StreamChannelsTest+XCTest.swift | 1 + Tests/NIOTests/SystemTest+XCTest.swift | 1 + Tests/NIOTests/ThreadTest+XCTest.swift | 1 + ...peAssistedChannelHandlerTests+XCTest.swift | 1 + Tests/NIOTests/UtilitiesTest+XCTest.swift | 1 + .../NIOWebSocketTests/Base64Test+XCTest.swift | 1 + .../WebSocketClientEndToEndTests+XCTest.swift | 1 + .../WebSocketFrameDecoderTest+XCTest.swift | 1 + .../WebSocketFrameEncoderTest+XCTest.swift | 1 + .../WebSocketServerEndToEndTests+XCTest.swift | 1 + scripts/generate_linux_tests.rb | 18 +- 71 files changed, 178 insertions(+), 75 deletions(-) diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift index 1192d74f..27b4e20a 100644 --- a/Tests/LinuxMain.swift +++ b/Tests/LinuxMain.swift @@ -31,76 +31,87 @@ import XCTest @testable import NIOTests @testable import NIOWebSocketTests - XCTMain([ - testCase(AcceptBackoffHandlerTest.allTests), - testCase(AdaptiveRecvByteBufferAllocatorTest.allTests), - testCase(ApplicationProtocolNegotiationHandlerTests.allTests), - testCase(Base64Test.allTests), - testCase(BaseObjectTest.allTests), - testCase(BlockingIOThreadPoolTest.allTests), - testCase(BootstrapTest.allTests), - testCase(ByteBufferTest.allTests), - testCase(ByteBufferUtilsTest.allTests), - testCase(ByteToMessageDecoderTest.allTests), - testCase(ByteToMessageDecoderVerifierTest.allTests), - testCase(ChannelNotificationTest.allTests), - testCase(ChannelOptionStorageTest.allTests), - testCase(ChannelPipelineTest.allTests), - testCase(ChannelTests.allTests), - testCase(CircularBufferTests.allTests), - testCase(CodableByteBufferTest.allTests), - testCase(CustomChannelTests.allTests), - testCase(DatagramChannelTests.allTests), - testCase(EchoServerClientTest.allTests), - testCase(EmbeddedChannelTest.allTests), - testCase(EmbeddedEventLoopTest.allTests), - testCase(EventCounterHandlerTest.allTests), - testCase(EventLoopFutureTest.allTests), - testCase(EventLoopTest.allTests), - testCase(FileRegionTest.allTests), - testCase(GetaddrinfoResolverTest.allTests), - testCase(HTTPClientUpgradeTestCase.allTests), - testCase(HTTPDecoderLengthTest.allTests), - testCase(HTTPDecoderTest.allTests), - testCase(HTTPHeadersTest.allTests), - testCase(HTTPRequestEncoderTests.allTests), - testCase(HTTPResponseEncoderTests.allTests), - testCase(HTTPResponseStatusTests.allTests), - testCase(HTTPServerClientTest.allTests), - testCase(HTTPServerPipelineHandlerTest.allTests), - testCase(HTTPServerProtocolErrorHandlerTest.allTests), - testCase(HTTPServerUpgradeTestCase.allTests), - testCase(HTTPTest.allTests), - testCase(HTTPTypesTest.allTests), - testCase(HappyEyeballsTest.allTests), - testCase(HeapTests.allTests), - testCase(IdleStateHandlerTest.allTests), - testCase(IntegerTypesTest.allTests), - testCase(MarkedCircularBufferTests.allTests), - testCase(MessageToByteEncoderTest.allTests), - testCase(MessageToByteHandlerTest.allTests), - testCase(MulticastTest.allTests), - testCase(NIOAnyDebugTest.allTests), - testCase(NIOCloseOnErrorHandlerTest.allTests), - testCase(NIOConcurrencyHelpersTests.allTests), - testCase(NIOHTTP1TestServerTest.allTests), - testCase(NonBlockingFileIOTest.allTests), - testCase(PendingDatagramWritesManagerTests.allTests), - testCase(PipeChannelTest.allTests), - testCase(PriorityQueueTest.allTests), - testCase(SNIHandlerTest.allTests), - testCase(SelectorTest.allTests), - testCase(SocketAddressTest.allTests), - testCase(SocketChannelTest.allTests), - testCase(SocketOptionProviderTest.allTests), - testCase(StreamChannelTest.allTests), - testCase(SystemTest.allTests), - testCase(ThreadTest.allTests), - testCase(TypeAssistedChannelHandlerTest.allTests), - testCase(UtilitiesTest.allTests), - testCase(WebSocketClientEndToEndTests.allTests), - testCase(WebSocketFrameDecoderTest.allTests), - testCase(WebSocketFrameEncoderTest.allTests), - testCase(WebSocketServerEndToEndTests.allTests), - ]) +// This protocol is necessary to we can call the 'run' method (on an existential of this protocol) +// without the compiler noticing that we're calling a deprecated function. +// This hack exists so we can deprecate individual tests which test deprecated functionality without +// getting a compiler warning... +protocol LinuxMainRunner { func run() } +class LinuxMainRunnerImpl: LinuxMainRunner { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") + func run() { + XCTMain([ + testCase(AcceptBackoffHandlerTest.allTests), + testCase(AdaptiveRecvByteBufferAllocatorTest.allTests), + testCase(ApplicationProtocolNegotiationHandlerTests.allTests), + testCase(Base64Test.allTests), + testCase(BaseObjectTest.allTests), + testCase(BlockingIOThreadPoolTest.allTests), + testCase(BootstrapTest.allTests), + testCase(ByteBufferTest.allTests), + testCase(ByteBufferUtilsTest.allTests), + testCase(ByteToMessageDecoderTest.allTests), + testCase(ByteToMessageDecoderVerifierTest.allTests), + testCase(ChannelNotificationTest.allTests), + testCase(ChannelOptionStorageTest.allTests), + testCase(ChannelPipelineTest.allTests), + testCase(ChannelTests.allTests), + testCase(CircularBufferTests.allTests), + testCase(CodableByteBufferTest.allTests), + testCase(CustomChannelTests.allTests), + testCase(DatagramChannelTests.allTests), + testCase(EchoServerClientTest.allTests), + testCase(EmbeddedChannelTest.allTests), + testCase(EmbeddedEventLoopTest.allTests), + testCase(EventCounterHandlerTest.allTests), + testCase(EventLoopFutureTest.allTests), + testCase(EventLoopTest.allTests), + testCase(FileRegionTest.allTests), + testCase(GetaddrinfoResolverTest.allTests), + testCase(HTTPClientUpgradeTestCase.allTests), + testCase(HTTPDecoderLengthTest.allTests), + testCase(HTTPDecoderTest.allTests), + testCase(HTTPHeadersTest.allTests), + testCase(HTTPRequestEncoderTests.allTests), + testCase(HTTPResponseEncoderTests.allTests), + testCase(HTTPResponseStatusTests.allTests), + testCase(HTTPServerClientTest.allTests), + testCase(HTTPServerPipelineHandlerTest.allTests), + testCase(HTTPServerProtocolErrorHandlerTest.allTests), + testCase(HTTPServerUpgradeTestCase.allTests), + testCase(HTTPTest.allTests), + testCase(HTTPTypesTest.allTests), + testCase(HappyEyeballsTest.allTests), + testCase(HeapTests.allTests), + testCase(IdleStateHandlerTest.allTests), + testCase(IntegerTypesTest.allTests), + testCase(MarkedCircularBufferTests.allTests), + testCase(MessageToByteEncoderTest.allTests), + testCase(MessageToByteHandlerTest.allTests), + testCase(MulticastTest.allTests), + testCase(NIOAnyDebugTest.allTests), + testCase(NIOCloseOnErrorHandlerTest.allTests), + testCase(NIOConcurrencyHelpersTests.allTests), + testCase(NIOHTTP1TestServerTest.allTests), + testCase(NonBlockingFileIOTest.allTests), + testCase(PendingDatagramWritesManagerTests.allTests), + testCase(PipeChannelTest.allTests), + testCase(PriorityQueueTest.allTests), + testCase(SNIHandlerTest.allTests), + testCase(SelectorTest.allTests), + testCase(SocketAddressTest.allTests), + testCase(SocketChannelTest.allTests), + testCase(SocketOptionProviderTest.allTests), + testCase(StreamChannelTest.allTests), + testCase(SystemTest.allTests), + testCase(ThreadTest.allTests), + testCase(TypeAssistedChannelHandlerTest.allTests), + testCase(UtilitiesTest.allTests), + testCase(WebSocketClientEndToEndTests.allTests), + testCase(WebSocketFrameDecoderTest.allTests), + testCase(WebSocketFrameEncoderTest.allTests), + testCase(WebSocketServerEndToEndTests.allTests), + ]) + } +} +(LinuxMainRunnerImpl() as LinuxMainRunner).run() #endif diff --git a/Tests/NIOConcurrencyHelpersTests/NIOConcurrencyHelpersTests+XCTest.swift b/Tests/NIOConcurrencyHelpersTests/NIOConcurrencyHelpersTests+XCTest.swift index b952b960..bbe9292f 100644 --- a/Tests/NIOConcurrencyHelpersTests/NIOConcurrencyHelpersTests+XCTest.swift +++ b/Tests/NIOConcurrencyHelpersTests/NIOConcurrencyHelpersTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension NIOConcurrencyHelpersTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (NIOConcurrencyHelpersTests) -> () throws -> Void)] { return [ ("testLargeContendedAtomicSum", testLargeContendedAtomicSum), diff --git a/Tests/NIOFoundationCompatTests/Codable+ByteBufferTest+XCTest.swift b/Tests/NIOFoundationCompatTests/Codable+ByteBufferTest+XCTest.swift index 1a4f23d7..5733169c 100644 --- a/Tests/NIOFoundationCompatTests/Codable+ByteBufferTest+XCTest.swift +++ b/Tests/NIOFoundationCompatTests/Codable+ByteBufferTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension CodableByteBufferTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (CodableByteBufferTest) -> () throws -> Void)] { return [ ("testSimpleDecode", testSimpleDecode), diff --git a/Tests/NIOHTTP1Tests/ByteBufferUtilsTest+XCTest.swift b/Tests/NIOHTTP1Tests/ByteBufferUtilsTest+XCTest.swift index 48270965..98983637 100644 --- a/Tests/NIOHTTP1Tests/ByteBufferUtilsTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/ByteBufferUtilsTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension ByteBufferUtilsTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (ByteBufferUtilsTest) -> () throws -> Void)] { return [ ("testComparators", testComparators), diff --git a/Tests/NIOHTTP1Tests/HTTPClientUpgradeTests+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPClientUpgradeTests+XCTest.swift index 140e61f6..616c9ba7 100644 --- a/Tests/NIOHTTP1Tests/HTTPClientUpgradeTests+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPClientUpgradeTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPClientUpgradeTestCase { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPClientUpgradeTestCase) -> () throws -> Void)] { return [ ("testSimpleUpgradeSucceeds", testSimpleUpgradeSucceeds), diff --git a/Tests/NIOHTTP1Tests/HTTPDecoderLengthTest+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPDecoderLengthTest+XCTest.swift index 48b518ec..83a20ef0 100644 --- a/Tests/NIOHTTP1Tests/HTTPDecoderLengthTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPDecoderLengthTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPDecoderLengthTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPDecoderLengthTest) -> () throws -> Void)] { return [ ("testHTTP11SemanticEOFOnChannelInactive", testHTTP11SemanticEOFOnChannelInactive), diff --git a/Tests/NIOHTTP1Tests/HTTPDecoderTest+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPDecoderTest+XCTest.swift index fbdea2b7..54f1633c 100644 --- a/Tests/NIOHTTP1Tests/HTTPDecoderTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPDecoderTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPDecoderTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPDecoderTest) -> () throws -> Void)] { return [ ("testDoesNotDecodeRealHTTP09Request", testDoesNotDecodeRealHTTP09Request), diff --git a/Tests/NIOHTTP1Tests/HTTPHeadersTest+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPHeadersTest+XCTest.swift index 70b16d33..17a5f2ea 100644 --- a/Tests/NIOHTTP1Tests/HTTPHeadersTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPHeadersTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPHeadersTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPHeadersTest) -> () throws -> Void)] { return [ ("testCasePreservedButInsensitiveLookup", testCasePreservedButInsensitiveLookup), diff --git a/Tests/NIOHTTP1Tests/HTTPRequestEncoderTest+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPRequestEncoderTest+XCTest.swift index 868e4a67..cd8a96a8 100644 --- a/Tests/NIOHTTP1Tests/HTTPRequestEncoderTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPRequestEncoderTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPRequestEncoderTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPRequestEncoderTests) -> () throws -> Void)] { return [ ("testNoAutoHeadersForHEAD", testNoAutoHeadersForHEAD), diff --git a/Tests/NIOHTTP1Tests/HTTPResponseEncoderTest+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPResponseEncoderTest+XCTest.swift index 7a33e098..f5a4f2a2 100644 --- a/Tests/NIOHTTP1Tests/HTTPResponseEncoderTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPResponseEncoderTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPResponseEncoderTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPResponseEncoderTests) -> () throws -> Void)] { return [ ("testNoAutoHeadersFor101", testNoAutoHeadersFor101), diff --git a/Tests/NIOHTTP1Tests/HTTPResponseStatusTests+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPResponseStatusTests+XCTest.swift index 2a63506b..10799c74 100644 --- a/Tests/NIOHTTP1Tests/HTTPResponseStatusTests+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPResponseStatusTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPResponseStatusTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPResponseStatusTests) -> () throws -> Void)] { return [ ("testHTTPResponseStatusFromStatusCode", testHTTPResponseStatusFromStatusCode), diff --git a/Tests/NIOHTTP1Tests/HTTPServerClientTest+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPServerClientTest+XCTest.swift index f7dd54bc..d85372e7 100644 --- a/Tests/NIOHTTP1Tests/HTTPServerClientTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPServerClientTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPServerClientTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPServerClientTest) -> () throws -> Void)] { return [ ("testSimpleGetByteBuffer", testSimpleGetByteBuffer), diff --git a/Tests/NIOHTTP1Tests/HTTPServerPipelineHandlerTest+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPServerPipelineHandlerTest+XCTest.swift index f84f27a0..c0228f98 100644 --- a/Tests/NIOHTTP1Tests/HTTPServerPipelineHandlerTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPServerPipelineHandlerTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPServerPipelineHandlerTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPServerPipelineHandlerTest) -> () throws -> Void)] { return [ ("testBasicBufferingBehaviour", testBasicBufferingBehaviour), diff --git a/Tests/NIOHTTP1Tests/HTTPServerProtocolErrorHandlerTest+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPServerProtocolErrorHandlerTest+XCTest.swift index 69d4d1eb..c3372343 100644 --- a/Tests/NIOHTTP1Tests/HTTPServerProtocolErrorHandlerTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPServerProtocolErrorHandlerTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPServerProtocolErrorHandlerTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPServerProtocolErrorHandlerTest) -> () throws -> Void)] { return [ ("testHandlesBasicErrors", testHandlesBasicErrors), diff --git a/Tests/NIOHTTP1Tests/HTTPServerUpgradeTests+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPServerUpgradeTests+XCTest.swift index 38a7d91f..26aca4f6 100644 --- a/Tests/NIOHTTP1Tests/HTTPServerUpgradeTests+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPServerUpgradeTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPServerUpgradeTestCase { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPServerUpgradeTestCase) -> () throws -> Void)] { return [ ("testUpgradeWithoutUpgrade", testUpgradeWithoutUpgrade), diff --git a/Tests/NIOHTTP1Tests/HTTPTest+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPTest+XCTest.swift index 03471251..844b9efe 100644 --- a/Tests/NIOHTTP1Tests/HTTPTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPTest) -> () throws -> Void)] { return [ ("testHTTPSimpleNoHeaders", testHTTPSimpleNoHeaders), diff --git a/Tests/NIOHTTP1Tests/HTTPTypesTest+XCTest.swift b/Tests/NIOHTTP1Tests/HTTPTypesTest+XCTest.swift index fc5e3489..e4dffd16 100644 --- a/Tests/NIOHTTP1Tests/HTTPTypesTest+XCTest.swift +++ b/Tests/NIOHTTP1Tests/HTTPTypesTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HTTPTypesTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HTTPTypesTest) -> () throws -> Void)] { return [ ("testConvertToString", testConvertToString), diff --git a/Tests/NIOTLSTests/ApplicationProtocolNegotiationHandlerTests+XCTest.swift b/Tests/NIOTLSTests/ApplicationProtocolNegotiationHandlerTests+XCTest.swift index c7d13819..fd86f046 100644 --- a/Tests/NIOTLSTests/ApplicationProtocolNegotiationHandlerTests+XCTest.swift +++ b/Tests/NIOTLSTests/ApplicationProtocolNegotiationHandlerTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension ApplicationProtocolNegotiationHandlerTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (ApplicationProtocolNegotiationHandlerTests) -> () throws -> Void)] { return [ ("testChannelProvidedToCallback", testChannelProvidedToCallback), diff --git a/Tests/NIOTLSTests/SNIHandlerTests+XCTest.swift b/Tests/NIOTLSTests/SNIHandlerTests+XCTest.swift index 1fbfb1ea..ea54ad25 100644 --- a/Tests/NIOTLSTests/SNIHandlerTests+XCTest.swift +++ b/Tests/NIOTLSTests/SNIHandlerTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension SNIHandlerTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (SNIHandlerTest) -> () throws -> Void)] { return [ ("testLibre227NoSNIDripFeed", testLibre227NoSNIDripFeed), diff --git a/Tests/NIOTestUtilsTests/ByteToMessageDecoderVerifierTest+XCTest.swift b/Tests/NIOTestUtilsTests/ByteToMessageDecoderVerifierTest+XCTest.swift index ac3aaaee..01c8a1ea 100644 --- a/Tests/NIOTestUtilsTests/ByteToMessageDecoderVerifierTest+XCTest.swift +++ b/Tests/NIOTestUtilsTests/ByteToMessageDecoderVerifierTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension ByteToMessageDecoderVerifierTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (ByteToMessageDecoderVerifierTest) -> () throws -> Void)] { return [ ("testWrongResults", testWrongResults), diff --git a/Tests/NIOTestUtilsTests/EventCounterHandlerTest+XCTest.swift b/Tests/NIOTestUtilsTests/EventCounterHandlerTest+XCTest.swift index 7f992859..a9d8eb9c 100644 --- a/Tests/NIOTestUtilsTests/EventCounterHandlerTest+XCTest.swift +++ b/Tests/NIOTestUtilsTests/EventCounterHandlerTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension EventCounterHandlerTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (EventCounterHandlerTest) -> () throws -> Void)] { return [ ("testNothingButEmbeddedChannelInit", testNothingButEmbeddedChannelInit), diff --git a/Tests/NIOTestUtilsTests/NIOHTTP1TestServerTest+XCTest.swift b/Tests/NIOTestUtilsTests/NIOHTTP1TestServerTest+XCTest.swift index 92c6fb3b..bc7ba646 100644 --- a/Tests/NIOTestUtilsTests/NIOHTTP1TestServerTest+XCTest.swift +++ b/Tests/NIOTestUtilsTests/NIOHTTP1TestServerTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension NIOHTTP1TestServerTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (NIOHTTP1TestServerTest) -> () throws -> Void)] { return [ ("testTheExampleInTheDocs", testTheExampleInTheDocs), diff --git a/Tests/NIOTests/AcceptBackoffHandlerTest+XCTest.swift b/Tests/NIOTests/AcceptBackoffHandlerTest+XCTest.swift index 7993a5db..688cce7e 100644 --- a/Tests/NIOTests/AcceptBackoffHandlerTest+XCTest.swift +++ b/Tests/NIOTests/AcceptBackoffHandlerTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension AcceptBackoffHandlerTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (AcceptBackoffHandlerTest) -> () throws -> Void)] { return [ ("testECONNABORTED", testECONNABORTED), diff --git a/Tests/NIOTests/BaseObjectsTest+XCTest.swift b/Tests/NIOTests/BaseObjectsTest+XCTest.swift index cea2a3fc..f48f9aaf 100644 --- a/Tests/NIOTests/BaseObjectsTest+XCTest.swift +++ b/Tests/NIOTests/BaseObjectsTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension BaseObjectTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (BaseObjectTest) -> () throws -> Void)] { return [ ("testNIOByteBufferConversion", testNIOByteBufferConversion), diff --git a/Tests/NIOTests/BlockingIOThreadPoolTest+XCTest.swift b/Tests/NIOTests/BlockingIOThreadPoolTest+XCTest.swift index 4f8f672b..bf42e25f 100644 --- a/Tests/NIOTests/BlockingIOThreadPoolTest+XCTest.swift +++ b/Tests/NIOTests/BlockingIOThreadPoolTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension BlockingIOThreadPoolTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (BlockingIOThreadPoolTest) -> () throws -> Void)] { return [ ("testDoubleShutdownWorks", testDoubleShutdownWorks), diff --git a/Tests/NIOTests/BootstrapTest+XCTest.swift b/Tests/NIOTests/BootstrapTest+XCTest.swift index f21329ac..361894a8 100644 --- a/Tests/NIOTests/BootstrapTest+XCTest.swift +++ b/Tests/NIOTests/BootstrapTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension BootstrapTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (BootstrapTest) -> () throws -> Void)] { return [ ("testBootstrapsCallInitializersOnCorrectEventLoop", testBootstrapsCallInitializersOnCorrectEventLoop), diff --git a/Tests/NIOTests/ByteBufferTest+XCTest.swift b/Tests/NIOTests/ByteBufferTest+XCTest.swift index 23be221d..1b993c6b 100644 --- a/Tests/NIOTests/ByteBufferTest+XCTest.swift +++ b/Tests/NIOTests/ByteBufferTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension ByteBufferTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (ByteBufferTest) -> () throws -> Void)] { return [ ("testAllocateAndCount", testAllocateAndCount), @@ -173,6 +174,7 @@ extension ByteBufferTest { ("testByteBufferAllocatorSize1Capacity", testByteBufferAllocatorSize1Capacity), ("testByteBufferModifiedWithoutAllocationLogic", testByteBufferModifiedWithoutAllocationLogic), ("testByteBufferModifyIfUniquelyOwnedMayThrow", testByteBufferModifyIfUniquelyOwnedMayThrow), + ("testDeprecatedSetBytes", testDeprecatedSetBytes), ] } } diff --git a/Tests/NIOTests/ByteBufferTest.swift b/Tests/NIOTests/ByteBufferTest.swift index 5ac3254b..2fcf4da0 100644 --- a/Tests/NIOTests/ByteBufferTest.swift +++ b/Tests/NIOTests/ByteBufferTest.swift @@ -2441,6 +2441,15 @@ class ByteBufferTest: XCTestCase { XCTAssertTrue(error is MyError) } } + + @available(*, deprecated, message: "deprecated because it tests deprecated functionality") + func testDeprecatedSetBytes() { + self.buf.clear() + self.buf.writeString("hello") + self.buf.set(buffer: self.buf, at: 5) + self.buf.moveWriterIndex(forwardBy: 5) + XCTAssertEqual("hellohello", self.buf.readString(length: 10)) + } } private enum AllocationExpectationState: Int { diff --git a/Tests/NIOTests/ChannelNotificationTest+XCTest.swift b/Tests/NIOTests/ChannelNotificationTest+XCTest.swift index b693e55b..59e4780a 100644 --- a/Tests/NIOTests/ChannelNotificationTest+XCTest.swift +++ b/Tests/NIOTests/ChannelNotificationTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension ChannelNotificationTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (ChannelNotificationTest) -> () throws -> Void)] { return [ ("testNotificationOrder", testNotificationOrder), diff --git a/Tests/NIOTests/ChannelOptionStorageTest+XCTest.swift b/Tests/NIOTests/ChannelOptionStorageTest+XCTest.swift index 00a7ec9a..47765b37 100644 --- a/Tests/NIOTests/ChannelOptionStorageTest+XCTest.swift +++ b/Tests/NIOTests/ChannelOptionStorageTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension ChannelOptionStorageTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (ChannelOptionStorageTest) -> () throws -> Void)] { return [ ("testWeStartWithNoOptions", testWeStartWithNoOptions), diff --git a/Tests/NIOTests/ChannelPipelineTest+XCTest.swift b/Tests/NIOTests/ChannelPipelineTest+XCTest.swift index bc482314..004324a2 100644 --- a/Tests/NIOTests/ChannelPipelineTest+XCTest.swift +++ b/Tests/NIOTests/ChannelPipelineTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension ChannelPipelineTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (ChannelPipelineTest) -> () throws -> Void)] { return [ ("testGetHandler", testGetHandler), diff --git a/Tests/NIOTests/ChannelTests+XCTest.swift b/Tests/NIOTests/ChannelTests+XCTest.swift index d96a25ea..991455a5 100644 --- a/Tests/NIOTests/ChannelTests+XCTest.swift +++ b/Tests/NIOTests/ChannelTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension ChannelTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (ChannelTests) -> () throws -> Void)] { return [ ("testBasicLifecycle", testBasicLifecycle), diff --git a/Tests/NIOTests/CircularBufferTests+XCTest.swift b/Tests/NIOTests/CircularBufferTests+XCTest.swift index c9cf1ac0..02e6a637 100644 --- a/Tests/NIOTests/CircularBufferTests+XCTest.swift +++ b/Tests/NIOTests/CircularBufferTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension CircularBufferTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (CircularBufferTests) -> () throws -> Void)] { return [ ("testTrivial", testTrivial), diff --git a/Tests/NIOTests/CodecTest+XCTest.swift b/Tests/NIOTests/CodecTest+XCTest.swift index 27c885dc..d79f3bf7 100644 --- a/Tests/NIOTests/CodecTest+XCTest.swift +++ b/Tests/NIOTests/CodecTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension ByteToMessageDecoderTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (ByteToMessageDecoderTest) -> () throws -> Void)] { return [ ("testDecoder", testDecoder), @@ -66,6 +67,7 @@ extension ByteToMessageDecoderTest { extension MessageToByteEncoderTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (MessageToByteEncoderTest) -> () throws -> Void)] { return [ ("testEncoderOverrideAllocateOutBuffer", testEncoderOverrideAllocateOutBuffer), @@ -76,6 +78,7 @@ extension MessageToByteEncoderTest { extension MessageToByteHandlerTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (MessageToByteHandlerTest) -> () throws -> Void)] { return [ ("testThrowingEncoderFailsPromises", testThrowingEncoderFailsPromises), diff --git a/Tests/NIOTests/CustomChannelTests+XCTest.swift b/Tests/NIOTests/CustomChannelTests+XCTest.swift index acf99449..c493ac1c 100644 --- a/Tests/NIOTests/CustomChannelTests+XCTest.swift +++ b/Tests/NIOTests/CustomChannelTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension CustomChannelTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (CustomChannelTests) -> () throws -> Void)] { return [ ("testWritingIntToSpecialChannel", testWritingIntToSpecialChannel), diff --git a/Tests/NIOTests/DatagramChannelTests+XCTest.swift b/Tests/NIOTests/DatagramChannelTests+XCTest.swift index 8b6e69d1..a2431da3 100644 --- a/Tests/NIOTests/DatagramChannelTests+XCTest.swift +++ b/Tests/NIOTests/DatagramChannelTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension DatagramChannelTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (DatagramChannelTests) -> () throws -> Void)] { return [ ("testBasicChannelCommunication", testBasicChannelCommunication), diff --git a/Tests/NIOTests/EchoServerClientTest+XCTest.swift b/Tests/NIOTests/EchoServerClientTest+XCTest.swift index 6266faa0..54d16e6d 100644 --- a/Tests/NIOTests/EchoServerClientTest+XCTest.swift +++ b/Tests/NIOTests/EchoServerClientTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension EchoServerClientTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (EchoServerClientTest) -> () throws -> Void)] { return [ ("testEcho", testEcho), diff --git a/Tests/NIOTests/EmbeddedChannelTest+XCTest.swift b/Tests/NIOTests/EmbeddedChannelTest+XCTest.swift index 2b128af6..287cc6f7 100644 --- a/Tests/NIOTests/EmbeddedChannelTest+XCTest.swift +++ b/Tests/NIOTests/EmbeddedChannelTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension EmbeddedChannelTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (EmbeddedChannelTest) -> () throws -> Void)] { return [ ("testWriteOutboundByteBuffer", testWriteOutboundByteBuffer), diff --git a/Tests/NIOTests/EmbeddedEventLoopTest+XCTest.swift b/Tests/NIOTests/EmbeddedEventLoopTest+XCTest.swift index 34c83860..c8a1259d 100644 --- a/Tests/NIOTests/EmbeddedEventLoopTest+XCTest.swift +++ b/Tests/NIOTests/EmbeddedEventLoopTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension EmbeddedEventLoopTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (EmbeddedEventLoopTest) -> () throws -> Void)] { return [ ("testExecuteDoesNotImmediatelyRunTasks", testExecuteDoesNotImmediatelyRunTasks), diff --git a/Tests/NIOTests/EventLoopFutureTest+XCTest.swift b/Tests/NIOTests/EventLoopFutureTest+XCTest.swift index c302b6e9..c0964406 100644 --- a/Tests/NIOTests/EventLoopFutureTest+XCTest.swift +++ b/Tests/NIOTests/EventLoopFutureTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension EventLoopFutureTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (EventLoopFutureTest) -> () throws -> Void)] { return [ ("testFutureFulfilledIfHasResult", testFutureFulfilledIfHasResult), diff --git a/Tests/NIOTests/EventLoopTest+XCTest.swift b/Tests/NIOTests/EventLoopTest+XCTest.swift index 9cedd4d1..a087846e 100644 --- a/Tests/NIOTests/EventLoopTest+XCTest.swift +++ b/Tests/NIOTests/EventLoopTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension EventLoopTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (EventLoopTest) -> () throws -> Void)] { return [ ("testSchedule", testSchedule), diff --git a/Tests/NIOTests/FileRegionTest+XCTest.swift b/Tests/NIOTests/FileRegionTest+XCTest.swift index fba1c9c6..a79766e0 100644 --- a/Tests/NIOTests/FileRegionTest+XCTest.swift +++ b/Tests/NIOTests/FileRegionTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension FileRegionTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (FileRegionTest) -> () throws -> Void)] { return [ ("testWriteFileRegion", testWriteFileRegion), diff --git a/Tests/NIOTests/GetAddrInfoResolverTest+XCTest.swift b/Tests/NIOTests/GetAddrInfoResolverTest+XCTest.swift index 7f916653..c023333f 100644 --- a/Tests/NIOTests/GetAddrInfoResolverTest+XCTest.swift +++ b/Tests/NIOTests/GetAddrInfoResolverTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension GetaddrinfoResolverTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (GetaddrinfoResolverTest) -> () throws -> Void)] { return [ ("testResolveNoDuplicatesV4", testResolveNoDuplicatesV4), diff --git a/Tests/NIOTests/HappyEyeballsTest+XCTest.swift b/Tests/NIOTests/HappyEyeballsTest+XCTest.swift index 6acb2ec4..404200a0 100644 --- a/Tests/NIOTests/HappyEyeballsTest+XCTest.swift +++ b/Tests/NIOTests/HappyEyeballsTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HappyEyeballsTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HappyEyeballsTest) -> () throws -> Void)] { return [ ("testIPv4OnlyResolution", testIPv4OnlyResolution), diff --git a/Tests/NIOTests/HeapTests+XCTest.swift b/Tests/NIOTests/HeapTests+XCTest.swift index f7bf2cab..3d8da963 100644 --- a/Tests/NIOTests/HeapTests+XCTest.swift +++ b/Tests/NIOTests/HeapTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension HeapTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (HeapTests) -> () throws -> Void)] { return [ ("testSimple", testSimple), diff --git a/Tests/NIOTests/IdleStateHandlerTest+XCTest.swift b/Tests/NIOTests/IdleStateHandlerTest+XCTest.swift index 7a392ee2..6d9f22ee 100644 --- a/Tests/NIOTests/IdleStateHandlerTest+XCTest.swift +++ b/Tests/NIOTests/IdleStateHandlerTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension IdleStateHandlerTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (IdleStateHandlerTest) -> () throws -> Void)] { return [ ("testIdleRead", testIdleRead), diff --git a/Tests/NIOTests/IntegerTypesTest+XCTest.swift b/Tests/NIOTests/IntegerTypesTest+XCTest.swift index 041b16f7..8217de64 100644 --- a/Tests/NIOTests/IntegerTypesTest+XCTest.swift +++ b/Tests/NIOTests/IntegerTypesTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension IntegerTypesTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (IntegerTypesTest) -> () throws -> Void)] { return [ ("testNextPowerOfOfTwoZero", testNextPowerOfOfTwoZero), diff --git a/Tests/NIOTests/MarkedCircularBufferTests+XCTest.swift b/Tests/NIOTests/MarkedCircularBufferTests+XCTest.swift index b089dd7f..6feafb42 100644 --- a/Tests/NIOTests/MarkedCircularBufferTests+XCTest.swift +++ b/Tests/NIOTests/MarkedCircularBufferTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension MarkedCircularBufferTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (MarkedCircularBufferTests) -> () throws -> Void)] { return [ ("testEmptyMark", testEmptyMark), diff --git a/Tests/NIOTests/MulticastTest+XCTest.swift b/Tests/NIOTests/MulticastTest+XCTest.swift index 73d07cde..a5bed29a 100644 --- a/Tests/NIOTests/MulticastTest+XCTest.swift +++ b/Tests/NIOTests/MulticastTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension MulticastTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (MulticastTest) -> () throws -> Void)] { return [ ("testCanJoinBasicMulticastGroupIPv4", testCanJoinBasicMulticastGroupIPv4), diff --git a/Tests/NIOTests/NIOAnyDebugTest+XCTest.swift b/Tests/NIOTests/NIOAnyDebugTest+XCTest.swift index 50b2978b..3ac0f8cb 100644 --- a/Tests/NIOTests/NIOAnyDebugTest+XCTest.swift +++ b/Tests/NIOTests/NIOAnyDebugTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension NIOAnyDebugTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (NIOAnyDebugTest) -> () throws -> Void)] { return [ ("testCustomStringConvertible", testCustomStringConvertible), diff --git a/Tests/NIOTests/NIOCloseOnErrorHandlerTest+XCTest.swift b/Tests/NIOTests/NIOCloseOnErrorHandlerTest+XCTest.swift index 9089c4ea..c3e1440c 100644 --- a/Tests/NIOTests/NIOCloseOnErrorHandlerTest+XCTest.swift +++ b/Tests/NIOTests/NIOCloseOnErrorHandlerTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension NIOCloseOnErrorHandlerTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (NIOCloseOnErrorHandlerTest) -> () throws -> Void)] { return [ ("testChannelCloseOnError", testChannelCloseOnError), diff --git a/Tests/NIOTests/NonBlockingFileIOTest+XCTest.swift b/Tests/NIOTests/NonBlockingFileIOTest+XCTest.swift index 088cd7ce..ccd194d6 100644 --- a/Tests/NIOTests/NonBlockingFileIOTest+XCTest.swift +++ b/Tests/NIOTests/NonBlockingFileIOTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension NonBlockingFileIOTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (NonBlockingFileIOTest) -> () throws -> Void)] { return [ ("testBasicFileIOWorks", testBasicFileIOWorks), diff --git a/Tests/NIOTests/PendingDatagramWritesManagerTests+XCTest.swift b/Tests/NIOTests/PendingDatagramWritesManagerTests+XCTest.swift index b7d0a37c..a3465065 100644 --- a/Tests/NIOTests/PendingDatagramWritesManagerTests+XCTest.swift +++ b/Tests/NIOTests/PendingDatagramWritesManagerTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension PendingDatagramWritesManagerTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (PendingDatagramWritesManagerTests) -> () throws -> Void)] { return [ ("testPendingWritesEmptyWritesWorkAndWeDontWriteUnflushedThings", testPendingWritesEmptyWritesWorkAndWeDontWriteUnflushedThings), diff --git a/Tests/NIOTests/PipeChannelTest+XCTest.swift b/Tests/NIOTests/PipeChannelTest+XCTest.swift index 8d7b69e4..1a8a81b9 100644 --- a/Tests/NIOTests/PipeChannelTest+XCTest.swift +++ b/Tests/NIOTests/PipeChannelTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension PipeChannelTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (PipeChannelTest) -> () throws -> Void)] { return [ ("testBasicIO", testBasicIO), diff --git a/Tests/NIOTests/PriorityQueueTests+XCTest.swift b/Tests/NIOTests/PriorityQueueTests+XCTest.swift index bc22addb..701d0958 100644 --- a/Tests/NIOTests/PriorityQueueTests+XCTest.swift +++ b/Tests/NIOTests/PriorityQueueTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension PriorityQueueTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (PriorityQueueTest) -> () throws -> Void)] { return [ ("testSomeStringsAsc", testSomeStringsAsc), diff --git a/Tests/NIOTests/RecvByteBufAllocatorTest+XCTest.swift b/Tests/NIOTests/RecvByteBufAllocatorTest+XCTest.swift index 84a9c15a..6e5ad212 100644 --- a/Tests/NIOTests/RecvByteBufAllocatorTest+XCTest.swift +++ b/Tests/NIOTests/RecvByteBufAllocatorTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension AdaptiveRecvByteBufferAllocatorTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (AdaptiveRecvByteBufferAllocatorTest) -> () throws -> Void)] { return [ ("testAdaptive", testAdaptive), diff --git a/Tests/NIOTests/SelectorTest+XCTest.swift b/Tests/NIOTests/SelectorTest+XCTest.swift index 99a7861e..b64b968f 100644 --- a/Tests/NIOTests/SelectorTest+XCTest.swift +++ b/Tests/NIOTests/SelectorTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension SelectorTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (SelectorTest) -> () throws -> Void)] { return [ ("testDeregisterWhileProcessingEvents", testDeregisterWhileProcessingEvents), diff --git a/Tests/NIOTests/SocketAddressTest+XCTest.swift b/Tests/NIOTests/SocketAddressTest+XCTest.swift index 6ee7f125..dbf92700 100644 --- a/Tests/NIOTests/SocketAddressTest+XCTest.swift +++ b/Tests/NIOTests/SocketAddressTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension SocketAddressTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (SocketAddressTest) -> () throws -> Void)] { return [ ("testDescriptionWorks", testDescriptionWorks), diff --git a/Tests/NIOTests/SocketChannelTest+XCTest.swift b/Tests/NIOTests/SocketChannelTest+XCTest.swift index 7939adf0..8b7951a2 100644 --- a/Tests/NIOTests/SocketChannelTest+XCTest.swift +++ b/Tests/NIOTests/SocketChannelTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension SocketChannelTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (SocketChannelTest) -> () throws -> Void)] { return [ ("testAsyncSetOption", testAsyncSetOption), diff --git a/Tests/NIOTests/SocketOptionProviderTest+XCTest.swift b/Tests/NIOTests/SocketOptionProviderTest+XCTest.swift index aeb846d0..e0b8af4c 100644 --- a/Tests/NIOTests/SocketOptionProviderTest+XCTest.swift +++ b/Tests/NIOTests/SocketOptionProviderTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension SocketOptionProviderTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (SocketOptionProviderTest) -> () throws -> Void)] { return [ ("testSettingAndGettingComplexSocketOption", testSettingAndGettingComplexSocketOption), diff --git a/Tests/NIOTests/StreamChannelsTest+XCTest.swift b/Tests/NIOTests/StreamChannelsTest+XCTest.swift index a4b26449..1de3408b 100644 --- a/Tests/NIOTests/StreamChannelsTest+XCTest.swift +++ b/Tests/NIOTests/StreamChannelsTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension StreamChannelTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (StreamChannelTest) -> () throws -> Void)] { return [ ("testEchoBasic", testEchoBasic), diff --git a/Tests/NIOTests/SystemTest+XCTest.swift b/Tests/NIOTests/SystemTest+XCTest.swift index 4802ead9..56ae6aad 100644 --- a/Tests/NIOTests/SystemTest+XCTest.swift +++ b/Tests/NIOTests/SystemTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension SystemTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (SystemTest) -> () throws -> Void)] { return [ ("testSystemCallWrapperPerformance", testSystemCallWrapperPerformance), diff --git a/Tests/NIOTests/ThreadTest+XCTest.swift b/Tests/NIOTests/ThreadTest+XCTest.swift index 695cfc53..5b451bb5 100644 --- a/Tests/NIOTests/ThreadTest+XCTest.swift +++ b/Tests/NIOTests/ThreadTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension ThreadTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (ThreadTest) -> () throws -> Void)] { return [ ("testCurrentThreadWorks", testCurrentThreadWorks), diff --git a/Tests/NIOTests/TypeAssistedChannelHandlerTests+XCTest.swift b/Tests/NIOTests/TypeAssistedChannelHandlerTests+XCTest.swift index d7381376..97cc242c 100644 --- a/Tests/NIOTests/TypeAssistedChannelHandlerTests+XCTest.swift +++ b/Tests/NIOTests/TypeAssistedChannelHandlerTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension TypeAssistedChannelHandlerTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (TypeAssistedChannelHandlerTest) -> () throws -> Void)] { return [ ("testCanDefineBothInboundAndOutbound", testCanDefineBothInboundAndOutbound), diff --git a/Tests/NIOTests/UtilitiesTest+XCTest.swift b/Tests/NIOTests/UtilitiesTest+XCTest.swift index c18ddd90..9163879b 100644 --- a/Tests/NIOTests/UtilitiesTest+XCTest.swift +++ b/Tests/NIOTests/UtilitiesTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension UtilitiesTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (UtilitiesTest) -> () throws -> Void)] { return [ ("testCoreCountWorks", testCoreCountWorks), diff --git a/Tests/NIOWebSocketTests/Base64Test+XCTest.swift b/Tests/NIOWebSocketTests/Base64Test+XCTest.swift index 2d81b114..49846f1b 100644 --- a/Tests/NIOWebSocketTests/Base64Test+XCTest.swift +++ b/Tests/NIOWebSocketTests/Base64Test+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension Base64Test { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (Base64Test) -> () throws -> Void)] { return [ ("testEncodeEmptyData", testEncodeEmptyData), diff --git a/Tests/NIOWebSocketTests/WebSocketClientEndToEndTests+XCTest.swift b/Tests/NIOWebSocketTests/WebSocketClientEndToEndTests+XCTest.swift index 17de16dc..23eb450d 100644 --- a/Tests/NIOWebSocketTests/WebSocketClientEndToEndTests+XCTest.swift +++ b/Tests/NIOWebSocketTests/WebSocketClientEndToEndTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension WebSocketClientEndToEndTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (WebSocketClientEndToEndTests) -> () throws -> Void)] { return [ ("testSimpleUpgradeSucceeds", testSimpleUpgradeSucceeds), diff --git a/Tests/NIOWebSocketTests/WebSocketFrameDecoderTest+XCTest.swift b/Tests/NIOWebSocketTests/WebSocketFrameDecoderTest+XCTest.swift index caf767ce..9c6fd45d 100644 --- a/Tests/NIOWebSocketTests/WebSocketFrameDecoderTest+XCTest.swift +++ b/Tests/NIOWebSocketTests/WebSocketFrameDecoderTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension WebSocketFrameDecoderTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (WebSocketFrameDecoderTest) -> () throws -> Void)] { return [ ("testFramesWithoutBodies", testFramesWithoutBodies), diff --git a/Tests/NIOWebSocketTests/WebSocketFrameEncoderTest+XCTest.swift b/Tests/NIOWebSocketTests/WebSocketFrameEncoderTest+XCTest.swift index 9de418aa..faeb846a 100644 --- a/Tests/NIOWebSocketTests/WebSocketFrameEncoderTest+XCTest.swift +++ b/Tests/NIOWebSocketTests/WebSocketFrameEncoderTest+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension WebSocketFrameEncoderTest { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (WebSocketFrameEncoderTest) -> () throws -> Void)] { return [ ("testBasicFrameEncoding", testBasicFrameEncoding), diff --git a/Tests/NIOWebSocketTests/WebSocketServerEndToEndTests+XCTest.swift b/Tests/NIOWebSocketTests/WebSocketServerEndToEndTests+XCTest.swift index 216b12f1..d306f8e9 100644 --- a/Tests/NIOWebSocketTests/WebSocketServerEndToEndTests+XCTest.swift +++ b/Tests/NIOWebSocketTests/WebSocketServerEndToEndTests+XCTest.swift @@ -24,6 +24,7 @@ import XCTest extension WebSocketServerEndToEndTests { + @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings") static var allTests : [(String, (WebSocketServerEndToEndTests) -> () throws -> Void)] { return [ ("testBasicUpgradeDance", testBasicUpgradeDance), diff --git a/scripts/generate_linux_tests.rb b/scripts/generate_linux_tests.rb index f2af9fdb..a6f1a535 100755 --- a/scripts/generate_linux_tests.rb +++ b/scripts/generate_linux_tests.rb @@ -72,6 +72,7 @@ def createExtensionFile(fileName, classes) for classArray in classes file.write 'extension ' + classArray[0] + " {\n\n" + file.write ' @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings")' +"\n" file.write ' static var allTests : [(String, (' + classArray[0] + ") -> () throws -> Void)] {\n" file.write " return [\n" @@ -99,7 +100,15 @@ def createLinuxMain(testsDirectory, allTestSubDirectories, files) file.write ' @testable import ' + testSubDirectory + "\n" end file.write "\n" - file.write " XCTMain([\n" + file.write "// This protocol is necessary to we can call the 'run' method (on an existential of this protocol)\n" + file.write "// without the compiler noticing that we're calling a deprecated function.\n" + file.write "// This hack exists so we can deprecate individual tests which test deprecated functionality without\n" + file.write "// getting a compiler warning...\n" + file.write "protocol LinuxMainRunner { func run() }\n" + file.write "class LinuxMainRunnerImpl: LinuxMainRunner {\n" + file.write ' @available(*, deprecated, message: "not actually deprecated. Just deprecated to allow deprecated tests (which test deprecated functionality) without warnings")' + "\n" + file.write " func run() {\n" + file.write " XCTMain([\n" testCases = [] for classes in files @@ -109,9 +118,12 @@ def createLinuxMain(testsDirectory, allTestSubDirectories, files) end for testCase in testCases.sort { |x, y| x <=> y } - file.write ' testCase(' + testCase + ".allTests),\n" + file.write ' testCase(' + testCase + ".allTests),\n" end - file.write " ])\n" + file.write " ])\n" + file.write " }\n" + file.write "}\n" + file.write "(LinuxMainRunnerImpl() as LinuxMainRunner).run()\n" file.write "#endif\n" end end