crewID/libfreefare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates unit tests to use libnfc 1.7.0

Browse source
This commit is contained in:
Romuald Conty 2013-01-20 17:49:24 +01:00
parent 8885aaa94c
commit 444a62567f
4 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/mifare_classic_fixture.c
View file

@ -1,5 +1,6 @@
/*- /*-
* Copyright (C) 2010, Romain Tartiere. * Copyright (C) 2010, Romain Tartiere
* Copyright (C) 2013, Romuald Conty
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the * under the terms of the GNU Lesser General Public License as published by the
@ -22,6 +23,7 @@
#include "mifare_classic_fixture.h" #include "mifare_classic_fixture.h"
static nfc_context *context;
static nfc_device *device = NULL; static nfc_device *device = NULL;
static MifareTag *tags = NULL; static MifareTag *tags = NULL;
MifareTag tag = NULL; MifareTag tag = NULL;
@ -33,14 +35,14 @@ cut_setup (void)
nfc_connstring devices[8]; nfc_connstring devices[8];
size_t device_count; size_t device_count;
nfc_init(NULL); nfc_init(&context);
device_count = nfc_list_devices (NULL, devices, 8); device_count = nfc_list_devices (context, devices, 8);
if (device_count <= 0) if (device_count <= 0)
cut_omit ("No device found"); cut_omit ("No device found");
for (size_t i = 0; i < device_count; i++) { for (size_t i = 0; i < device_count; i++) {
device = nfc_open (NULL, devices[i]); device = nfc_open (context, devices[i]);
if (!device) if (!device)
cut_omit ("nfc_open() failed."); cut_omit ("nfc_open() failed.");
@ -79,6 +81,6 @@ cut_teardown (void)
if (device) if (device)
nfc_close (device); nfc_close (device);
nfc_exit(NULL); nfc_exit (context);
} }

12
test/mifare_desfire_ev1_fixture.c
View file

@ -1,5 +1,6 @@
/*- /*-
* Copyright (C) 2010, Romain Tartiere. * Copyright (C) 2010, Romain Tartiere
* Copyright (C) 2013, Romuald Conty
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the * under the terms of the GNU Lesser General Public License as published by the
@ -22,6 +23,7 @@
#include "mifare_desfire_ev1_fixture.h" #include "mifare_desfire_ev1_fixture.h"
static nfc_context *context;
static nfc_device *device = NULL; static nfc_device *device = NULL;
static MifareTag *tags = NULL; static MifareTag *tags = NULL;
MifareTag tag = NULL; MifareTag tag = NULL;
@ -33,15 +35,15 @@ cut_setup (void)
nfc_connstring devices[8]; nfc_connstring devices[8];
size_t device_count; size_t device_count;
nfc_init(NULL); nfc_init (&context);
device_count = nfc_list_devices (NULL, devices, 8); device_count = nfc_list_devices (context, devices, 8);
if (device_count <= 0) if (device_count <= 0)
cut_omit ("No device found"); cut_omit ("No device found");
for (size_t i = 0; i < device_count; i++) { for (size_t i = 0; i < device_count; i++) {
device = nfc_open (NULL, devices[i]); device = nfc_open (context, devices[i]);
if (!device) if (!device)
cut_omit ("nfc_open() failed."); cut_omit ("nfc_open() failed.");
@ -89,6 +91,6 @@ cut_teardown (void)
if (device) if (device)
nfc_close (device); nfc_close (device);
nfc_exit(NULL); nfc_exit (context);
} }

12
test/mifare_desfire_fixture.c
View file

@ -1,5 +1,6 @@
/*- /*-
* Copyright (C) 2010, Romain Tartiere. * Copyright (C) 2010, Romain Tartiere
* Copyright (C) 2013, Romuald Conty
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the * under the terms of the GNU Lesser General Public License as published by the
@ -22,6 +23,7 @@
#include "mifare_desfire_fixture.h" #include "mifare_desfire_fixture.h"
static nfc_context *context;
static nfc_device *device = NULL; static nfc_device *device = NULL;
static MifareTag *tags = NULL; static MifareTag *tags = NULL;
MifareTag tag = NULL; MifareTag tag = NULL;
@ -33,15 +35,15 @@ cut_setup (void)
nfc_connstring devices[8]; nfc_connstring devices[8];
size_t device_count; size_t device_count;
nfc_init(NULL); nfc_init(&context);
device_count = nfc_list_devices (NULL, devices, 8); device_count = nfc_list_devices (context, devices, 8);
if (device_count <= 0) if (device_count <= 0)
cut_omit ("No device found"); cut_omit ("No device found");
for (size_t i = 0; i < device_count; i++) { for (size_t i = 0; i < device_count; i++) {
device = nfc_open (NULL, devices[i]); device = nfc_open (context, devices[i]);
if (!device) if (!device)
cut_omit ("nfc_open() failed."); cut_omit ("nfc_open() failed.");
@ -79,6 +81,6 @@ cut_teardown (void)
if (device) if (device)
nfc_close (device); nfc_close (device);
nfc_exit(NULL); nfc_exit (context);
} }

12
test/mifare_ultralight_fixture.c
View file

@ -1,5 +1,6 @@
/*- /*-
* Copyright (C) 2010, Romain Tartiere. * Copyright (C) 2010, Romain Tartiere
* Copyright (C) 2013, Romuald Conty
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the * under the terms of the GNU Lesser General Public License as published by the
@ -22,6 +23,7 @@
#include "mifare_ultralight_fixture.h" #include "mifare_ultralight_fixture.h"
static nfc_context *context;
static nfc_device *device = NULL; static nfc_device *device = NULL;
static MifareTag *tags = NULL; static MifareTag *tags = NULL;
MifareTag tag = NULL; MifareTag tag = NULL;
@ -33,15 +35,15 @@ cut_setup (void)
nfc_connstring devices[8]; nfc_connstring devices[8];
size_t device_count; size_t device_count;
nfc_init(NULL); nfc_init(&context);
device_count = nfc_list_devices (NULL, devices, 8); device_count = nfc_list_devices (context, devices, 8);
if (device_count <= 0) if (device_count <= 0)
cut_omit ("No device found"); cut_omit ("No device found");
for (size_t i = 0; i < device_count; i++) { for (size_t i = 0; i < device_count; i++) {
device = nfc_open (NULL, devices[i]); device = nfc_open (context, devices[i]);
if (!device) if (!device)
cut_omit ("nfc_open() failed."); cut_omit ("nfc_open() failed.");
@ -81,6 +83,6 @@ cut_teardown (void)
if (device) if (device)
nfc_close (device); nfc_close (device);
nfc_exit(NULL); nfc_exit (context);
} }