summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--unit/test-idmap.c121
2 files changed, 1 insertions, 126 deletions
diff --git a/Makefile.am b/Makefile.am
index 6cc0ccd4..6d2939c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -894,7 +894,7 @@ dist_man_MANS = doc/ofonod.8
unit_objects =
-unit_tests = unit/test-common unit/test-util unit/test-idmap \
+unit_tests = unit/test-common unit/test-util \
unit/test-simutil unit/test-stkutil \
unit/test-sms unit/test-cdmasms \
unit/test-mbim \
@@ -914,10 +914,6 @@ unit_test_util_SOURCES = unit/test-util.c src/util.c
unit_test_util_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_utils_OBJECTS)
-unit_test_idmap_SOURCES = unit/test-idmap.c src/idmap.c
-unit_test_idmap_LDADD = @GLIB_LIBS@
-unit_objects += $(unit_test_idmap_OBJECTS)
-
unit_test_simutil_SOURCES = unit/test-simutil.c src/util.c \
src/simutil.c src/smsutil.c src/storage.c
unit_test_simutil_LDADD = @GLIB_LIBS@
diff --git a/unit/test-idmap.c b/unit/test-idmap.c
deleted file mode 100644
index 2d2e2266..00000000
--- a/unit/test-idmap.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *
- * oFono - Open Source Telephony
- *
- * Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-
-#include "idmap.h"
-
-static void test_alloc(void)
-{
- struct idmap *idmap;
- unsigned int bit;
-
- idmap = idmap_new(2);
-
- g_assert(idmap);
- g_assert(idmap_get_min(idmap) == 1);
-
- bit = idmap_alloc(idmap);
- g_assert(bit == 1);
- g_assert(idmap_find(idmap, bit));
- g_assert(!idmap_find(idmap, idmap_get_max(idmap) + 1));
-
- bit = idmap_alloc(idmap);
- g_assert(bit == 2);
-
- bit = idmap_alloc(idmap);
- g_assert(bit == 3);
-
- idmap_put(idmap, 3);
- bit = idmap_alloc(idmap);
- g_assert(bit == 3);
-
- idmap_put(idmap, 0);
- bit = idmap_alloc(idmap);
- g_assert(bit == 3);
-
- idmap_put(idmap, 1);
- bit = idmap_alloc(idmap);
- g_assert(bit == 1);
-
- idmap_put(idmap, 1);
- idmap_put(idmap, 2);
- bit = idmap_alloc(idmap);
- g_assert(bit == 1);
-
- idmap_put(idmap, 1);
- idmap_take(idmap, 1);
- idmap_take(idmap, 3);
- bit = idmap_alloc(idmap);
- g_assert(bit == 2);
-
- idmap_free(idmap);
-}
-
-static void test_alloc_next(void)
-{
- struct idmap *idmap;
- unsigned int bit;
-
- idmap = idmap_new(256);
-
- g_assert(idmap);
-
- bit = idmap_alloc_next(idmap, 255);
- g_assert(bit == 256);
-
- bit = idmap_alloc_next(idmap, 255);
- g_assert(bit == 1);
-
- while (idmap_alloc(idmap) < (sizeof(unsigned long) * 8) + 1);
- bit = idmap_alloc_next(idmap, 1);
- g_assert(bit == (sizeof(unsigned long) * 8) + 2);
-
- idmap_free(idmap);
-
- idmap = idmap_new(2);
-
- g_assert(idmap);
- g_assert(idmap_alloc_next(idmap, 0) == 3);
- g_assert(idmap_alloc_next(idmap, 3) == 3);
-
- bit = idmap_alloc_next(idmap, 1);
- g_assert(bit == 2);
-
- bit = idmap_alloc_next(idmap, 2);
- g_assert(bit == 1);
-
- idmap_free(idmap);
-}
-
-int main(int argc, char **argv)
-{
- g_test_init(&argc, &argv, NULL);
-
- g_test_add_func("/testidmap/alloc", test_alloc);
- g_test_add_func("/testidmap/alloc_next", test_alloc_next);
-
- return g_test_run();
-}