karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: move Layout/DataField persistence into one class.

Browse Source 
Part of #1118.
This commit is contained in:
Dennis Guse
2022-10-29 21:10:37 +02:00
parent 8aef9c8d28
commit 3cc3271726
8 changed files with 105 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/ui/customRecordingLayout/LayoutTest.java
+15 -15
View File
@@ -28,7 +28,7 @@ public class LayoutTest extends TestCase {
String csv = "running;2;" + context.getString(R.string.stats_custom_layout_speed_key) + ",1,1,0;" + context.getString(R.string.stats_custom_layout_distance_key) + ",1,0,0;" + context.getString(R.string.stats_custom_layout_altitude_key) + ",0,1,0;" + context.getString(R.string.stats_custom_layout_gain_key) + ",0,0,0;";
// when create a layout from CSV line
Layout layout = Layout.fromCsv(csv, resources);
Layout layout = LayoutIO.fromCsv(csv, resources);
List<DataField> dataFieldList = layout.getFields();
// then layout and data fields are built correctly
@@ -64,7 +64,7 @@ public class LayoutTest extends TestCase {
String csv1 = "Layout Name;speed,1,1;distance,0,0;";
// when create a layout from CSV line
Layout layout = Layout.fromCsv(csv1, resources);
Layout layout = LayoutIO.fromCsv(csv1, resources);
List<DataField> dataFieldList = layout.getFields();
// then layout and data fields are built correctly
@@ -79,7 +79,7 @@ public class LayoutTest extends TestCase {
String csv1 = "Layout Name;2;";
// when create a layout from CSV line
Layout layout = Layout.fromCsv(csv1, resources);
Layout layout = LayoutIO.fromCsv(csv1, resources);
List<DataField> dataFieldList = layout.getFields();
// then layout and data fields are built correctly
@@ -94,7 +94,7 @@ public class LayoutTest extends TestCase {
String csv1 = "Layout Name;2;speed,distance,total time;";
// when create a layout from CSV line
Layout layout = Layout.fromCsv(csv1, resources);
Layout layout = LayoutIO.fromCsv(csv1, resources);
List<DataField> dataFieldList = layout.getFields();
// then layout and data fields are built correctly
@@ -109,7 +109,7 @@ public class LayoutTest extends TestCase {
String csv1 = "Layout Name;2;speed,1,0;distance;";
// when create a layout from CSV line
Layout layout = Layout.fromCsv(csv1, resources);
Layout layout = LayoutIO.fromCsv(csv1, resources);
List<DataField> dataFieldList = layout.getFields();
// then layout and data fields are built correctly
@@ -122,11 +122,11 @@ public class LayoutTest extends TestCase {
public void testToCsv() {
// given a layout's object
Layout layout = new Layout("Test Layout", 2);
layout.addField("key1", "Title 1", false, false, false);
layout.addField("key2", "Title 2", false, true, false);
layout.addField("key3", "Title 3", true, false, false);
layout.addField("key4", "Title 4", true, true, false);
layout.addField("key5", "Title 5", true, true, true);
layout.addField(new DataField("key1", "Title 1", false, false, false));
layout.addField(new DataField("key2", "Title 2", false, true, false));
layout.addField(new DataField("key3", "Title 3", true, false, false));
layout.addField(new DataField("key4", "Title 4", true, true, false));
layout.addField(new DataField("key5", "Title 5", true, true, true));
// when converts it to CSV
String csv = layout.toCsv();
@@ -139,11 +139,11 @@ public class LayoutTest extends TestCase {
public void testToCsv_columnsByDefault() {
// given a layout's object
Layout layout = new Layout("Test Layout");
layout.addField("key1", "Title 1", false, false, false);
layout.addField("key2", "Title 2", false, true, false);
layout.addField("key3", "Title 3", true, false, false);
layout.addField("key4", "Title 4", true, true, false);
layout.addField("key5", "Title 5", true, true, true);
layout.addField(new DataField("key1", "Title 1", false, false, false));
layout.addField(new DataField("key2", "Title 2", false, true, false));
layout.addField(new DataField("key3", "Title 3", true, false, false));
layout.addField(new DataField("key4", "Title 4", true, true, false));
layout.addField(new DataField("key5", "Title 5", true, true, true));
// when converts it to CSV
String csv = layout.toCsv();