Commit 9c5e05ad7621228b0d7e6b3b23d96b917604a53c
2019-01-23T10:43:29
deprecation: move deprecated tests into their own file Move the deprecated stream tests into their own compilation unit. This will allow us to disable any preprocessor directives that apply to deprecation just for these tests (eg, disabling `GIT_DEPRECATED_HARD`).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344
diff --git a/tests/core/stream.c b/tests/core/stream.c
deleted file mode 100644
index f15dce3..0000000
--- a/tests/core/stream.c
+++ /dev/null
@@ -1,151 +0,0 @@
-#include "clar_libgit2.h"
-#include "git2/sys/stream.h"
-#include "streams/tls.h"
-#include "streams/socket.h"
-#include "stream.h"
-
-static git_stream test_stream;
-static int ctor_called;
-
-void test_core_stream__cleanup(void)
-{
- cl_git_pass(git_stream_register(GIT_STREAM_TLS | GIT_STREAM_STANDARD, NULL));
-}
-
-static int test_stream_init(git_stream **out, const char *host, const char *port)
-{
- GIT_UNUSED(host);
- GIT_UNUSED(port);
-
- ctor_called = 1;
- *out = &test_stream;
-
- return 0;
-}
-
-static int test_stream_wrap(git_stream **out, git_stream *in, const char *host)
-{
- GIT_UNUSED(in);
- GIT_UNUSED(host);
-
- ctor_called = 1;
- *out = &test_stream;
-
- return 0;
-}
-
-void test_core_stream__register_insecure(void)
-{
- git_stream *stream;
- git_stream_registration registration = {0};
-
- registration.version = 1;
- registration.init = test_stream_init;
- registration.wrap = test_stream_wrap;
-
- ctor_called = 0;
- cl_git_pass(git_stream_register(GIT_STREAM_STANDARD, ®istration));
- cl_git_pass(git_socket_stream_new(&stream, "localhost", "80"));
- cl_assert_equal_i(1, ctor_called);
- cl_assert_equal_p(&test_stream, stream);
-
- ctor_called = 0;
- stream = NULL;
- cl_git_pass(git_stream_register(GIT_STREAM_STANDARD, NULL));
- cl_git_pass(git_socket_stream_new(&stream, "localhost", "80"));
-
- cl_assert_equal_i(0, ctor_called);
- cl_assert(&test_stream != stream);
-
- git_stream_free(stream);
-}
-
-void test_core_stream__register_tls(void)
-{
- git_stream *stream;
- git_stream_registration registration = {0};
- int error;
-
- registration.version = 1;
- registration.init = test_stream_init;
- registration.wrap = test_stream_wrap;
-
- ctor_called = 0;
- cl_git_pass(git_stream_register(GIT_STREAM_TLS, ®istration));
- cl_git_pass(git_tls_stream_new(&stream, "localhost", "443"));
- cl_assert_equal_i(1, ctor_called);
- cl_assert_equal_p(&test_stream, stream);
-
- ctor_called = 0;
- stream = NULL;
- cl_git_pass(git_stream_register(GIT_STREAM_TLS, NULL));
- error = git_tls_stream_new(&stream, "localhost", "443");
-
- /* We don't have TLS support enabled, or we're on Windows,
- * which has no arbitrary TLS stream support.
- */
-#if defined(GIT_WIN32) || !defined(GIT_HTTPS)
- cl_git_fail_with(-1, error);
-#else
- cl_git_pass(error);
-#endif
-
- cl_assert_equal_i(0, ctor_called);
- cl_assert(&test_stream != stream);
-
- git_stream_free(stream);
-}
-
-void test_core_stream__register_both(void)
-{
- git_stream *stream;
- git_stream_registration registration = {0};
-
- registration.version = 1;
- registration.init = test_stream_init;
- registration.wrap = test_stream_wrap;
-
- cl_git_pass(git_stream_register(GIT_STREAM_STANDARD | GIT_STREAM_TLS, ®istration));
-
- ctor_called = 0;
- cl_git_pass(git_tls_stream_new(&stream, "localhost", "443"));
- cl_assert_equal_i(1, ctor_called);
- cl_assert_equal_p(&test_stream, stream);
-
- ctor_called = 0;
- cl_git_pass(git_socket_stream_new(&stream, "localhost", "80"));
- cl_assert_equal_i(1, ctor_called);
- cl_assert_equal_p(&test_stream, stream);
-}
-
-void test_core_stream__register_tls_deprecated(void)
-{
- git_stream *stream;
- int error;
-
- ctor_called = 0;
- cl_git_pass(git_stream_register_tls(test_stream_init));
- cl_git_pass(git_tls_stream_new(&stream, "localhost", "443"));
- cl_assert_equal_i(1, ctor_called);
- cl_assert_equal_p(&test_stream, stream);
-
- ctor_called = 0;
- stream = NULL;
- cl_git_pass(git_stream_register_tls(NULL));
- error = git_tls_stream_new(&stream, "localhost", "443");
-
- /*
- * We don't have TLS support enabled, or we're on Windows,
- * which has no arbitrary TLS stream support.
- */
-#if defined(GIT_WIN32) || !defined(GIT_HTTPS)
- cl_git_fail_with(-1, error);
-#else
- cl_git_pass(error);
-#endif
-
- cl_assert_equal_i(0, ctor_called);
- cl_assert(&test_stream != stream);
-
- git_stream_free(stream);
-}
diff --git a/tests/stream/deprecated.c b/tests/stream/deprecated.c
new file mode 100644
index 0000000..4fb422e
--- /dev/null
+++ b/tests/stream/deprecated.c
@@ -0,0 +1,56 @@
+#include "clar_libgit2.h"
+#include "git2/sys/stream.h"
+#include "streams/tls.h"
+#include "streams/socket.h"
+#include "stream.h"
+
+static git_stream test_stream;
+static int ctor_called;
+
+void test_stream_deprecated__cleanup(void)
+{
+ cl_git_pass(git_stream_register(GIT_STREAM_TLS | GIT_STREAM_STANDARD, NULL));
+}
+
+static int test_stream_init(git_stream **out, const char *host, const char *port)
+{
+ GIT_UNUSED(host);
+ GIT_UNUSED(port);
+
+ ctor_called = 1;
+ *out = &test_stream;
+
+ return 0;
+}
+
+void test_stream_deprecated__register_tls(void)
+{
+ git_stream *stream;
+ int error;
+
+ ctor_called = 0;
+ cl_git_pass(git_stream_register_tls(test_stream_init));
+ cl_git_pass(git_tls_stream_new(&stream, "localhost", "443"));
+ cl_assert_equal_i(1, ctor_called);
+ cl_assert_equal_p(&test_stream, stream);
+
+ ctor_called = 0;
+ stream = NULL;
+ cl_git_pass(git_stream_register_tls(NULL));
+ error = git_tls_stream_new(&stream, "localhost", "443");
+
+ /*
+ * We don't have TLS support enabled, or we're on Windows,
+ * which has no arbitrary TLS stream support.
+ */
+#if defined(GIT_WIN32) || !defined(GIT_HTTPS)
+ cl_git_fail_with(-1, error);
+#else
+ cl_git_pass(error);
+#endif
+
+ cl_assert_equal_i(0, ctor_called);
+ cl_assert(&test_stream != stream);
+
+ git_stream_free(stream);
+}
diff --git a/tests/stream/registration.c b/tests/stream/registration.c
new file mode 100644
index 0000000..bf3c205
--- /dev/null
+++ b/tests/stream/registration.c
@@ -0,0 +1,119 @@
+#include "clar_libgit2.h"
+#include "git2/sys/stream.h"
+#include "streams/tls.h"
+#include "streams/socket.h"
+#include "stream.h"
+
+static git_stream test_stream;
+static int ctor_called;
+
+void test_stream_registration__cleanup(void)
+{
+ cl_git_pass(git_stream_register(GIT_STREAM_TLS | GIT_STREAM_STANDARD, NULL));
+}
+
+static int test_stream_init(git_stream **out, const char *host, const char *port)
+{
+ GIT_UNUSED(host);
+ GIT_UNUSED(port);
+
+ ctor_called = 1;
+ *out = &test_stream;
+
+ return 0;
+}
+
+static int test_stream_wrap(git_stream **out, git_stream *in, const char *host)
+{
+ GIT_UNUSED(in);
+ GIT_UNUSED(host);
+
+ ctor_called = 1;
+ *out = &test_stream;
+
+ return 0;
+}
+
+void test_stream_registration__insecure(void)
+{
+ git_stream *stream;
+ git_stream_registration registration = {0};
+
+ registration.version = 1;
+ registration.init = test_stream_init;
+ registration.wrap = test_stream_wrap;
+
+ ctor_called = 0;
+ cl_git_pass(git_stream_register(GIT_STREAM_STANDARD, ®istration));
+ cl_git_pass(git_socket_stream_new(&stream, "localhost", "80"));
+ cl_assert_equal_i(1, ctor_called);
+ cl_assert_equal_p(&test_stream, stream);
+
+ ctor_called = 0;
+ stream = NULL;
+ cl_git_pass(git_stream_register(GIT_STREAM_STANDARD, NULL));
+ cl_git_pass(git_socket_stream_new(&stream, "localhost", "80"));
+
+ cl_assert_equal_i(0, ctor_called);
+ cl_assert(&test_stream != stream);
+
+ git_stream_free(stream);
+}
+
+void test_stream_registration__tls(void)
+{
+ git_stream *stream;
+ git_stream_registration registration = {0};
+ int error;
+
+ registration.version = 1;
+ registration.init = test_stream_init;
+ registration.wrap = test_stream_wrap;
+
+ ctor_called = 0;
+ cl_git_pass(git_stream_register(GIT_STREAM_TLS, ®istration));
+ cl_git_pass(git_tls_stream_new(&stream, "localhost", "443"));
+ cl_assert_equal_i(1, ctor_called);
+ cl_assert_equal_p(&test_stream, stream);
+
+ ctor_called = 0;
+ stream = NULL;
+ cl_git_pass(git_stream_register(GIT_STREAM_TLS, NULL));
+ error = git_tls_stream_new(&stream, "localhost", "443");
+
+ /* We don't have TLS support enabled, or we're on Windows,
+ * which has no arbitrary TLS stream support.
+ */
+#if defined(GIT_WIN32) || !defined(GIT_HTTPS)
+ cl_git_fail_with(-1, error);
+#else
+ cl_git_pass(error);
+#endif
+
+ cl_assert_equal_i(0, ctor_called);
+ cl_assert(&test_stream != stream);
+
+ git_stream_free(stream);
+}
+
+void test_stream_registration__both(void)
+{
+ git_stream *stream;
+ git_stream_registration registration = {0};
+
+ registration.version = 1;
+ registration.init = test_stream_init;
+ registration.wrap = test_stream_wrap;
+
+ cl_git_pass(git_stream_register(GIT_STREAM_STANDARD | GIT_STREAM_TLS, ®istration));
+
+ ctor_called = 0;
+ cl_git_pass(git_tls_stream_new(&stream, "localhost", "443"));
+ cl_assert_equal_i(1, ctor_called);
+ cl_assert_equal_p(&test_stream, stream);
+
+ ctor_called = 0;
+ cl_git_pass(git_socket_stream_new(&stream, "localhost", "80"));
+ cl_assert_equal_i(1, ctor_called);
+ cl_assert_equal_p(&test_stream, stream);
+}