From 78d7fe31f9db8ffd186cdfe61acddf12f69d97aa Mon Sep 17 00:00:00 2001 From: NĂ©lio Laranjeiro Date: Tue, 16 Oct 2012 16:18:31 +0200 Subject: cesar/bsu/test: add cable mode test, refs #3341 --- cesar/bsu/test/utest/Config | 2 ++ cesar/bsu/test/utest/Makefile | 22 +++++++++++++++++----- cesar/bsu/test/utest/src/bsut.c | 22 +++++++++++----------- cesar/bsu/test/utest/src/schedules.c | 14 +++++++------- 4 files changed, 37 insertions(+), 23 deletions(-) (limited to 'cesar') diff --git a/cesar/bsu/test/utest/Config b/cesar/bsu/test/utest/Config index 69e286cec7..c8e0346a7e 100644 --- a/cesar/bsu/test/utest/Config +++ b/cesar/bsu/test/utest/Config @@ -2,3 +2,5 @@ CONFIG_DEBUG_FATAL_CATCH=y CONFIG_RESTRACK=y CONFIG_TRACE = y CONFIG_STATS = y +CONFIG_ACLF_TRACKING[target-tracking] = y +CONFIG_ACLF_TRACKING[target-cable] = n diff --git a/cesar/bsu/test/utest/Makefile b/cesar/bsu/test/utest/Makefile index 9e84dc0dc9..d94b670990 100644 --- a/cesar/bsu/test/utest/Makefile +++ b/cesar/bsu/test/utest/Makefile @@ -1,10 +1,22 @@ BASE = ../../.. DEFS=-DNO_PRIVATE -HOST_PROGRAMS = test_bsu -test_bsu_SOURCES = tests.c bsu.c interface.c bsut.c schedules.c \ - countdown.c \ - ca.c sar.c pbproc_stub.c -test_bsu_MODULES = lib bsu mac/common hal/timer/stub +BUILD_TYPES = target-tracking target-cable + +TARGET_tracking= +TARGET_cable = + +common_SOURCES=tests.c bsu.c interface.c bsut.c schedules.c \ + countdown.c \ + ca.c sar.c pbproc_stub.c +common_MODULES = lib bsu mac/common hal/timer/stub + +TARGET_tracking_PROGRAMS = test_bsu_tracking +test_bsu_tracking_SOURCES = $(common_SOURCES) +test_bsu_tracking_MODULES = $(common_MODULES) + +TARGET_cable_PROGRAMS = test_bsu_cable +test_bsu_cable_SOURCES = $(common_SOURCES) +test_bsu_cable_MODULES = $(common_MODULES) include $(BASE)/common/make/top.mk diff --git a/cesar/bsu/test/utest/src/bsut.c b/cesar/bsu/test/utest/src/bsut.c index 4f5d69f347..c2d9260716 100644 --- a/cesar/bsu/test/utest/src/bsut.c +++ b/cesar/bsu/test/utest/src/bsut.c @@ -199,7 +199,7 @@ test_case_bsu_process (test_t test) &btx); b->phy_pb.pb_rx.pb_measurement.crc_error = false; t.bsu->sta_avln->beacon.beacon_period_start_date = - phy_date () - BSU_ACLF_BP_50HZ_TCK - 1000; + phy_date () - t.bsu->aclf->beacon_period_tck - 1000; bsu_beacon_t *bbeacon = bsu_beacon_process (t.bsu, b, &brx); blk_release (bbeacon); /* Change MAC config TEI for the test. */ @@ -246,7 +246,7 @@ test_case_bsu_process (test_t test) &t.mac_config, &btx); b->phy_pb.pb_rx.pb_measurement.crc_error = false; t.bsu->sta_avln->beacon.beacon_period_start_date = - phy_date () - BSU_ACLF_BP_50HZ_TCK - 1000; + phy_date () - t.bsu->aclf->beacon_period_tck - 1000; bsu_beacon_t *bprocessed = bsu_beacon_process (t.bsu, b, &brx); bsu_avln_t *avln = bsu_avln_get ( t.bsu, beacon.vf.nid, brx.snid, @@ -358,10 +358,10 @@ test_case_bsu_update_init (bsu_test_t *test, bsu_beacon_t *beacon) bsu_test_create_beacon (test, beacon); bsu_test_create_beacon (test, &test->bsu->sta_avln->beacon); for (i = 0; i < COUNT (test->bsu->aclf->bpsd); i++) - test->bsu->aclf->bpsd[i] = i * BSU_ACLF_BP_50HZ_TCK; + test->bsu->aclf->bpsd[i] = i * test->bsu->aclf->beacon_period_tck; beacon->beacon_period_start_date = bsu_aclf_beacon_period_start_date_next (test->bsu->aclf) - - BSU_ACLF_BP_50HZ_TCK; + - test->bsu->aclf->beacon_period_tck; } void @@ -482,7 +482,7 @@ test_case_bsu_timer_event_cco_ucco (test_t test, bsu_test_t *t, bsu_test_avln_create (t, &cmp_avln); u32 now = phy_date (); for (i = 0; i < BSU_ACLF_BPSD_NB; i++) - t->bsu->aclf->bpsd[i] = now + i * BSU_ACLF_BP_50HZ_TCK; + t->bsu->aclf->bpsd[i] = now + i * t->bsu->aclf->beacon_period_tck; bsu_test_create_beacon (t, &beacon); /* First case, update beacon in time. */ bsu_test_upper_layer_beacon_received_init (t); @@ -509,7 +509,7 @@ test_case_bsu_timer_event_cco_ucco (test_t test, bsu_test_t *t, for (i = 0; i < 7; i++) { cmp_avln.beacon.beacon_period_start_date = - phy_date () - BSU_ACLF_BP_50HZ_TCK - 1000; + phy_date () - t->bsu->aclf->beacon_period_tck - 1000; bsu_avln_schedules_decrease_countdown (t->bsu, &cmp_avln); bsu_timer_event_process (t->bsu); test_fail_unless (t->ul.beacon != INVALID_PTR); @@ -558,14 +558,14 @@ test_case_bsu_timer_event (test_t test) for (j = 0; j < 10; j++) { t.bsu->sta_avln->beacon.beacon_period_start_date = - t.bsu->aclf->bpsd[0] - BSU_ACLF_BP_50HZ_TCK; + t.bsu->aclf->bpsd[0] - t.bsu->aclf->beacon_period_tck; cmp_avln.beacon.beacon_period_start_date = - t.bsu->aclf->bpsd[0] - BSU_ACLF_BP_50HZ_TCK; + t.bsu->aclf->bpsd[0] - t.bsu->aclf->beacon_period_tck; bsu_avln_schedules_decrease_countdown (t.bsu, &cmp_avln); bsu_timer_event_process (t.bsu); for (i = 0; i < BSU_ACLF_BPSD_NB; i++) test_fail_unless ( - t.bsu->aclf->bpsd[i] = (i+j+1) * BSU_ACLF_BP_50HZ_TCK); + t.bsu->aclf->bpsd[i] = (i+j+1) * t.bsu->aclf->beacon_period_tck); for (i = 0; i < cmp_avln.beacon.bmis.ps.nb; i++) { test_fail_unless (t.bsu->sta_avln->beacon.bmis.ps.ps[i].pscd @@ -590,7 +590,7 @@ test_case_bsu_timer_event (test_t test) bsu_test_avln_create (&t, &cmp_avln); u32 now = phy_date (); for (i = 0; i < BSU_ACLF_BPSD_NB; i++) - t.bsu->aclf->bpsd[i] = now + i * BSU_ACLF_BP_50HZ_TCK; + t.bsu->aclf->bpsd[i] = now + i * t.bsu->aclf->beacon_period_tck; bsu_test_create_beacon (&t, &t.bsu->sta_avln->beacon); t.bsu->sta_avln->beacon.bmis.discover.tei = t.mac_config.tei; /* First case, update beacon in time. */ @@ -713,7 +713,7 @@ test_case_bsu_persistent_schedules_update__cscma_cscd_permanent ( beacon.bmis.ps.nb = ps_nb; beacon.bmis.ps.ps[0].cscd = HPAV_SCHEDULE_PERMAMENT_VALUE; for (i = 0; i < BSU_ACLF_BPSD_NB; i++) - t.bsu->aclf->bpsd[i] = i * BSU_ACLF_BP_50HZ_TCK; + t.bsu->aclf->bpsd[i] = i * t.bsu->aclf->beacon_period_tck; bsu_update__persistent_schedules (t.bsu, &beacon); test_fail_unless (t.bsu->sta_avln->beacon.bmis.ps.nb == ps_nb); for (i = 0; i < ps_nb; i++) diff --git a/cesar/bsu/test/utest/src/schedules.c b/cesar/bsu/test/utest/src/schedules.c index 38540df6c8..fdd0aec45b 100644 --- a/cesar/bsu/test/utest/src/schedules.c +++ b/cesar/bsu/test/utest/src/schedules.c @@ -291,8 +291,8 @@ test_case_track_new (test_t t) { bsu_test_init (&ctx); *((uint*) &ctx.bsu->aclf->beacon_period_theo_tck) = - BSU_ACLF_BP_50HZ_TCK; - ctx.bsu->aclf->beacon_period_tck = BSU_ACLF_BP_50HZ_TCK; + ctx.bsu->aclf->beacon_period_tck; + ctx.bsu->aclf->beacon_period_tck = ctx.bsu->aclf->beacon_period_tck; for (i = 0; i < COUNT (ctx.bsu->aclf->bpsd); i++) ctx.bsu->aclf->bpsd[i] = i * ctx.bsu->aclf->beacon_period_tck; ctx.bsu->activate = true; @@ -335,8 +335,8 @@ test_case_track_new (test_t t) { bsu_test_init (&ctx); *((uint*) &ctx.bsu->aclf->beacon_period_theo_tck) = - BSU_ACLF_BP_50HZ_TCK; - ctx.bsu->aclf->beacon_period_tck = BSU_ACLF_BP_50HZ_TCK; + ctx.bsu->aclf->beacon_period_tck; + ctx.bsu->aclf->beacon_period_tck = ctx.bsu->aclf->beacon_period_tck; for (i = 0; i < COUNT (ctx.bsu->aclf->bpsd); i++) ctx.bsu->aclf->bpsd[i] = i * ctx.bsu->aclf->beacon_period_tck; ctx.bsu->activate = true; @@ -380,7 +380,7 @@ test_case_track_new (test_t t) test_begin (t, "Track new after timer second beacon not received.") { bsu_test_init (&ctx); - ctx.bsu->aclf->beacon_period_tck = BSU_ACLF_BP_50HZ_TCK; + ctx.bsu->aclf->beacon_period_tck = ctx.bsu->aclf->beacon_period_tck; for (i = 0; i < COUNT (ctx.bsu->aclf->bpsd); i++) ctx.bsu->aclf->bpsd[i] = i * ctx.bsu->aclf->beacon_period_tck; ctx.bsu->activate = true; @@ -415,7 +415,7 @@ test_case_track_new (test_t t) test_begin (t, "Track new for CCo") { bsu_test_init (&ctx); - ctx.bsu->aclf->beacon_period_tck = BSU_ACLF_BP_50HZ_TCK; + ctx.bsu->aclf->beacon_period_tck = ctx.bsu->aclf->beacon_period_tck; for (i = 0; i < COUNT (ctx.bsu->aclf->bpsd); i++) ctx.bsu->aclf->bpsd[i] = i * ctx.bsu->aclf->beacon_period_tck; ctx.bsu->activate = true; @@ -463,7 +463,7 @@ test_case_track_new (test_t t) { mac_t mac_track = 0x0013d7000001ull; bsu_test_init (&ctx); - ctx.bsu->aclf->beacon_period_tck = BSU_ACLF_BP_50HZ_TCK; + ctx.bsu->aclf->beacon_period_tck = ctx.bsu->aclf->beacon_period_tck; for (i = 0; i < COUNT (ctx.bsu->aclf->bpsd); i++) ctx.bsu->aclf->bpsd[i] = i * ctx.bsu->aclf->beacon_period_tck; ctx.bsu->activate = true; -- cgit v1.2.3