Merge lp:~ted/libmetrics/study-version into lp:libmetrics

[Ted Gould]

Adding a version number to the study file

=== modified file 'libmetrics/collector.c'
--- libmetrics/collector.c	2012-05-16 17:48:32 +0000
+++ libmetrics/collector.c	2012-05-16 18:22:18 +0000
@@ -196,7 +196,10 @@
 	if (g_key_file_has_group(keyfile, "Metrics Study") &&
 			g_key_file_has_key(keyfile, "Metrics Study", "Name", NULL) &&
 			g_key_file_has_key(keyfile, "Metrics Study", "Description", NULL) &&
-			g_key_file_has_key(keyfile, "Metrics Study", "Administrator", NULL)) {
+			g_key_file_has_key(keyfile, "Metrics Study", "Version", NULL) &&
+			g_key_file_has_key(keyfile, "Metrics Study", "Administrator", NULL) &&
+			g_key_file_get_int64(keyfile, "Metrics Study", "Version", NULL) == 1
+			) {
 		self->priv->study = g_strdup(study);
 	}
 
 
=== modified file 'tests/studies/bad-no-administrator'
--- tests/studies/bad-no-administrator	2012-05-16 17:48:32 +0000
+++ tests/studies/bad-no-administrator	2012-05-16 18:22:18 +0000
@@ -1,3 +1,4 @@
 [Metrics Study]
 Name=Bad Study
+Version=1
 Description=A study that is missing an administrator
 
=== modified file 'tests/studies/bad-no-description'
--- tests/studies/bad-no-description	2012-05-16 17:48:32 +0000
+++ tests/studies/bad-no-description	2012-05-16 18:22:18 +0000
@@ -1,3 +1,4 @@
 [Metrics Study]
 Name=Bad Study
+Version=1
 Administrator=libmetrics Developers
 
=== modified file 'tests/studies/bad-no-name'
--- tests/studies/bad-no-name	2012-05-16 17:48:32 +0000
+++ tests/studies/bad-no-name	2012-05-16 18:22:18 +0000
@@ -1,3 +1,4 @@
 [Metrics Study]
+Version=1
 Description=A study that is missing a name
 Administrator=libmetrics Developers
 
=== added file 'tests/studies/bad-no-version'
--- tests/studies/bad-no-version	1970-01-01 00:00:00 +0000
+++ tests/studies/bad-no-version	2012-05-16 18:22:18 +0000
@@ -0,0 +1,4 @@
+[Metrics Study]
+Name=Bad Study
+Description=A study that has no version specified
+Administrator=libmetrics Developers
 
=== added file 'tests/studies/bad-version-200'
--- tests/studies/bad-version-200	1970-01-01 00:00:00 +0000
+++ tests/studies/bad-version-200	2012-05-16 18:22:18 +0000
@@ -0,0 +1,5 @@
+[Metrics Study]
+Name=Bad Study
+Version=200
+Description=A study that has a version number of 200
+Administrator=libmetrics Developers
 
=== modified file 'tests/studies/good'
--- tests/studies/good	2012-05-16 17:48:32 +0000
+++ tests/studies/good	2012-05-16 18:22:18 +0000
@@ -1,4 +1,5 @@
 [Metrics Study]
 Name=Good Study
+Version=1
 Description=A study that is good for testing
 Administrator=libmetrics Developers
 
=== modified file 'tests/test-collector.cc'
--- tests/test-collector.cc	2012-05-16 17:48:32 +0000
+++ tests/test-collector.cc	2012-05-16 18:22:18 +0000
@@ -70,6 +70,8 @@
 
 TEST_F(TestCollector, bad_studies) {
 	test_bad("bad-no-administrator");
+	test_bad("bad-no-version");
+	test_bad("bad-version-200");
 	test_bad("bad-no-description");
 	test_bad("bad-no-name");
 	test_bad("bad-xml");