You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2019/04/23 19:40:35 UTC
[mynewt-core] branch master updated: test: Remove deprecated API
This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new c29b16e test: Remove deprecated API
c29b16e is described below
commit c29b16ecd74bd717a32a8f62ac9baa36acdf9d84
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Tue Apr 23 08:46:25 2019 -0700
test: Remove deprecated API
---
test/runtest/include/runtest/runtest.h | 4 --
test/testutil/include/testutil/deprecated.h | 77 -----------------------------
test/testutil/include/testutil/testutil.h | 5 --
test/testutil/src/case.c | 12 -----
test/testutil/src/deprecated.c | 73 ---------------------------
test/testutil/src/suite.c | 22 ---------
6 files changed, 193 deletions(-)
diff --git a/test/runtest/include/runtest/runtest.h b/test/runtest/include/runtest/runtest.h
index 8cc6b98..5b5c450 100644
--- a/test/runtest/include/runtest/runtest.h
+++ b/test/runtest/include/runtest/runtest.h
@@ -77,10 +77,6 @@ int runtest_run(const char *test_name, const char *token);
*/
int runtest_total_fails_get(void);
-/* XXX: Deprecated API. Remove after next release. */
-struct os_task *runtest_init_task(
- os_task_func_t task_handler, uint8_t prio) __attribute__((deprecated));
-
#ifdef __cplusplus
}
#endif
diff --git a/test/testutil/include/testutil/deprecated.h b/test/testutil/include/testutil/deprecated.h
deleted file mode 100644
index 3669cec..0000000
--- a/test/testutil/include/testutil/deprecated.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_TESTUTIL_DEPRECATED_
-#define H_TESTUTIL_DEPRECATED_
-
-/* XXX: Deprecated API. Remove after next release. */
-
-typedef void tu_init_test_fn_t(void *arg);
-
-struct tu_deprecated_cfg {
- /*
- * Called prior to the first test in the suite
- */
- tu_init_test_fn_t *ts_suite_init_cb;
- void *ts_suite_init_arg;
-
- /*
- * Called after the last test in the suite
- */
- tu_init_test_fn_t *ts_suite_complete_cb;
- void *ts_suite_complete_arg;
-
- /*
- * Called to initialize the test case
- * Note: This callback does not get reset automatically.
- */
- tu_init_test_fn_t *tc_case_init_cb;
- void *tc_case_init_arg;
-
- /*
- * Called prior to the test case start
- */
- tu_pre_test_fn_t *tc_case_pre_test_cb;
- void *tc_case_pre_arg;
-
- /*
- * Called after the test case completes
- */
- tu_post_test_fn_t *tc_case_post_test_cb;
- void *tc_case_post_arg;
-};
-
-void tu_suite_set_init_cb(
- tu_init_test_fn_t *cb, void *cb_arg) __attribute__((deprecated));
-void tu_suite_set_complete_cb(
- tu_init_test_fn_t *cb, void *cb_arg) __attribute__((deprecated));
-void tu_suite_set_post_test_cb(
- tu_post_test_fn_t *cb, void *cb_arg) __attribute__((deprecated));
-void tu_suite_set_pass_cb(
- tu_case_report_fn_t *cb, void *cb_arg) __attribute__((deprecated));
-void tu_suite_set_fail_cb(
- tu_case_report_fn_t *cb, void *cb_arg) __attribute__((deprecated));
-void tu_case_set_init_cb(
- tu_init_test_fn_t *cb, void *cb_arg) __attribute__((deprecated));
-void tu_case_set_pre_cb(
- tu_pre_test_fn_t *cb, void *cb_arg) __attribute__((deprecated));
-void tu_case_set_post_cb(
- tu_post_test_fn_t *cb, void *cb_arg) __attribute__((deprecated));
-
-#endif
diff --git a/test/testutil/include/testutil/testutil.h b/test/testutil/include/testutil/testutil.h
index 790694a..7f16795 100644
--- a/test/testutil/include/testutil/testutil.h
+++ b/test/testutil/include/testutil/testutil.h
@@ -69,8 +69,6 @@ struct ts_suite {
SLIST_HEAD(ts_testsuite_list, ts_suite);
extern struct ts_testsuite_list g_ts_suites;
-#include "testutil/deprecated.h"
-
struct tu_config {
int ts_system_assert;
@@ -96,9 +94,6 @@ struct tu_config {
*/
tu_case_report_fn_t *fail_cb;
void *fail_arg;
-
- /* XXX: Deprecated; remove after next releas. */
- struct tu_deprecated_cfg deprecated;
};
void tu_restart(void);
diff --git a/test/testutil/src/case.c b/test/testutil/src/case.c
index b2f5ff7..239e402 100644
--- a/test/testutil/src/case.c
+++ b/test/testutil/src/case.c
@@ -95,12 +95,6 @@ tu_case_init(const char *name)
tu_case_reported = 0;
tu_case_failed = 0;
tu_case_set_name(name);
-
- /* XXX: Deprecated; remove after next release. */
- if (tu_config.deprecated.tc_case_init_cb != NULL) {
- tu_config.deprecated.tc_case_init_cb(
- tu_config.deprecated.tc_case_init_arg);
- }
}
void
@@ -116,12 +110,6 @@ tu_case_post_test(void)
if (tu_config.post_test_cb != NULL) {
tu_config.post_test_cb(tu_config.post_test_arg);
}
-
- /* XXX: Deprecated; remove after next release. */
- if (tu_config.deprecated.tc_case_post_test_cb != NULL) {
- tu_config.deprecated.tc_case_post_test_cb(
- tu_config.deprecated.tc_case_post_test_cb);
- }
}
static void
diff --git a/test/testutil/src/deprecated.c b/test/testutil/src/deprecated.c
deleted file mode 100644
index c022845..0000000
--- a/test/testutil/src/deprecated.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "testutil/testutil.h"
-
-void
-tu_suite_set_init_cb(tu_init_test_fn_t *cb, void *cb_arg)
-{
- tu_config.deprecated.ts_suite_init_cb = cb;
- tu_config.deprecated.ts_suite_init_arg = cb_arg;
-}
-
-void
-tu_suite_set_complete_cb(tu_init_test_fn_t *cb, void *cb_arg)
-{
- tu_config.deprecated.ts_suite_complete_cb = cb;
- tu_config.deprecated.ts_suite_complete_arg = cb_arg;
-}
-
-void
-tu_suite_set_post_test_cb(tu_post_test_fn_t *cb, void *cb_arg)
-{
- tu_config.deprecated.tc_case_post_test_cb = cb;
- tu_config.deprecated.tc_case_post_arg = cb_arg;
-}
-
-void
-tu_suite_set_pass_cb(tu_case_report_fn_t *cb, void *cb_arg)
-{
- tu_set_pass_cb(cb, cb_arg);
-}
-
-void
-tu_suite_set_fail_cb(tu_case_report_fn_t *cb, void *cb_arg)
-{
- tu_set_fail_cb(cb, cb_arg);
-}
-
-void
-tu_case_set_init_cb(tu_init_test_fn_t *cb, void *cb_arg)
-{
- tu_config.deprecated.tc_case_init_cb = cb;
- tu_config.deprecated.tc_case_init_arg = cb_arg;
-}
-
-void
-tu_case_set_pre_cb(tu_pre_test_fn_t *cb, void *cb_arg)
-{
- tu_config.deprecated.tc_case_pre_test_cb = cb;
- tu_config.deprecated.tc_case_pre_arg = cb_arg;
-}
-
-void
-tu_case_set_post_cb(tu_post_test_fn_t *cb, void *cb_arg)
-{
- tu_case_set_post_test_cb(cb, cb_arg);
-}
diff --git a/test/testutil/src/suite.c b/test/testutil/src/suite.c
index 3f7bfc0..62b6c50 100644
--- a/test/testutil/src/suite.c
+++ b/test/testutil/src/suite.c
@@ -77,28 +77,12 @@ tu_suite_pre_test(void)
if (tu_config.pre_test_cb != NULL) {
tu_config.pre_test_cb(tu_config.pre_test_arg);
}
-
- /* XXX: Deprecated; remove after next release. */
- if (tu_config.deprecated.tc_case_pre_test_cb != NULL) {
- tu_config.deprecated.tc_case_pre_test_cb(
- tu_config.deprecated.tc_case_pre_arg);
- }
}
void
tu_suite_complete(void)
{
tu_suite_set_pre_test_cb(NULL, NULL);
-
- /* XXX: Deprecated; remove after next release. */
- if (tu_config.deprecated.ts_suite_complete_cb != NULL) {
- tu_config.deprecated.ts_suite_complete_cb(
- tu_config.deprecated.ts_suite_complete_arg);
- }
- tu_config.deprecated.ts_suite_init_cb = NULL;
- tu_config.deprecated.ts_suite_complete_cb = NULL;
- tu_config.deprecated.tc_case_pre_test_cb = NULL;
- tu_config.deprecated.tc_case_post_test_cb = NULL;
}
void
@@ -106,10 +90,4 @@ tu_suite_init(const char *name)
{
tu_suite_failed = 0;
tu_suite_set_name(name);
-
- /* XXX: Deprecated; remove after next release. */
- if (tu_config.deprecated.ts_suite_init_cb != NULL) {
- tu_config.deprecated.ts_suite_init_cb(
- tu_config.deprecated.ts_suite_init_arg);
- }
}