tracker r3055 - in trunk: . tests/tracker-extract tests/tracker-extract/data/mp3



Author: mr
Date: Wed Mar 11 15:37:32 2009
New Revision: 3055
URL: http://svn.gnome.org/viewvc/tracker?rev=3055&view=rev

Log:
	* tests/tracker-extract/tracker-extract-test-utils.[ch]: 
	* tests/tracker-extract/tracker-extract-testsuite-avi.c:
	* tests/tracker-extract/tracker-extract-testsuite-jpeg.c:
	* tests/tracker-extract/tracker-extract-testsuite-mp3.c:
	* tests/tracker-extract/tracker-extract-testsuite-png.c:
	* tests/tracker-extract/tracker-extract-testsuite-tiff.c: Use
	proper name spacing for public functions and cleaned up the code a
	little. Also added test mp3s so make check doesn't fail.


Added:
   trunk/tests/tracker-extract/data/mp3/access_1.mp3   (contents, props changed)
   trunk/tests/tracker-extract/data/mp3/access_2.mp3   (contents, props changed)
   trunk/tests/tracker-extract/data/mp3/access_3.mp3   (contents, props changed)
   trunk/tests/tracker-extract/data/mp3/access_4.mp3   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/tests/tracker-extract/Makefile.am
   trunk/tests/tracker-extract/tracker-extract-test-utils.c
   trunk/tests/tracker-extract/tracker-extract-test-utils.h
   trunk/tests/tracker-extract/tracker-extract-testsuite-avi.c
   trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.c
   trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.c
   trunk/tests/tracker-extract/tracker-extract-testsuite-png.c
   trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.c

Modified: trunk/tests/tracker-extract/Makefile.am
==============================================================================
--- trunk/tests/tracker-extract/Makefile.am	(original)
+++ trunk/tests/tracker-extract/Makefile.am	Wed Mar 11 15:37:32 2009
@@ -76,7 +76,6 @@
 	$(GLIB2_LIBS)							\
 	$(GSTREAMER_LIBS)
 
-
 test_tracker_extract_jpeg_SOURCES = 					\
 	tracker-extract-jpeg-test.c					\
 	$(TEST_UTILS_SOURCES)

Added: trunk/tests/tracker-extract/data/mp3/access_1.mp3
==============================================================================
Binary file. No diff available.

Added: trunk/tests/tracker-extract/data/mp3/access_2.mp3
==============================================================================
Binary file. No diff available.

Added: trunk/tests/tracker-extract/data/mp3/access_3.mp3
==============================================================================
Binary file. No diff available.

Added: trunk/tests/tracker-extract/data/mp3/access_4.mp3
==============================================================================
Binary file. No diff available.

Modified: trunk/tests/tracker-extract/tracker-extract-test-utils.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-test-utils.c	(original)
+++ trunk/tests/tracker-extract/tracker-extract-test-utils.c	Wed Mar 11 15:37:32 2009
@@ -24,6 +24,129 @@
 
 #include "tracker-extract-test-utils.h"
 
+static GHashTable *
+parse_file (const gchar *filename)
+{
+	GHashTable *testdata;
+	GScanner *scanner;
+	GTokenType ttype;
+	GScannerConfig config = {
+		" \t\r\n",                     /* characters to skip */
+		G_CSET_a_2_z "_" G_CSET_A_2_Z, /* identifier start */
+		G_CSET_a_2_z "_.:" G_CSET_A_2_Z G_CSET_DIGITS,/* identifier cont. */
+		"#\n",                         /* single line comment */
+		TRUE,                          /* case_sensitive */
+		TRUE,                          /* skip multi-line comments */
+		TRUE,                          /* skip single line comments */
+		FALSE,                         /* scan multi-line comments */
+		TRUE,                          /* scan identifiers */
+		TRUE,                          /* scan 1-char identifiers */
+		FALSE,                         /* scan NULL identifiers */
+		FALSE,                         /* scan symbols */
+		FALSE,                         /* scan binary */
+		FALSE,                         /* scan octal */
+		TRUE,                          /* scan float */
+		TRUE,                          /* scan hex */
+		FALSE,                         /* scan hex dollar */
+		TRUE,                          /* scan single quote strings */
+		TRUE,                          /* scan double quite strings */
+		TRUE,                          /* numbers to int */
+		FALSE,                         /* int to float */
+		TRUE,                          /* identifier to string */
+		TRUE,                          /* char to token */
+		FALSE,                         /* symbol to token */
+		FALSE,                         /* scope 0 fallback */
+		FALSE                          /* store int64 */
+	};
+	gint fd;
+
+	testdata = g_hash_table_new_full (g_str_hash,
+					  g_str_equal,
+					  g_free,
+					  g_free);
+
+	fd = g_open (filename, O_RDONLY);
+
+	g_assert (fd >= 0);
+
+	scanner = g_scanner_new (&config);
+	g_scanner_input_file (scanner, fd);
+	scanner->input_name = filename;
+
+	for (ttype = g_scanner_get_next_token(scanner);
+	     ttype != G_TOKEN_EOF;
+	     ttype = g_scanner_get_next_token (scanner)) {
+		if (ttype == G_TOKEN_IDENTIFIER) {
+			gchar key[256];
+
+			strcpy (key, scanner->value.v_identifier);
+			
+			ttype = g_scanner_get_next_token(scanner);
+			g_assert (ttype == G_TOKEN_EQUAL_SIGN);
+
+			ttype = g_scanner_get_next_token(scanner);
+
+			switch (ttype) {
+			case G_TOKEN_STRING:
+				g_hash_table_insert (testdata, 
+						     g_strdup(key), 
+						     g_strdup(scanner->value.v_string));
+				break;
+				
+			default:
+				g_assert_not_reached();
+				
+			}
+		}
+	}
+
+	g_scanner_destroy (scanner);
+	close (fd);
+
+	return testdata;
+}
+
+static void
+dump_metadata_item (gpointer key,
+		    gpointer value,
+		    gpointer user_data)
+{
+	gchar *value_utf8;
+
+	g_assert (key != NULL);
+	g_assert (value != NULL);
+
+	value_utf8 = g_locale_to_utf8 (value, -1, NULL, NULL, NULL);
+
+	if (value_utf8) {
+		g_print ("%s=%s;\n", (gchar*) key, value_utf8);
+		g_free (value_utf8);
+	}
+}
+
+static void
+dump_metadata (GHashTable *metadata)
+{
+	g_assert (metadata != NULL);
+	g_hash_table_foreach (metadata, dump_metadata_item, NULL);
+}
+
+static void
+check_metadata (GHashTable  *metadata, 
+		const gchar *key, 
+		const gchar *value)
+{
+	gchar *cvalue;
+
+	g_assert (metadata != NULL);
+	g_assert (key != NULL);
+	g_assert (value != NULL);
+	
+	cvalue = g_hash_table_lookup (metadata, key);
+	g_assert (cvalue != NULL);
+	g_assert_cmpstr (cvalue, ==, value);
+}
+
 TrackerExtractData *
 tracker_test_extract_get_extract (const gchar *mime)
 {
@@ -46,27 +169,28 @@
 		}
 		data++;
 	}
+
 	return NULL;
 }
 
 void
-extract_file (const TrackerExtractData *data, const gchar *file, const gchar *testdatafile)
+tracker_test_extract_file (const TrackerExtractData *data, 
+			   const gchar              *file, 
+			   const gchar              *test_data_file)
 {
 	GHashTable *metadata;
-	GHashTable *testdata;
-
-	gchar      *filename;	
-	gchar      *testdata_filename;
-
+	GHashTable *test_data;
+	gchar *filename;	
+	gchar *test_data_filename;
 	GHashTableIter iter;
 	gpointer key, value;
 
 	g_assert (data != NULL);
 	g_assert (file != NULL);
-	g_assert (testdatafile != NULL);
+	g_assert (test_data_file != NULL);
 
 	filename = g_strconcat (TEST_DATA_DIR, file, NULL);
-	testdata_filename = g_strconcat (TEST_DATA_DIR, testdatafile, NULL);
+	test_data_filename = g_strconcat (TEST_DATA_DIR, test_data_file, NULL);
 
 	metadata = g_hash_table_new_full (g_str_hash,
 					  g_str_equal,
@@ -75,36 +199,40 @@
 
 	(*data->extract) (filename, metadata);
 
-	testdata = parse_testdata_file (testdata_filename);
+	test_data = parse_file (test_data_filename);
 
-	g_hash_table_iter_init (&iter, testdata);
+	g_hash_table_iter_init (&iter, test_data);
 
-/*	dump_metadata(metadata); */
+	if (0) {
+		dump_metadata (metadata);
+	}
 
 	while (g_hash_table_iter_next (&iter, &key, &value)) {
-		check_metadata (metadata, (gchar *)key, (gchar *)value);
+		check_metadata (metadata, key, value);
 	}
 
 	g_hash_table_destroy (metadata);
-	g_hash_table_destroy (testdata);
+	g_hash_table_destroy (test_data);
 }
 
 void
-performance_extract_files (const TrackerExtractData *data, const gchar *filematch, guint filecount)
+tracker_test_extract_file_performance (const TrackerExtractData *data,
+				       const gchar              *file_match, 
+				       guint                     file_count)
 {
 	double perftime;
 	guint i;
 
 	g_assert (data != NULL);
-	g_assert (filematch != NULL);
-	g_assert (filecount >0 );
+	g_assert (file_match != NULL);
+	g_assert (file_count > 0);
 	
-	g_test_timer_start();
+	g_test_timer_start ();
 
-	for (i=1;i<=filecount;i++) {
-		char filename[256];
-		char tmp[256];
+	for (i = 1; i <= file_count; i++) {
 		GHashTable *metadata;
+		gchar filename[256];
+		gchar tmp[256];
 
 		metadata = g_hash_table_new_full (g_str_hash,
 						  g_str_equal,
@@ -113,7 +241,7 @@
 
 		
 
-		if (sprintf (tmp, "%s%s",TEST_DATA_DIR,filematch) < 0) {
+		if (sprintf (tmp, "%s%s",TEST_DATA_DIR, file_match) < 0) {
 			g_assert_not_reached();
 		}
 
@@ -136,34 +264,32 @@
 }
 
 void
-access_extract_files (const TrackerExtractData *data, 
-		      const gchar              *filematch, 
-		      guint                     filecount)
+tracker_test_extract_file_access (const TrackerExtractData *data, 
+				  const gchar              *file_match, 
+				  guint                     file_count)
 {
 	guint i;
 
 	g_assert (data != NULL);
-	g_assert (filematch != NULL);
-	g_assert (filecount > 0);
+	g_assert (file_match != NULL);
+	g_assert (file_count > 0);
 	
-	for (i=1;i<=filecount;i++) {
+	for (i = 1; i <= file_count; i++) {
+		GHashTable *metadata;
 		gchar filename[256];
 		gchar tmp[256];
-		GHashTable *metadata;
 
 		metadata = g_hash_table_new_full (g_str_hash,
 						  g_str_equal,
 						  g_free,
 						  g_free);
 
-		
-
-		if (sprintf (tmp, "%s%s",TEST_DATA_DIR,filematch) < 0) {
-			g_assert_not_reached();
+		if (sprintf (tmp, "%s%s", TEST_DATA_DIR, file_match) < 0) {
+			g_assert_not_reached ();
 		}
 
 		if (sprintf (filename, tmp, i) < 0) {
-			g_assert_not_reached();
+			g_assert_not_reached ();
 		}
 
 		(*data->extract) (filename, metadata);
@@ -173,125 +299,3 @@
 		g_hash_table_destroy (metadata);
 	}		
 }
-
-GHashTable *
-parse_testdata_file (const gchar *filename)
-{
-	GHashTable *testdata;
-	GScanner *scanner;
-	GTokenType ttype;
-	GScannerConfig config = {
-		" \t\r\n",                     /* characters to skip */
-		G_CSET_a_2_z "_" G_CSET_A_2_Z, /* identifier start */
-		G_CSET_a_2_z "_.:" G_CSET_A_2_Z G_CSET_DIGITS,/* identifier cont. */
-		"#\n",                         /* single line comment */
-		TRUE,                          /* case_sensitive */
-		TRUE,                          /* skip multi-line comments */
-		TRUE,                          /* skip single line comments */
-		FALSE,                         /* scan multi-line comments */
-		TRUE,                          /* scan identifiers */
-		TRUE,                          /* scan 1-char identifiers */
-		FALSE,                         /* scan NULL identifiers */
-		FALSE,                         /* scan symbols */
-		FALSE,                         /* scan binary */
-		FALSE,                         /* scan octal */
-		TRUE,                          /* scan float */
-		TRUE,                          /* scan hex */
-		FALSE,                         /* scan hex dollar */
-		TRUE,                          /* scan single quote strings */
-		TRUE,                          /* scan double quite strings */
-		TRUE,                          /* numbers to int */
-		FALSE,                         /* int to float */
-		TRUE,                          /* identifier to string */
-		TRUE,                          /* char to token */
-		FALSE,                         /* symbol to token */
-		FALSE,                         /* scope 0 fallback */
-		FALSE                          /* store int64 */
-	};
-	int fd;
-
-	testdata = g_hash_table_new_full (g_str_hash,
-					  g_str_equal,
-					  g_free,
-					  g_free);
-
-	fd = g_open (filename, O_RDONLY);
-
-	g_assert (fd >= 0);
-
-	scanner = g_scanner_new (&config);
-	g_scanner_input_file (scanner, fd);
-	scanner->input_name = filename;
-
-	for (ttype = g_scanner_get_next_token(scanner);
-	     ttype != G_TOKEN_EOF;
-	     ttype = g_scanner_get_next_token (scanner)) {
-		if (ttype == G_TOKEN_IDENTIFIER) {
-			gchar key[256];
-
-			strcpy (key, scanner->value.v_identifier);
-			
-			ttype = g_scanner_get_next_token(scanner);
-			g_assert (ttype == G_TOKEN_EQUAL_SIGN);
-
-			ttype = g_scanner_get_next_token(scanner);
-
-			switch (ttype) {
-			case G_TOKEN_STRING:
-				g_hash_table_insert (testdata, 
-						     g_strdup(key), 
-						     g_strdup(scanner->value.v_string));
-				break;
-				
-			default:
-				g_assert_not_reached();
-				
-			}
-			
-		}
-	}
-
-	g_scanner_destroy (scanner);
-	close (fd);
-
-	return testdata;
-}
-
-
-static void
-dump_metadataitem (gpointer key,
-		   gpointer value,
-		   gpointer user_data)
-{
-	gchar *value_utf8;
-
-	g_assert (key != NULL);
-	g_assert (value != NULL);
-
-	value_utf8 = g_locale_to_utf8 (value, -1, NULL, NULL, NULL);
-
-	if (value_utf8) {
-		g_print ("%s=%s;\n", (gchar*) key, value_utf8);
-		g_free (value_utf8);
-	}
-}
-
-void
-dump_metadata (GHashTable *metadata)
-{
-	g_assert (metadata != NULL);
-	g_hash_table_foreach (metadata, dump_metadataitem, NULL);
-}
-
-void
-check_metadata (GHashTable *metadata, gchar *key, gchar *value)
-{
-	gchar *cvalue;
-	g_assert (metadata != NULL);
-	g_assert (key != NULL);
-	g_assert (value != NULL);
-	
-	cvalue = g_hash_table_lookup (metadata, key);
-	g_assert (cvalue != NULL);
-	g_assert_cmpstr (cvalue, ==, value);
-}

Modified: trunk/tests/tracker-extract/tracker-extract-test-utils.h
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-test-utils.h	(original)
+++ trunk/tests/tracker-extract/tracker-extract-test-utils.h	Wed Mar 11 15:37:32 2009
@@ -29,21 +29,15 @@
 
 #include <tracker-extract/tracker-main.h>
 
-TrackerExtractData *  tracker_test_extract_get_extract (const gchar *mime);
-void              extract_file (const TrackerExtractData *data, 
-				const gchar *file, 
-				const gchar *testdatafile);
-void              performance_extract_files (const TrackerExtractData *data, 
-					     const gchar *filematch, 
-					     guint filecount);
-void              access_extract_files (const TrackerExtractData *data, 
-					const gchar *filematch, 
-					guint filecount);
-
-GHashTable *            parse_testdata_file        (const gchar *filename);
-void                    dump_metadata              (GHashTable *metadata);
-void                    check_metadata             (GHashTable *metadata,
-						    gchar *key,
-						    gchar *value);
+TrackerExtractData *tracker_test_extract_get_extract      (const gchar              *mime);
+void                tracker_test_extract_file             (const TrackerExtractData *data,
+							   const gchar              *file,
+							   const gchar              *testdatafile);
+void                tracker_test_extract_file_performance (const TrackerExtractData *data,
+							   const gchar              *file_match,
+							   guint                     file_count);
+void                tracker_test_extract_file_access      (const TrackerExtractData *data,
+							   const gchar              *file_match,
+							   guint                     file_count);
 
 #endif

Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-avi.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-avi.c	(original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-avi.c	Wed Mar 11 15:37:32 2009
@@ -39,9 +39,9 @@
 	guint i;
 
 	for (i = 0; data_basic_tags[i].filename; i++) {
-		extract_file (data,
-			      data_basic_tags[i].filename,
-			      data_basic_tags[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_basic_tags[i].filename,
+					   data_basic_tags[i].testdata);		
 	}
 }
 

Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.c	(original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.c	Wed Mar 11 15:37:32 2009
@@ -111,9 +111,9 @@
 	guint i;
 
 	for (i = 0; data_basic_size[i].filename; i++) {
-		extract_file (data,
-			      data_basic_size[i].filename,
-			      data_basic_size[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_basic_size[i].filename,
+					   data_basic_size[i].testdata);		
 	}
 }
 
@@ -123,9 +123,9 @@
 	guint i;
 
 	for (i = 0; data_exif_size[i].filename; i++) {
-		extract_file (data,
-			      data_exif_size[i].filename,
-			      data_exif_size[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_exif_size[i].filename,
+					   data_exif_size[i].testdata);		
 	}
 }
 
@@ -135,9 +135,9 @@
 	guint i;
 
 	for (i = 0; data_exif_orientation[i].filename; i++) {
-		extract_file (data,
-			      data_exif_orientation[i].filename,
-			      data_exif_orientation[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_exif_orientation[i].filename,
+					   data_exif_orientation[i].testdata);		
 	}
 }
 
@@ -147,9 +147,9 @@
 	guint i;
 
 	for (i = 0; data_exif_flash[i].filename; i++) {
-		extract_file (data,
-			      data_exif_flash[i].filename,
-			      data_exif_flash[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_exif_flash[i].filename,
+					   data_exif_flash[i].testdata);		
 	}
 }
 
@@ -159,14 +159,14 @@
 	guint i;
 
 	for (i = 0; data_exif_tags[i].filename; i++) {
-		extract_file (data,
-			      data_exif_tags[i].filename,
-			      data_exif_tags[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_exif_tags[i].filename,
+					   data_exif_tags[i].testdata);		
 	}
 }
 
 void
 test_tracker_extract_jpeg_performance (gconstpointer data)
 {
-	performance_extract_files (data, "/jpeg/perf_jpeg_%d.jpg", 1000);
+	tracker_test_extract_file_performance (data, "/jpeg/perf_jpeg_%d.jpg", 1000);
 }

Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.c	(original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.c	Wed Mar 11 15:37:32 2009
@@ -103,7 +103,7 @@
 void 
 test_tracker_extract_mp3_access (gconstpointer data)
 {
-	access_extract_files (data, "/mp3/access_%d.mp3", 4);
+	tracker_test_extract_file_access (data, "/mp3/access_%d.mp3", 4);
 }
 
 void 
@@ -112,9 +112,9 @@
 	guint i;
 
 	for (i = 0; data_id3v1_basic[i].filename; i++) {
-		extract_file (data,
-			      data_id3v1_basic[i].filename,
-			      data_id3v1_basic[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_id3v1_basic[i].filename,
+					   data_id3v1_basic[i].testdata);		
 	}
 }
 
@@ -124,9 +124,9 @@
 	guint i;
 
 	for (i = 0; data_id3v23_basic[i].filename; i++) {
-		extract_file (data,
-			      data_id3v23_basic[i].filename,
-			      data_id3v23_basic[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_id3v23_basic[i].filename,
+					   data_id3v23_basic[i].testdata);		
 	}
 }
 
@@ -136,9 +136,9 @@
 	guint i;
 
 	for (i = 0; data_id3v23_tags[i].filename; i++) {
-		extract_file (data,
-			      data_id3v23_tags[i].filename,
-			      data_id3v23_tags[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_id3v23_tags[i].filename,
+					   data_id3v23_tags[i].testdata);		
 	}
 }
 
@@ -148,21 +148,21 @@
 	guint i;
 
 	for (i = 0; data_id3v23_tcon[i].filename; i++) {
-		extract_file (data,
-			      data_id3v23_tcon[i].filename,
-			      data_id3v23_tcon[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_id3v23_tcon[i].filename,
+					   data_id3v23_tcon[i].testdata);		
 	}
 }
 
 void 
-test_tracker_extract_mp3_header_bitrate(gconstpointer data)
+test_tracker_extract_mp3_header_bitrate (gconstpointer data)
 {
 	guint i;
 
 	for (i = 0; data_header_bitrate[i].filename; i++) {
-		extract_file (data,
-			      data_header_bitrate[i].filename,
-			      data_header_bitrate[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_header_bitrate[i].filename,
+					   data_header_bitrate[i].testdata);		
 	}
 }
 
@@ -172,9 +172,9 @@
 	guint i;
 
 	for (i = 0; data_header_bitrate_vbr[i].filename; i++) {
-		extract_file (data,
-			      data_header_bitrate_vbr[i].filename,
-			      data_header_bitrate_vbr[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_header_bitrate_vbr[i].filename,
+					   data_header_bitrate_vbr[i].testdata);		
 	}
 }
 
@@ -184,15 +184,15 @@
 	guint i;
 
 	for (i = 0; data_header_sampling[i].filename; i++) {
-		extract_file (data,
-			      data_header_sampling[i].filename,
-			      data_header_sampling[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_header_sampling[i].filename,
+					   data_header_sampling[i].testdata);		
 	}
 }
 
 void 
 test_tracker_extract_mp3_performance (gconstpointer data)
 {
-	performance_extract_files (data, "/mp3/perf_cbr_id3v1_%d.mp3", 1000);
+	tracker_test_extract_file_performance (data, "/mp3/perf_cbr_id3v1_%d.mp3", 1000);
 }
 

Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-png.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-png.c	(original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-png.c	Wed Mar 11 15:37:32 2009
@@ -55,9 +55,9 @@
 	guint i;
 
 	for (i = 0; data_basic_size[i].filename; i++) {
-		extract_file (data,
-			      data_basic_size[i].filename,
-			      data_basic_size[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_basic_size[i].filename,
+					   data_basic_size[i].testdata);		
 	}
 }
 
@@ -67,14 +67,14 @@
 	guint i;
 
 	for (i = 0; data_xmp_exif_orientation[i].filename; i++) {
-		extract_file (data,
-			      data_xmp_exif_orientation[i].filename,
-			      data_xmp_exif_orientation[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_xmp_exif_orientation[i].filename,
+					   data_xmp_exif_orientation[i].testdata);		
 	}
 }
 
 void 
 test_tracker_extract_png_performance (gconstpointer data)
 {
-	performance_extract_files (data, "/png/perf_png_%d.png", 1000);
+	tracker_test_extract_file_performance (data, "/png/perf_png_%d.png", 1000);
 }

Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.c	(original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.c	Wed Mar 11 15:37:32 2009
@@ -60,9 +60,9 @@
 	guint i;
 
 	for (i = 0; data_basic_size[i].filename; i++) {
-		extract_file (data,
-			      data_basic_size[i].filename,
-			      data_basic_size[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_basic_size[i].filename,
+					   data_basic_size[i].testdata);		
 	}
 }
 
@@ -74,9 +74,9 @@
 	for (i = 0; data_exif_size[i].filename; i++) {
 		g_debug ("Filename: %s", data_basic_size[i].filename);
 
-		extract_file (data,
-			      data_exif_size[i].filename,
-			      data_exif_size[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_exif_size[i].filename,
+					   data_exif_size[i].testdata);		
 	}
 }
 
@@ -86,14 +86,14 @@
 	guint i;
 
 	for (i = 0; data_exif_orientation[i].filename; i++) {
-		extract_file (data,
-			      data_exif_orientation[i].filename,
-			      data_exif_orientation[i].testdata);		
+		tracker_test_extract_file (data,
+					   data_exif_orientation[i].filename,
+					   data_exif_orientation[i].testdata);		
 	}
 }
 
 void 
 test_tracker_extract_tiff_performance (gconstpointer data)
 {
-	performance_extract_files (data, "/tiff/perf_tiff_%d.tif", 1000);
+	tracker_test_extract_file_performance (data, "/tiff/perf_tiff_%d.tif", 1000);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]