Generate UUID for each track (necessary for synchronization).

Fixes #294.

src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java

@@ -37,6 +37,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.content.data.Track;
@@ -47,6 +48,7 @@ import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.UUIDUtils;
 
 import static org.mockito.Mockito.when;
 
@@ -171,22 +173,26 @@ public class CustomContentProviderUtilsTest {
      */
     @Test
     public void testCreateTrack() {
-        int startColumnIndex = 1;
-        int columnIndex = startColumnIndex;
-        when(cursorMock.getColumnIndexOrThrow(TracksColumns._ID)).thenReturn(columnIndex++);
-        when(cursorMock.getColumnIndexOrThrow(TracksColumns.NAME)).thenReturn(columnIndex++);
-        columnIndex = startColumnIndex;
-        // Id
-        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
-        // Name
-        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
         long trackId = System.currentTimeMillis();
-        columnIndex = startColumnIndex;
+
+        int columnIndex = 1;
         // Id
-        when(cursorMock.getLong(columnIndex++)).thenReturn(trackId);
+        when(cursorMock.getColumnIndexOrThrow(TracksColumns._ID)).thenReturn(columnIndex);
+        when(cursorMock.isNull(columnIndex)).thenReturn(false);
+        when(cursorMock.getLong(columnIndex)).thenReturn(trackId);
+
+        //Uuid
+        columnIndex++;
+        when(cursorMock.getColumnIndexOrThrow(TracksColumns.UUID)).thenReturn(columnIndex);
+        when(cursorMock.isNull(columnIndex)).thenReturn(false);
+        when(cursorMock.getBlob(columnIndex)).thenReturn(UUIDUtils.toBytes(UUID.randomUUID()));
+
         // Name
+        columnIndex++;
         String name = NAME_PREFIX + trackId;
-        when(cursorMock.getString(columnIndex++)).thenReturn(name);
+        when(cursorMock.getColumnIndexOrThrow(TracksColumns.NAME)).thenReturn(columnIndex);
+        when(cursorMock.isNull(columnIndex)).thenReturn(false);
+        when(cursorMock.getString(columnIndex)).thenReturn(name);
 
         Track track = contentProviderUtils.createTrack(cursorMock);
         Assert.assertEquals(trackId, track.getId());

src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelperTest.java

@@ -5,6 +5,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -36,7 +37,8 @@ public class CustomSQLiteOpenHelperTest {
      *
      * @return Map(TableName, SQL)
      */
-    private static Map<String, String> getTableSQL(SQLiteDatabase db) {
+    @VisibleForTesting
+    public static Map<String, String> getTableSQL(SQLiteDatabase db) {
         HashMap<String, String> tableSQL = new HashMap<>();
         try (Cursor cursor = db.query("sqlite_master", new String[]{"name", "SQL"}, "name IN ('" + TracksColumns.TABLE_NAME + "', '" + TrackPointsColumns.TABLE_NAME + "', '" + WaypointsColumns.TABLE_NAME + "')", null, null, null, "name")) {
             if (cursor != null) {
@@ -53,6 +55,7 @@ public class CustomSQLiteOpenHelperTest {
      *
      * @return Map(tableName, SQL)
      */
+    @VisibleForTesting
     public static Map<String, String> getIndexSQL(SQLiteDatabase db) {
         HashMap<String, String> indexSQL = new HashMap<>();
         try (Cursor cursor = db.rawQuery("SELECT tbl_name, SQL FROM sqlite_master WHERE type = 'index'", null)) {
@@ -104,24 +107,7 @@ public class CustomSQLiteOpenHelperTest {
 
     @Test
     public void onUpgrade_FromVersion23() {
-        // Manually create database schema with version 23 (base version)
-        {
-            SQLiteDatabase dbBase = new SQLiteOpenHelper(context, DATABASE_NAME, null, 23) {
-                @Override
-                public void onCreate(SQLiteDatabase db) {
-                }
-
-                @Override
-                public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-                }
-            }.getWritableDatabase();
-
-            dbBase.execSQL(TRACKS_CREATE_TABLE_V23);
-            dbBase.execSQL(TRACKPOINTS_CREATE_TABLE_V23);
-            dbBase.execSQL(WAYPOINTS_CREATE_TABLE_V23);
-
-            dbBase.close();
-        }
+        createVersion23();
 
         // Open database with SQL upgrade
         Map<String, String> tableByUpgrade;
@@ -130,10 +116,9 @@ public class CustomSQLiteOpenHelperTest {
             tableByUpgrade = getTableSQL(dbUpgraded);
             indicesByUpgrade = getIndexSQL(dbUpgraded);
         }
-
-        // Open database via
         context.deleteDatabase(DATABASE_NAME);
 
+        // Open database via creation script
         Map<String, String> tablesByCreate;
         Map<String, String> indicesByCreate;
         try (SQLiteDatabase dbCreated = new CustomSQLiteOpenHelper(context, DATABASE_NAME).getReadableDatabase()) {
@@ -150,7 +135,8 @@ public class CustomSQLiteOpenHelperTest {
         Assert.assertEquals(tablesByCreate.get(WaypointsColumns.TABLE_NAME), tableByUpgrade.get(WaypointsColumns.TABLE_NAME));
 
         // then - verify custom indices
-        Assert.assertEquals(2, indicesByCreate.size());
+        Assert.assertEquals(3, indicesByCreate.size());
+        Assert.assertEquals(indicesByUpgrade.get(TracksColumns.TABLE_NAME), indicesByCreate.get(TracksColumns.TABLE_NAME));
         Assert.assertEquals(indicesByUpgrade.get(TrackPointsColumns.TABLE_NAME), indicesByCreate.get(TrackPointsColumns.TABLE_NAME));
         Assert.assertEquals(indicesByUpgrade.get(WaypointsColumns.TABLE_NAME), indicesByCreate.get(WaypointsColumns.TABLE_NAME));
     }
@@ -176,4 +162,23 @@ public class CustomSQLiteOpenHelperTest {
         // then - verify custom indices
         Assert.assertEquals(0, indicesByDowngrade.size());
     }
+
+    private void createVersion23() {
+        // Manually create database schema with version 23 (base version)
+        SQLiteDatabase dbBase = new SQLiteOpenHelper(context, DATABASE_NAME, null, 23) {
+            @Override
+            public void onCreate(SQLiteDatabase db) {
+            }
+
+            @Override
+            public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            }
+        }.getWritableDatabase();
+
+        dbBase.execSQL(TRACKS_CREATE_TABLE_V23);
+        dbBase.execSQL(TRACKPOINTS_CREATE_TABLE_V23);
+        dbBase.execSQL(WAYPOINTS_CREATE_TABLE_V23);
+
+        dbBase.close();
+    }
 }

src/androidTest/java/de/dennisguse/opentracks/util/UUIDUtilsTest.java

@@ -0,0 +1,23 @@
+package de.dennisguse.opentracks.util;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.UUID;
+
+@RunWith(AndroidJUnit4.class)
+public class UUIDUtilsTest {
+
+    @Test
+    public void test() {
+        UUID uuid = UUID.randomUUID();
+
+        byte[] bytes = UUIDUtils.toBytes(uuid);
+        UUID output = UUIDUtils.fromBytes(bytes);
+
+        Assert.assertEquals(uuid, output);
+    }
+}