#127: Tests fixed

Author: bosik

portable/comp-transfer/src/test/java/org/bosik/diacomp/core/mocks/MockDiaryRecord.java

@@ -18,6 +18,8 @@
 package org.bosik.diacomp.core.mocks;
 
 import org.bosik.diacomp.core.entities.business.FoodMassed;
+import org.bosik.diacomp.core.entities.business.Units;
+import org.bosik.diacomp.core.entities.business.Units.BloodSugar;
 import org.bosik.diacomp.core.entities.business.diary.DiaryRecord;
 import org.bosik.diacomp.core.entities.business.diary.records.BloodRecord;
 import org.bosik.diacomp.core.entities.business.diary.records.InsRecord;
@@ -30,6 +32,7 @@
 import java.util.List;
 import java.util.Random;
 
+import static org.bosik.diacomp.core.entities.business.Units.BloodSugar.MMOL_L;
 import static org.junit.Assert.assertEquals;
 
 public class MockDiaryRecord implements Mock<DiaryRecord>
@@ -42,9 +45,9 @@ public List<DiaryRecord> getSamples()
 	{
 		List<DiaryRecord> samples = new ArrayList<>();
 
-		samples.add(new BloodRecord(Utils.time(2012, 04, 18, 16, 42, 05), 7.1, 0));
-		samples.add(new BloodRecord(Utils.time(2013, 04, 18, 16, 50, 28), 7.0, 1));
-		samples.add(new BloodRecord(Utils.time(2010, 04, 18, 17, 00, 00), 5.2, 2));
+		samples.add(new BloodRecord(Utils.time(2012, 4, 18, 16, 42, 05), 7.1, MMOL_L, 0));
+		samples.add(new BloodRecord(Utils.time(2013, 4, 18, 16, 50, 28), 7.0, MMOL_L, 1));
+		samples.add(new BloodRecord(Utils.time(2010, 4, 18, 17, 00, 00), 5.2, MMOL_L, 2));
 
 		samples.add(new InsRecord(Utils.time(2012, 04, 18, 17, 20, 00), 16.0));
 
@@ -84,7 +87,7 @@ public DiaryRecord getSample()
 				Date time = Utils.randomTime();
 				double value = 2 + (20 * r.nextDouble());
 				int finger = r.nextInt(10);
-				return new BloodRecord(time, value, finger);
+				return new BloodRecord(time, value, MMOL_L, finger);
 			}
 
 			case 1:

portable/comp-transfer/src/test/java/org/bosik/diacomp/core/services/preferences/TestPreferenceID.java

@@ -38,11 +38,13 @@ protected HashMap<PreferenceID, String> getPublishedCodes()
 		return new HashMap<PreferenceID, String>()
 		{
 			{
+				add("f8b8f180da6d4d9198ee42944b23dfdf", PreferenceID.BLOOD_SUGAR_UNITS);
 				add("e6681282aa724d3fa4cd6ac5735a163f", PreferenceID.TARGET_BS);
 				add("1a25c92eaa3148219da83b1e66275052", PreferenceID.FOOD_SETS);
 				add("e92b955f48fa434d960fdc4a541490de", PreferenceID.RATES_AUTO);
 				add("7648a35d3fbe4b4ca8fab12876abb1b6", PreferenceID.RATES_DATA);
 				add("589985b443c243d6844209964b2b1e8e", PreferenceID.RATES_MASS_UNITS);
+				add("622096bc5ed14fac93339de8a6d1df96", PreferenceID.ANDROID_LAST_USED_BLOOD_SUGAR_UNITS);
 				add("8b6575e476d64becae68468500f1bc1c", PreferenceID.ANDROID_FIRST_START);
 				add("d5c1a902e83b4d05a51085e344bee953", PreferenceID.ANDROID_SHOW_TIME_AFTER);
 				add("f3f54f8f02a3411faf48f90aadf0ca2d", PreferenceID.ANDROID_MEAL_FORMAT);
@@ -62,11 +64,13 @@ public void test_types()
 		Map<PreferenceID, Type> types = new HashMap<PreferenceID, Type>()
 		{
 			{
+				put(PreferenceID.BLOOD_SUGAR_UNITS, Type.STRING);
 				put(PreferenceID.TARGET_BS, Type.FLOAT);
 				put(PreferenceID.FOOD_SETS, Type.STRING);
 				put(PreferenceID.RATES_AUTO, Type.BOOLEAN);
 				put(PreferenceID.RATES_DATA, Type.STRING);
 				put(PreferenceID.RATES_MASS_UNITS, Type.STRING);
+				put(PreferenceID.ANDROID_LAST_USED_BLOOD_SUGAR_UNITS, Type.STRING);
 				put(PreferenceID.ANDROID_FIRST_START, Type.BOOLEAN);
 				put(PreferenceID.ANDROID_SHOW_TIME_AFTER, Type.BOOLEAN);
 				put(PreferenceID.ANDROID_MEAL_FORMAT, Type.STRING);