Changeset 16483 for branches/2520_PersistenceReintegration

Timestamp:

01/02/19 20:18:56 (5 years ago)

Author:

gkronber

Message:

#2520: added unit test for IndexedDataTable and Point2D and made necessary fixes

Location:

branches/2520_PersistenceReintegration

Files:

• HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs (modified) (1 diff)
• HeuristicLab.Common/3.3/Point2D.cs (modified) (3 diffs)
• HeuristicLab.Tests/HeuristicLab.Persistence.Fossil/UseCases.cs (modified) (1 diff)

branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

@@ -33 +33 @@
   public class DataRowVisualProperties : DeepCloneable, INotifyPropertyChanged {
     #region ChartType
+    [StorableType("488A018F-AF79-4B60-989A-845EF24F4A01")]
     public enum DataRowChartType {
       Line,
@@ -41 +42 @@
       StepLine
     }
+
     #endregion
     #region LineStyle
+    [StorableType("A064C2CE-D2CC-4292-B5FC-8DDCFA55C896")]
     public enum DataRowLineStyle {
       Dash,

branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs

@@ -33 +33 @@
 
     #region Histogram Aggregation
+    [StorableType("323A07AD-207C-4D45-B7EC-4E3E48F1E5C6")]
     public enum DataTableHistogramAggregation {
       Overlapping,

branches/2520_PersistenceReintegration/HeuristicLab.Common/3.3/Point2D.cs

@@ -31 +31 @@
     public static readonly Point2D<T> Empty = new Point2D<T>();
 
-    [Storable]
     private T x;
     public T X {
@@ -37 +36 @@
     }
 
-    [Storable]
     private T y;
     public T Y {
@@ -43 +41 @@
     }
 
-    [Storable]
     private object tag;
     public object Tag {

branches/2520_PersistenceReintegration/HeuristicLab.Tests/HeuristicLab.Persistence.Fossil/UseCases.cs

@@ -166 +166 @@
       }
     }
-    
-    // TODO:
-    // - IndexedItem and IndexedDataTable
-    // - Point2D from HL.Common 
+
+    [TestMethod]
+    [TestCategory("Persistence.Fossil")]
+    [TestProperty("Time", "short")]
+    public void TestIndexedDataTable() {
+      var dt = new IndexedDataTable<int>("test", "test description");
+      var dr = new IndexedDataRow<int>("test row");
+      dr.Values.Add(Tuple.Create(1, 1.0));
+      dr.Values.Add(Tuple.Create(2, 2.0));
+      dr.Values.Add(Tuple.Create(3, 3.0));
+      dt.Rows.Add(dr);
+      var ser = new ProtoBufSerializer();
+      ser.Serialize(dt, tempFile);
+      var dt2 = (IndexedDataTable<int>)ser.Deserialize(tempFile);
+      Assert.AreEqual(dt.Rows["test row"].Values[0], dt2.Rows["test row"].Values[0]);
+      Assert.AreEqual(dt.Rows["test row"].Values[1], dt2.Rows["test row"].Values[1]);
+      Assert.AreEqual(dt.Rows["test row"].Values[2], dt2.Rows["test row"].Values[2]);
+    }
+
+    [TestMethod]
+    [TestCategory("Persistence.Fossil")]
+    [TestProperty("Time", "short")]
+    public void TestPoint2d() {
+      var tag = new IntValue(10);
+      var p = new Point2D<double>(1.0, 2.0, tag);
+      var ser = new ProtoBufSerializer();
+      ser.Serialize(p, tempFile);
+      var p2 = (Point2D<double>)ser.Deserialize(tempFile);
+      Assert.AreEqual(p.X, p2.X);
+      Assert.AreEqual(p.Y, p2.Y);
+      var tag2 = (IntValue)p2.Tag;
+      Assert.AreEqual(tag.Value, tag2.Value);
+    }
 
     [ClassInitialize]