Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/03/17 11:41:43 (7 years ago)
Author:
gkronber
Message:

#2520

  • renamed StorableClass -> StorableType
  • changed persistence to use GUIDs instead of type names
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceOverhaul/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCasesPersistenceNew.cs

    r14594 r14711  
    5353
    5454  #region Test Classes
    55   [StorableClass("7D9672BD-703D-42BB-9080-9929885D4580")]
     55  [StorableType("7D9672BD-703D-42BB-9080-9929885D4580")]
    5656  public class NumberTest {
    5757    [Storable]
    … …  
    102102  }
    103103
    104   [StorableClass("EEB19599-D5AC-48ED-A56B-CF213DFAF2E4")]
     104  [StorableType("EEB19599-D5AC-48ED-A56B-CF213DFAF2E4")]
    105105  public class NonDefaultConstructorClass {
    106106    [Storable]
    … …  
    111111  }
    112112
    113   [StorableClass("EE43FE7A-6D07-4D52-9338-C21B3485F82A")]
     113  [StorableType("EE43FE7A-6D07-4D52-9338-C21B3485F82A")]
    114114  public class IntWrapper {
    115115
    … …  
    134134  }
    135135
    136   [StorableClass("00A8E48E-8E8A-443C-A327-9F6ACCBE7E80")]
     136  [StorableType("00A8E48E-8E8A-443C-A327-9F6ACCBE7E80")]
    137137  public class PrimitivesTest : NumberTest {
    138138    [Storable]
    … …  
    166166  public enum TestEnum { va1, va2, va3, va8 };
    167167
    168   [StorableClass("26BA37F6-926D-4665-A10A-1F39E1CF6468")]
     168  [StorableType("26BA37F6-926D-4665-A10A-1F39E1CF6468")]
    169169  public class RootBase {
    170170    [Storable]
    … …  
    185185  }
    186186
    187   [StorableClass("F6BCB436-B5F2-40F6-8E2F-7A018CD1CBA0")]
     187  [StorableType("F6BCB436-B5F2-40F6-8E2F-7A018CD1CBA0")]
    188188  public class Root : RootBase {
    189189    [Storable]
    … …  
    220220  public enum TrickyEnum { zero = 0, one = 1, two = 2 }
    221221
    222   [StorableClass("2F6326ED-023A-415F-B5C7-9F9241940D05")]
     222  [StorableType("2F6326ED-023A-415F-B5C7-9F9241940D05")]
    223223  public class EnumTest {
    224224    [Storable]
    … …  
    230230  }
    231231
    232   [StorableClass("92365E2A-1184-4280-B763-4853C7ADF3E3")]
     232  [StorableType("92365E2A-1184-4280-B763-4853C7ADF3E3")]
    233233  public class Custom {
    234234    [Storable]
    … …  
    240240  }
    241241
    242   [StorableClass("7CF19EBC-1EC4-4FBE-BCA9-DA48E3CFE30D")]
     242  [StorableType("7CF19EBC-1EC4-4FBE-BCA9-DA48E3CFE30D")]
    243243  public class Manager {
    244244
    … …  
    253253  }
    254254
    255   [StorableClass("9092C705-F5E9-4BA9-9750-4357DB29AABF")]
     255  [StorableType("9092C705-F5E9-4BA9-9750-4357DB29AABF")]
    256256  public class C {
    257257    [Storable]
    … …  
    274274  }
    275275
    276   [StorableClass("FD953B0A-BDE6-41E6-91A8-CA3D90C91CDB")]
     276  [StorableType("FD953B0A-BDE6-41E6-91A8-CA3D90C91CDB")]
    277277  public class SimpleClass {
    278278    [Storable]
    … …  
    11391139    }
    11401140
    1141     [StorableClass("87A331AF-14DC-48B3-B577-D49065743BE6")]
     1141    [StorableType("87A331AF-14DC-48B3-B577-D49065743BE6")]
    11421142    public class NestedType {
    11431143      [Storable]
    … …  
    13351335    }
    13361336
    1337     [StorableClass("B963EF51-12B4-432E-8C54-88F026F9ACE2")]
     1337    [StorableType("B963EF51-12B4-432E-8C54-88F026F9ACE2")]
    13381338    class Child {
    13391339      [Storable]
    … …  
    13411341    }
    13421342
    1343     [StorableClass("E66E9606-967A-4C35-A361-F6F0D21C064A")]
     1343    [StorableType("E66E9606-967A-4C35-A361-F6F0D21C064A")]
    13441344    class Parent {
    13451345      [Storable]
    … …  
    13471347    }
    13481348
    1349     [StorableClass("34D3893A-57AD-4F72-878B-81D6FA3F14A9")]
     1349    [StorableType("34D3893A-57AD-4F72-878B-81D6FA3F14A9")]
    13501350    class GrandParent {
    13511351      [Storable]
    … …  
    13681368    }
    13691369
     1370    [StorableType("15DF777F-B12D-4FD4-88C3-8CB4C9CE4F0C")]
    13701371    struct TestStruct {
    13711372      int value;
    … …  
    14301431    }
    14311432
    1432     [StorableClass("E846BC49-20F3-4D3F-A3F3-73D4F2DB1C2E")]
     1433    [StorableType("E846BC49-20F3-4D3F-A3F3-73D4F2DB1C2E")]
    14331434    private class PersistenceHooks {
    14341435      [Storable]
    … …  
    14681469    }
    14691470
    1470     [StorableClass("A35D71DF-397F-4910-A950-ED6923BE9483")]
     1471    [StorableType("A35D71DF-397F-4910-A950-ED6923BE9483")]
    14711472    private class CustomConstructor {
    14721473      public string Value = "none";
    … …  
    14931494    }
    14941495
    1495     [StorableClass("D276E825-1F35-4BAC-8937-9ABC91D5C316")]
     1496    [StorableType("D276E825-1F35-4BAC-8937-9ABC91D5C316")]
    14961497    public class ExplodingDefaultConstructor {
    14971498      public ExplodingDefaultConstructor() {
    … …  
    15321533    }
    15331534
    1534     [StorableClass("4921031B-CB61-4677-97AD-9236A4CEC200")]
     1535    [StorableType("4921031B-CB61-4677-97AD-9236A4CEC200")]
    15351536    public class HookInheritanceTestBase {
    15361537      [Storable]
    … …  
    15431544    }
    15441545
    1545     [StorableClass("321CEE0A-5201-4CE2-B135-2343890D96BF")]
     1546    [StorableType("321CEE0A-5201-4CE2-B135-2343890D96BF")]
    15461547    public class HookInheritanceTestDerivedClass : HookInheritanceTestBase {
    15471548      [Storable]
    … …  
    15661567    }
    15671568
    1568     [StorableClass(StorableClassType.AllFields, "B9AB42E8-1932-425B-B4CF-F31F07EAC599")]
     1569    [StorableType(StorableMemberSelection.AllFields, "B9AB42E8-1932-425B-B4CF-F31F07EAC599")]
    15691570    public class AllFieldsStorable {
    15701571      public int Value1 = 1;
    … …  
    15871588    [TestCategory("Persistence4")]
    15881589    [TestProperty("Time", "short")]
    1589     public void TestStorableClassDiscoveryAllFields() {
     1590    public void TestStorableTypeDiscoveryAllFields() {
    15901591      ProtoBufSerializer serializer = new ProtoBufSerializer();
    15911592      AllFieldsStorable afs = new AllFieldsStorable(false);
    … …  
    15981599    }
    15991600
    1600     [StorableClass(StorableClassType.AllProperties, "CB7DC31C-AEF3-4EB8-91CA-248B767E9F92")]
     1601    [StorableType(StorableMemberSelection.AllProperties, "CB7DC31C-AEF3-4EB8-91CA-248B767E9F92")]
    16011602    public class AllPropertiesStorable {
    16021603      public int Value1 = 1;
    … …  
    16191620    [TestCategory("Persistence4")]
    16201621    [TestProperty("Time", "short")]
    1621     public void TestStorableClassDiscoveryAllProperties() {
     1622    public void TestStorableTypeDiscoveryAllProperties() {
    16221623      ProtoBufSerializer serializer = new ProtoBufSerializer();
    16231624      AllPropertiesStorable afs = new AllPropertiesStorable(false);
    … …  
    16311632    }
    16321633
    1633     [StorableClass(StorableClassType.AllFieldsAndAllProperties, "0AD8D68F-E0FF-4FA8-8A72-1148CD91A2B9")]
     1634    [StorableType(StorableMemberSelection.AllFieldsAndAllProperties, "0AD8D68F-E0FF-4FA8-8A72-1148CD91A2B9")]
    16341635    public class AllFieldsAndAllPropertiesStorable {
    16351636      public int Value1 = 1;
    … …  
    16521653    [TestCategory("Persistence4")]
    16531654    [TestProperty("Time", "short")]
    1654     public void TestStorableClassDiscoveryAllFieldsAndAllProperties() {
     1655    public void TestStorableTypeDiscoveryAllFieldsAndAllProperties() {
    16551656      ProtoBufSerializer serializer = new ProtoBufSerializer();
    16561657      AllFieldsAndAllPropertiesStorable afs = new AllFieldsAndAllPropertiesStorable(false);
    … …  
    16631664    }
    16641665
    1665     [StorableClass(StorableClassType.MarkedOnly, "0D94E6D4-64E3-4637-B1EE-DEF2B3F6E2E0")]
     1666    [StorableType(StorableMemberSelection.MarkedOnly, "0D94E6D4-64E3-4637-B1EE-DEF2B3F6E2E0")]
    16661667    public class MarkedOnlyStorable {
    16671668      public int Value1 = 1;
    … …  
    16841685    [TestCategory("Persistence4")]
    16851686    [TestProperty("Time", "short")]
    1686     public void TestStorableClassDiscoveryMarkedOnly() {
     1687    public void TestStorableTypeDiscoveryMarkedOnly() {
    16871688      ProtoBufSerializer serializer = new ProtoBufSerializer();
    16881689      MarkedOnlyStorable afs = new MarkedOnlyStorable(false);
    … …  
    17401741    }
    17411742
     1743    [StorableType("B13CB1B0-D2DA-47B8-A715-B166A28B1F03")]
    17421744    private class IdentityComparer<T> : IEqualityComparer<T> {
    17431745
    … …  
    18051807    }
    18061808
    1807     [StorableClass("A9B0D7FB-0CAF-4DD7-9045-EA136F9176F7")]
     1809    [StorableType("A9B0D7FB-0CAF-4DD7-9045-EA136F9176F7")]
    18081810    public class ReadOnlyFail {
    18091811      [Storable]
    … …  
    18281830
    18291831
    1830     [StorableClass("2C9CC576-6823-4784-817B-37C8AF0B1C29")]
     1832    [StorableType("2C9CC576-6823-4784-817B-37C8AF0B1C29")]
    18311833    public class WriteOnlyFail {
    18321834      [Storable]
    … …  
    18501852    }
    18511853
    1852     [StorableClass("8052D9E3-6DDD-4AE1-9B5B-67C6D5436512")]
     1854    [StorableType("8052D9E3-6DDD-4AE1-9B5B-67C6D5436512")]
    18531855    public class OneWayTest {
    18541856      public OneWayTest() { this.value = "default"; }
    … …  
    20592061    #endregion
    20602062
    2061     [StorableClass("6075F1E8-948A-4AD8-8F5A-942B777852EC")]
     2063    [StorableType("6075F1E8-948A-4AD8-8F5A-942B777852EC")]
    20622064    public class A {
    20632065      [Storable]
    20642066      public B B { get; set; }
    20652067
    2066       [Storable] public int i;
    2067     }
    2068     [StorableClass("6075F1E8-948A-4AD8-8F5A-942B777852EC")]
     2068      [Storable]
     2069      public int i;
     2070    }
     2071    [StorableType("287BFEA0-6E27-4839-BCEF-D134FE738AC8")]
    20692072    public class B {
    20702073      [Storable]
    … …  
    21272130    [TestProperty("Time", "short")]
    21282131    public void TestLoadingSamples() {
    2129       var path = @"D:\Dev\HL\branches\PersistenceOverhaul\HeuristicLab.Optimizer\3.3\Documents";
     2132      var path = @"D:\hl\branches\PersistenceOverhaul\HeuristicLab.Optimizer\3.3\Documents";
    21302133      var serializer = new ProtoBufSerializer();
    21312134      foreach (var fileName in Directory.EnumerateFiles(path, "*.hl")) {
Note: See TracChangeset for help on using the changeset viewer.