Snyc with new Workbench models; fix SSL bug

ereuse_devicehub/resources/action/__init__.py

@@ -89,6 +89,11 @@ class TestDef(ActionDef):
     SCHEMA = schemas.Test
 
 
+class MeasureBattery(TestDef):
+    VIEW = None
+    SCHEMA = schemas.MeasureBattery
+
+
 class TestDataStorageDef(TestDef):
     VIEW = None
     SCHEMA = schemas.TestDataStorage

ereuse_devicehub/resources/action/schemas.py

@@ -149,7 +149,7 @@ class MeasureBattery(Test):
     __doc__ = m.MeasureBattery.__doc__
     size = Integer(required=True, description=m.MeasureBattery.size.comment)
     voltage = Integer(required=True, description=m.MeasureBattery.voltage.comment)
-    cycle_count = Integer(required=True, description=m.MeasureBattery.cycle_count.comment)
+    cycle_count = Integer(data_key='cycleCount', description=m.MeasureBattery.cycle_count.comment)
     health = EnumField(enums.BatteryHealth, description=m.MeasureBattery.health.comment)
 
 

ereuse_devicehub/resources/device/definitions.py

@@ -161,6 +161,11 @@ class DisplayDef(ComponentDef):
     SCHEMA = schemas.Display
 
 
+class BatteryDef(ComponentDef):
+    VIEW = None
+    SCHEMA = schemas.Battery
+
+
 class ComputerAccessoryDef(DeviceDef):
     VIEW = None
     SCHEMA = schemas.ComputerAccessory

ereuse_devicehub/resources/device/models.py

@@ -1,4 +1,3 @@
-import csv
 import pathlib
 from contextlib import suppress
 from fractions import Fraction
@@ -82,6 +81,8 @@ class Device(Thing):
     """
     generation = db.Column(db.SmallInteger, check_range('generation', 0))
     generation.comment = """The generation of the device."""
+    version = db.Column(db.Unicode)
+    version.comment = """The version code this device, like v1 or A001."""
     weight = Column(Float(decimal_return_scale=3), check_range('weight', 0.1, 5))
     weight.comment = """
         The weight of the device.
@@ -107,6 +108,10 @@ class Device(Thing):
     """
     variant = Column(Unicode)
     variant.comment = """A variant or sub-model of the device."""
+    sku = db.Column(db.Unicode)
+    sku.comment = """The Stock Keeping Unit (SKU), i.e. a 
+    merchant-specific identifier for a product or service.
+    """
 
     _NON_PHYSICAL_PROPS = {
         'id',
@@ -124,7 +129,9 @@ class Device(Thing):
         'brand',
         'generation',
         'production_date',
-        'variant'
+        'variant',
+        'version',
+        'sku'
     }
 
     __table_args__ = (
@@ -625,6 +632,8 @@ class Motherboard(JoinedComponentTableMixin, Component):
     pcmcia = Column(SmallInteger, check_range('pcmcia', min=0))
     bios_date = Column(db.Date)
     bios_date.comment = """The date of the BIOS version."""
+    ram_slots = Column(db.SmallInteger, check_range('ram_slots'))
+    ram_max_size = Column(db.Integer, check_range('ram_max_size'))
 
 
 class NetworkMixin:
@@ -798,8 +807,6 @@ class Manufacturer(db.Model):
     Ideally users should use the names from this list when submitting
     devices.
     """
-    CSV_DELIMITER = csv.get_dialect('excel').delimiter
-
     name = db.Column(CIText(), primary_key=True)
     name.comment = """The normalized name of the manufacturer."""
     url = db.Column(URL(), unique=True)

ereuse_devicehub/resources/device/models.pyi

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import date, datetime
 from fractions import Fraction
 from operator import attrgetter
 from typing import Dict, Generator, Iterable, List, Optional, Set, Type, TypeVar
@@ -42,7 +42,9 @@ class Device(Thing):
     production_date = ...  # type: Column
     brand = ...  # type: Column
     generation = ...  # type: Column
+    version = ...  # type: Column
     variant = ...  # type: Column
+    sku = ...  # type: Column
 
     def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
@@ -65,7 +67,9 @@ class Device(Thing):
         self.production_date = ...  # type: Optional[datetime]
         self.brand = ...  # type: Optional[str]
         self.generation = ...  # type: Optional[int]
+        self.version = ...  # type: Optional[str]
         self.variant = ...  # type: Optional[str]
+        self.sku = ...  # type: Optional[str]
 
     @property
     def actions(self) -> List[e.Action]:
@@ -272,6 +276,9 @@ class Motherboard(Component):
     firewire = ...  # type: Column
     serial = ...  # type: Column
     pcmcia = ...  # type: Column
+    bios_date = ...  # type: Column
+    ram_slots = ...  # type: Column
+    ram_max_size = ...  # type: Column
 
     def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
@@ -280,6 +287,9 @@ class Motherboard(Component):
         self.firewire = ...  # type: int
         self.serial = ...  # type: int
         self.pcmcia = ...  # type: int
+        self.bios_date = ...  # type: Optional[date]
+        self.ram_slots = ...  # type: Optional[int]
+        self.ram_max_size = ...  # type: Optional[int]
 
 
 class NetworkMixin:

ereuse_devicehub/resources/device/schemas.py

@@ -1,5 +1,7 @@
+import datetime
+
 from marshmallow import post_load, pre_load
-from marshmallow.fields import Boolean, DateTime, Float, Integer, List, Str, String
+from marshmallow.fields import Boolean, Date, DateTime, Float, Integer, List, Str, String
 from marshmallow.validate import Length, OneOf, Range
 from sqlalchemy.util import OrderedSet
 from stdnum import imei, meid
@@ -33,6 +35,7 @@ class Device(Thing):
                                  data_key='serialNumber')
     brand = SanitizedStr(validate=Length(max=STR_BIG_SIZE), description=m.Device.brand.comment)
     generation = Integer(validate=Range(1, 100), description=m.Device.generation.comment)
+    version = SanitizedStr(description=m.Device.version)
     weight = Float(validate=Range(0.1, 5), unit=UnitCodes.kgm, description=m.Device.weight.comment)
     width = Float(validate=Range(0.1, 5), unit=UnitCodes.m, description=m.Device.width.comment)
     height = Float(validate=Range(0.1, 5), unit=UnitCodes.m, description=m.Device.height.comment)
@@ -57,6 +60,8 @@ class Device(Thing):
                        many=True,
                        dump_only=True,
                        description=m.Device.working.__doc__)
+    variant = SanitizedStr(description=m.Device.variant)
+    sku = SanitizedStr(description=m.Device.sku)
 
     @pre_load
     def from_actions_to_actions_one(self, data: dict):
@@ -250,6 +255,12 @@ class Motherboard(Component):
     firewire = Integer(validate=Range(0, 20), description=m.Motherboard.firewire.comment)
     serial = Integer(validate=Range(0, 20), description=m.Motherboard.serial.comment)
     pcmcia = Integer(validate=Range(0, 20), description=m.Motherboard.pcmcia.comment)
+    bios_date = Date(validate=Range(datetime.date(year=1980, month=1, day=1),
+                                    datetime.date(year=2030, month=1, day=1)),
+                     data_key='biosDate',
+                     description=m.Motherboard.bios_date)
+    ram_slots = Integer(validate=Range(1), data_key='ramSlots')
+    ram_max_size = Integer(validate=Range(1), data_key='ramMaxSize')
 
 
 class NetworkAdapter(NetworkMixin, Component):

ereuse_devicehub/resources/enums.py

@@ -262,10 +262,16 @@ class BatteryHealth(Enum):
 
 @unique
 class BatteryTechnology(Enum):
-    """The technology of the Battery."""
+    """The technology of the Battery. Adapted from
+    https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-class-power
+    adding ``Alkaline``.
+    """
     LiIon = 'Lithium-ion'
-    NiCad = 'Nickel-Cadmium'
+    NiCd = 'Nickel-Cadmium'
     NiMH = 'Nickel-metal hydride'
+    LiPoly = 'Lithium-ion Polymer'
+    LiFe = 'LiFe'
+    LiMn = 'Lithium Manganese'
     Al = 'Alkaline'
 
 

requirements.txt

@@ -30,5 +30,5 @@ Werkzeug==0.14.1
 sqlalchemy-citext==1.3.post0
 flask-weasyprint==0.5
 weasyprint==44
-psycopg2-binary==2.7.5
+psycopg2-binary==2.8.3
 sortedcontainers==2.1.0

tests/files/basic.csv

@@ -1,2 +1,2 @@
-Type,Chassis,Tag 1,Tag 2,Tag 3,Serial Number,Model,Manufacturer,Registered in,Price,Processor,RAM (GB),Data Storage Size (MB),Rate,Range,Processor Rate,Processor Range,RAM Rate,RAM Range,Data Storage Rate,Data Storage Range,DataStorage 1,DataStorage 1 Manufacturer,DataStorage 1 Model,DataStorage 1 Serial Number,DataStorage 2,DataStorage 2 Manufacturer,DataStorage 2 Model,DataStorage 2 Serial Number,DataStorage 3,DataStorage 3 Manufacturer,DataStorage 3 Model,DataStorage 3 Serial Number,DataStorage 4,DataStorage 4 Manufacturer,DataStorage 4 Model,DataStorage 4 Serial Number,Display 1,Display 1 Manufacturer,Display 1 Model,Display 1 Serial Number,GraphicCard 1,GraphicCard 1 Manufacturer,GraphicCard 1 Model,GraphicCard 1 Serial Number,GraphicCard 1 Memory (MB),GraphicCard 2,GraphicCard 2 Manufacturer,GraphicCard 2 Model,GraphicCard 2 Serial Number,Motherboard 1,Motherboard 1 Manufacturer,Motherboard 1 Model,Motherboard 1 Serial Number,NetworkAdapter 1,NetworkAdapter 1 Manufacturer,NetworkAdapter 1 Model,NetworkAdapter 1 Serial Number,NetworkAdapter 2,NetworkAdapter 2 Manufacturer,NetworkAdapter 2 Model,NetworkAdapter 2 Serial Number,Processor 1,Processor 1 Manufacturer,Processor 1 Model,Processor 1 Serial Number,Processor 1 Number of cores,Processor 1 Speed (GHz),Processor 2,Processor 2 Manufacturer,Processor 2 Model,Processor 2 Serial Number,RamModule 1,RamModule 1 Manufacturer,RamModule 1 Model,RamModule 1 Serial Number,RamModule 1 Size (MB),RamModule 1 Speed (MHz),RamModule 2,RamModule 2 Manufacturer,RamModule 2 Model,RamModule 2 Serial Number,RamModule 3,RamModule 3 Manufacturer,RamModule 3 Model,RamModule 3 Serial Number,RamModule 4,RamModule 4 Manufacturer,RamModule 4 Model,RamModule 4 Serial Number,SoundCard 1,SoundCard 1 Manufacturer,SoundCard 1 Model,SoundCard 1 Serial Number,SoundCard 2,SoundCard 2 Manufacturer,SoundCard 2 Model,SoundCard 2 Serial Number
+Type,Chassis,Tag 1,Tag 2,Tag 3,Serial Number,Model,Manufacturer,Registered in,Price,Processor,RAM (GB),Data Storage Size (MB),Rate,Range,Processor Rate,Processor Range,RAM Rate,RAM Range,Data Storage Rate,Data Storage Range,Battery 1,Battery 1 Manufacturer,Battery 1 Model,Battery 1 Serial Number,Battery 2,Battery 2 Manufacturer,Battery 2 Model,Battery 2 Serial Number,Battery 3,Battery 3 Manufacturer,Battery 3 Model,Battery 3 Serial Number,Battery 4,Battery 4 Manufacturer,Battery 4 Model,Battery 4 Serial Number,DataStorage 1,DataStorage 1 Manufacturer,DataStorage 1 Model,DataStorage 1 Serial Number,DataStorage 2,DataStorage 2 Manufacturer,DataStorage 2 Model,DataStorage 2 Serial Number,DataStorage 3,DataStorage 3 Manufacturer,DataStorage 3 Model,DataStorage 3 Serial Number,DataStorage 4,DataStorage 4 Manufacturer,DataStorage 4 Model,DataStorage 4 Serial Number,Display 1,Display 1 Manufacturer,Display 1 Model,Display 1 Serial Number,GraphicCard 1,GraphicCard 1 Manufacturer,GraphicCard 1 Model,GraphicCard 1 Serial Number,GraphicCard 1 Memory (MB),GraphicCard 2,GraphicCard 2 Manufacturer,GraphicCard 2 Model,GraphicCard 2 Serial Number,Motherboard 1,Motherboard 1 Manufacturer,Motherboard 1 Model,Motherboard 1 Serial Number,NetworkAdapter 1,NetworkAdapter 1 Manufacturer,NetworkAdapter 1 Model,NetworkAdapter 1 Serial Number,NetworkAdapter 2,NetworkAdapter 2 Manufacturer,NetworkAdapter 2 Model,NetworkAdapter 2 Serial Number,Processor 1,Processor 1 Manufacturer,Processor 1 Model,Processor 1 Serial Number,Processor 1 Number of cores,Processor 1 Speed (GHz),Processor 2,Processor 2 Manufacturer,Processor 2 Model,Processor 2 Serial Number,RamModule 1,RamModule 1 Manufacturer,RamModule 1 Model,RamModule 1 Serial Number,RamModule 1 Size (MB),RamModule 1 Speed (MHz),RamModule 2,RamModule 2 Manufacturer,RamModule 2 Model,RamModule 2 Serial Number,RamModule 3,RamModule 3 Manufacturer,RamModule 3 Model,RamModule 3 Serial Number,RamModule 4,RamModule 4 Manufacturer,RamModule 4 Model,RamModule 4 Serial Number,SoundCard 1,SoundCard 1 Manufacturer,SoundCard 1 Model,SoundCard 1 Serial Number,SoundCard 2,SoundCard 2 Manufacturer,SoundCard 2 Model,SoundCard 2 Serial Number
-Desktop,Microtower,,,,d1s,d1ml,d1mr,Tue Mar  5 19:54:18 2019,,p1ml,0,0,0.8,Very low,1.0,Very low,1.0,Very low,1.0,Very low,,,,,,,,,,,,,,,,,,,,,"GraphicCard 2: model gc1ml, S/N gc1s",gc1s,gc1s,gc1s,,,,,,,,,,,,,,,,,,"Processor 4: model p1ml, S/N p1s",p1s,p1s,p1s,,1.6,,,,,"RamModule 3: model rm1ml, S/N rm1s",rm1s,rm1s,rm1s,,1333,,,,,,,,,,,,,,,,,,,,
+Desktop,Microtower,,,,d1s,d1ml,d1mr,Wed Jun 26 10:59:13 2019,,p1ml,0,0,0.8,Very low,1.0,Very low,1.0,Very low,1.0,Very low,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"GraphicCard 2: model gc1ml, S/N gc1s",gc1s,gc1s,gc1s,,,,,,,,,,,,,,,,,,"Processor 4: model p1ml, S/N p1s",p1s,p1s,p1s,,1.6,,,,,"RamModule 3: model rm1ml, S/N rm1s",rm1s,rm1s,rm1s,,1333,,,,,,,,,,,,,,,,,,,,

tests/files/multiples_devices.csv

@@ -1,5 +1,5 @@
-Type,Chassis,Tag 1,Tag 2,Tag 3,Serial Number,Model,Manufacturer,Registered in,Price,Processor,RAM (GB),Data Storage Size (MB),Rate,Range,Processor Rate,Processor Range,RAM Rate,RAM Range,Data Storage Rate,Data Storage Range,DataStorage 1,DataStorage 1 Manufacturer,DataStorage 1 Model,DataStorage 1 Serial Number,DataStorage 2,DataStorage 2 Manufacturer,DataStorage 2 Model,DataStorage 2 Serial Number,DataStorage 3,DataStorage 3 Manufacturer,DataStorage 3 Model,DataStorage 3 Serial Number,DataStorage 4,DataStorage 4 Manufacturer,DataStorage 4 Model,DataStorage 4 Serial Number,Display 1,Display 1 Manufacturer,Display 1 Model,Display 1 Serial Number,GraphicCard 1,GraphicCard 1 Manufacturer,GraphicCard 1 Model,GraphicCard 1 Serial Number,GraphicCard 1 Memory (MB),GraphicCard 2,GraphicCard 2 Manufacturer,GraphicCard 2 Model,GraphicCard 2 Serial Number,Motherboard 1,Motherboard 1 Manufacturer,Motherboard 1 Model,Motherboard 1 Serial Number,NetworkAdapter 1,NetworkAdapter 1 Manufacturer,NetworkAdapter 1 Model,NetworkAdapter 1 Serial Number,NetworkAdapter 2,NetworkAdapter 2 Manufacturer,NetworkAdapter 2 Model,NetworkAdapter 2 Serial Number,Processor 1,Processor 1 Manufacturer,Processor 1 Model,Processor 1 Serial Number,Processor 1 Number of cores,Processor 1 Speed (GHz),Processor 2,Processor 2 Manufacturer,Processor 2 Model,Processor 2 Serial Number,RamModule 1,RamModule 1 Manufacturer,RamModule 1 Model,RamModule 1 Serial Number,RamModule 1 Size (MB),RamModule 1 Speed (MHz),RamModule 2,RamModule 2 Manufacturer,RamModule 2 Model,RamModule 2 Serial Number,RamModule 3,RamModule 3 Manufacturer,RamModule 3 Model,RamModule 3 Serial Number,RamModule 4,RamModule 4 Manufacturer,RamModule 4 Model,RamModule 4 Serial Number,SoundCard 1,SoundCard 1 Manufacturer,SoundCard 1 Model,SoundCard 1 Serial Number,SoundCard 2,SoundCard 2 Manufacturer,SoundCard 2 Model,SoundCard 2 Serial Number
+Type,Chassis,Tag 1,Tag 2,Tag 3,Serial Number,Model,Manufacturer,Registered in,Price,Processor,RAM (GB),Data Storage Size (MB),Rate,Range,Processor Rate,Processor Range,RAM Rate,RAM Range,Data Storage Rate,Data Storage Range,Battery 1,Battery 1 Manufacturer,Battery 1 Model,Battery 1 Serial Number,Battery 2,Battery 2 Manufacturer,Battery 2 Model,Battery 2 Serial Number,Battery 3,Battery 3 Manufacturer,Battery 3 Model,Battery 3 Serial Number,Battery 4,Battery 4 Manufacturer,Battery 4 Model,Battery 4 Serial Number,DataStorage 1,DataStorage 1 Manufacturer,DataStorage 1 Model,DataStorage 1 Serial Number,DataStorage 2,DataStorage 2 Manufacturer,DataStorage 2 Model,DataStorage 2 Serial Number,DataStorage 3,DataStorage 3 Manufacturer,DataStorage 3 Model,DataStorage 3 Serial Number,DataStorage 4,DataStorage 4 Manufacturer,DataStorage 4 Model,DataStorage 4 Serial Number,Display 1,Display 1 Manufacturer,Display 1 Model,Display 1 Serial Number,GraphicCard 1,GraphicCard 1 Manufacturer,GraphicCard 1 Model,GraphicCard 1 Serial Number,GraphicCard 1 Memory (MB),GraphicCard 2,GraphicCard 2 Manufacturer,GraphicCard 2 Model,GraphicCard 2 Serial Number,Motherboard 1,Motherboard 1 Manufacturer,Motherboard 1 Model,Motherboard 1 Serial Number,NetworkAdapter 1,NetworkAdapter 1 Manufacturer,NetworkAdapter 1 Model,NetworkAdapter 1 Serial Number,NetworkAdapter 2,NetworkAdapter 2 Manufacturer,NetworkAdapter 2 Model,NetworkAdapter 2 Serial Number,Processor 1,Processor 1 Manufacturer,Processor 1 Model,Processor 1 Serial Number,Processor 1 Number of cores,Processor 1 Speed (GHz),Processor 2,Processor 2 Manufacturer,Processor 2 Model,Processor 2 Serial Number,RamModule 1,RamModule 1 Manufacturer,RamModule 1 Model,RamModule 1 Serial Number,RamModule 1 Size (MB),RamModule 1 Speed (MHz),RamModule 2,RamModule 2 Manufacturer,RamModule 2 Model,RamModule 2 Serial Number,RamModule 3,RamModule 3 Manufacturer,RamModule 3 Model,RamModule 3 Serial Number,RamModule 4,RamModule 4 Manufacturer,RamModule 4 Model,RamModule 4 Serial Number,SoundCard 1,SoundCard 1 Manufacturer,SoundCard 1 Model,SoundCard 1 Serial Number,SoundCard 2,SoundCard 2 Manufacturer,SoundCard 2 Model,SoundCard 2 Serial Number
-Laptop,Netbook,,,,b8oaas048286,1001pxd,asustek computer inc.,Wed Mar 6 18:22:05 2019,,intel atom cpu n455 @ 1.66ghz,1024,238475,1.98,Very low,1.31,Very low,1.53,Very low,3.76,Medium,,,,,,,,,,,,,,,,,,,,,"GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None",,,,256,,,,,"Motherboard 10: model 1001pxd, S/N eee0123456789",eee0123456789,eee0123456789,eee0123456789,"NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8",74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,"NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c",14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,"Processor 4: model intel atom cpu n455 @ 1.66ghz, S/N None",,,,1,1.667,,,,,"RamModule 8: model None, S/N None",,,,1024,667,,,,,,,,,,,,,"SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None",,,,"SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001",0x0001,0x0001,0x0001
+Laptop,Netbook,,,,b8oaas048286,1001pxd,asustek computer inc.,Wed Jun 26 11:07:31 2019,,intel atom cpu n455 @ 1.66ghz,1024,238475,1.98,Very low,1.31,Very low,1.53,Very low,3.76,Medium,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None",,,,256,,,,,"Motherboard 10: model 1001pxd, S/N eee0123456789",eee0123456789,eee0123456789,eee0123456789,"NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8",74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,"NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c",14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,"Processor 4: model intel atom cpu n455 @ 1.66ghz, S/N None",,,,1,1.667,,,,,"RamModule 8: model None, S/N None",,,,1024,667,,,,,,,,,,,,,"SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None",,,,"SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001",0x0001,0x0001,0x0001
-Desktop,Microtower,,,,d1s,d1ml,d1mr,Wed Mar 6 18:22:06 2019,,p1ml,0,0,0.8,Very low,1.0,Very low,1.0,Very low,1.0,Very low,,,,,,,,,,,,,,,,,,,,,"GraphicCard 12: model gc1ml, S/N gc1s",gc1s,gc1s,gc1s,,,,,,,,,,,,,,,,,,"Processor 14: model p1ml, S/N p1s",p1s,p1s,p1s,,1.6,,,,,"RamModule 13: model rm1ml, S/N rm1s",rm1s,rm1s,rm1s,,1333,,,,,,,,,,,,,,,,,,,,
+Desktop,Microtower,,,,d1s,d1ml,d1mr,Wed Jun 26 11:07:31 2019,,p1ml,0,0,0.8,Very low,1.0,Very low,1.0,Very low,1.0,Very low,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"GraphicCard 12: model gc1ml, S/N gc1s",gc1s,gc1s,gc1s,,,,,,,,,,,,,,,,,,"Processor 14: model p1ml, S/N p1s",p1s,p1s,p1s,,1.6,,,,,"RamModule 13: model rm1ml, S/N rm1s",rm1s,rm1s,rm1s,,1333,,,,,,,,,,,,,,,,,,,,
-Keyboard,,,,,bar,foo,baz,Wed Mar 6 18:22:06 2019,
+Keyboard,,,,,bar,foo,baz,Wed Jun 26 11:07:31 2019,
-ComputerMonitor,,,,,cn0fp446728728541c8s,1707fpf,dell,Wed Mar 6 18:22:06 2019,
+ComputerMonitor,,,,,cn0fp446728728541c8s,1707fpf,dell,Wed Jun 26 11:07:31 2019,

tests/files/real-eee-1001pxd.csv

@@ -1,2 +1,2 @@
-Type,Chassis,Tag 1,Tag 2,Tag 3,Serial Number,Model,Manufacturer,Registered in,Price,Processor,RAM (GB),Data Storage Size (MB),Rate,Range,Processor Rate,Processor Range,RAM Rate,RAM Range,Data Storage Rate,Data Storage Range,DataStorage 1,DataStorage 1 Manufacturer,DataStorage 1 Model,DataStorage 1 Serial Number,DataStorage 2,DataStorage 2 Manufacturer,DataStorage 2 Model,DataStorage 2 Serial Number,DataStorage 3,DataStorage 3 Manufacturer,DataStorage 3 Model,DataStorage 3 Serial Number,DataStorage 4,DataStorage 4 Manufacturer,DataStorage 4 Model,DataStorage 4 Serial Number,Display 1,Display 1 Manufacturer,Display 1 Model,Display 1 Serial Number,GraphicCard 1,GraphicCard 1 Manufacturer,GraphicCard 1 Model,GraphicCard 1 Serial Number,GraphicCard 1 Memory (MB),GraphicCard 2,GraphicCard 2 Manufacturer,GraphicCard 2 Model,GraphicCard 2 Serial Number,Motherboard 1,Motherboard 1 Manufacturer,Motherboard 1 Model,Motherboard 1 Serial Number,NetworkAdapter 1,NetworkAdapter 1 Manufacturer,NetworkAdapter 1 Model,NetworkAdapter 1 Serial Number,NetworkAdapter 2,NetworkAdapter 2 Manufacturer,NetworkAdapter 2 Model,NetworkAdapter 2 Serial Number,Processor 1,Processor 1 Manufacturer,Processor 1 Model,Processor 1 Serial Number,Processor 1 Number of cores,Processor 1 Speed (GHz),Processor 2,Processor 2 Manufacturer,Processor 2 Model,Processor 2 Serial Number,RamModule 1,RamModule 1 Manufacturer,RamModule 1 Model,RamModule 1 Serial Number,RamModule 1 Size (MB),RamModule 1 Speed (MHz),RamModule 2,RamModule 2 Manufacturer,RamModule 2 Model,RamModule 2 Serial Number,RamModule 3,RamModule 3 Manufacturer,RamModule 3 Model,RamModule 3 Serial Number,RamModule 4,RamModule 4 Manufacturer,RamModule 4 Model,RamModule 4 Serial Number,SoundCard 1,SoundCard 1 Manufacturer,SoundCard 1 Model,SoundCard 1 Serial Number,SoundCard 2,SoundCard 2 Manufacturer,SoundCard 2 Model,SoundCard 2 Serial Number
+Type,Chassis,Tag 1,Tag 2,Tag 3,Serial Number,Model,Manufacturer,Registered in,Price,Processor,RAM (GB),Data Storage Size (MB),Rate,Range,Processor Rate,Processor Range,RAM Rate,RAM Range,Data Storage Rate,Data Storage Range,Battery 1,Battery 1 Manufacturer,Battery 1 Model,Battery 1 Serial Number,Battery 2,Battery 2 Manufacturer,Battery 2 Model,Battery 2 Serial Number,Battery 3,Battery 3 Manufacturer,Battery 3 Model,Battery 3 Serial Number,Battery 4,Battery 4 Manufacturer,Battery 4 Model,Battery 4 Serial Number,DataStorage 1,DataStorage 1 Manufacturer,DataStorage 1 Model,DataStorage 1 Serial Number,DataStorage 2,DataStorage 2 Manufacturer,DataStorage 2 Model,DataStorage 2 Serial Number,DataStorage 3,DataStorage 3 Manufacturer,DataStorage 3 Model,DataStorage 3 Serial Number,DataStorage 4,DataStorage 4 Manufacturer,DataStorage 4 Model,DataStorage 4 Serial Number,Display 1,Display 1 Manufacturer,Display 1 Model,Display 1 Serial Number,GraphicCard 1,GraphicCard 1 Manufacturer,GraphicCard 1 Model,GraphicCard 1 Serial Number,GraphicCard 1 Memory (MB),GraphicCard 2,GraphicCard 2 Manufacturer,GraphicCard 2 Model,GraphicCard 2 Serial Number,Motherboard 1,Motherboard 1 Manufacturer,Motherboard 1 Model,Motherboard 1 Serial Number,NetworkAdapter 1,NetworkAdapter 1 Manufacturer,NetworkAdapter 1 Model,NetworkAdapter 1 Serial Number,NetworkAdapter 2,NetworkAdapter 2 Manufacturer,NetworkAdapter 2 Model,NetworkAdapter 2 Serial Number,Processor 1,Processor 1 Manufacturer,Processor 1 Model,Processor 1 Serial Number,Processor 1 Number of cores,Processor 1 Speed (GHz),Processor 2,Processor 2 Manufacturer,Processor 2 Model,Processor 2 Serial Number,RamModule 1,RamModule 1 Manufacturer,RamModule 1 Model,RamModule 1 Serial Number,RamModule 1 Size (MB),RamModule 1 Speed (MHz),RamModule 2,RamModule 2 Manufacturer,RamModule 2 Model,RamModule 2 Serial Number,RamModule 3,RamModule 3 Manufacturer,RamModule 3 Model,RamModule 3 Serial Number,RamModule 4,RamModule 4 Manufacturer,RamModule 4 Model,RamModule 4 Serial Number,SoundCard 1,SoundCard 1 Manufacturer,SoundCard 1 Model,SoundCard 1 Serial Number,SoundCard 2,SoundCard 2 Manufacturer,SoundCard 2 Model,SoundCard 2 Serial Number
-Laptop,Netbook,,,,b8oaas048286,1001pxd,asustek computer inc.,Tue Mar  5 19:56:08 2019,,intel atom cpu n455 @ 1.66ghz,1024,238475,1.98,Very low,1.31,Very low,1.53,Very low,3.76,Medium,,,,,,,,,,,,,,,,,,,,,"GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None",,,,256,,,,,"Motherboard 10: model 1001pxd, S/N eee0123456789",eee0123456789,eee0123456789,eee0123456789,"NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8",74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,"NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c",14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,"Processor 4: model intel atom cpu n455 @ 1.66ghz, S/N None",,,,1,1.667,,,,,"RamModule 8: model None, S/N None",,,,1024,667,,,,,,,,,,,,,"SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None",,,,"SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001",0x0001,0x0001,0x0001
+Laptop,Netbook,,,,b8oaas048286,1001pxd,asustek computer inc.,Wed Jun 26 11:06:12 2019,,intel atom cpu n455 @ 1.66ghz,1024,238475,1.98,Very low,1.31,Very low,1.53,Very low,3.76,Medium,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None",,,,256,,,,,"Motherboard 10: model 1001pxd, S/N eee0123456789",eee0123456789,eee0123456789,eee0123456789,"NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8",74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,"NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c",14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,"Processor 4: model intel atom cpu n455 @ 1.66ghz, S/N None",,,,1,1.667,,,,,"RamModule 8: model None, S/N None",,,,1024,667,,,,,,,,,,,,,"SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None",,,,"SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001",0x0001,0x0001,0x0001

tests/test_basic.py

@@ -42,4 +42,4 @@ def test_api_docs(client: Client):
         'scheme': 'basic',
         'name': 'Authorization'
     }
-    assert len(docs['definitions']) == 101
+    assert len(docs['definitions']) == 103

tests/test_device.py

@@ -115,7 +115,9 @@ def test_physical_properties():
         'serial': None,
         'firewire': None,
         'manufacturer': 'mr',
-        'bios_date': None
+        'bios_date': None,
+        'ram_max_size': None,
+        'ram_slots': None
     }
     assert pc.physical_properties == {
         'model': 'foo',

tests/test_event.py

@@ -209,13 +209,15 @@ def test_update_parent():
     assert not benchmark.parent
 
 
-@pytest.mark.parametrize('action_model_state', [
+@pytest.mark.parametrize('action_model_state',
-    (models.ToRepair, states.Physical.ToBeRepaired),
+                         (pytest.param(ams, id=ams[0].__class__.__name__)
-    (models.Repair, states.Physical.Repaired),
+                          for ams in [
-    (models.ToPrepare, states.Physical.Preparing),
+                              (models.ToRepair, states.Physical.ToBeRepaired),
-    (models.ReadyToUse, states.Physical.ReadyToBeUsed),
+                              (models.Repair, states.Physical.Repaired),
-    (models.Prepare, states.Physical.Prepared)
+                              (models.ToPrepare, states.Physical.Preparing),
-])
+                              (models.ReadyToUse, states.Physical.ReadyToBeUsed),
+                              (models.Prepare, states.Physical.Prepared)
+                          ]))
 def test_generic_action(action_model_state: Tuple[models.Action, states.Trading],
                         user: UserClient):
     """Tests POSTing all generic actions."""
@@ -266,12 +268,14 @@ def test_reserve_and_cancel(user: UserClient):
     """
 
 
-@pytest.mark.parametrize('action_model_state', [
+@pytest.mark.parametrize('action_model_state',
-    (models.Sell, states.Trading.Sold),
+                         (pytest.param(ams, id=ams[0].__class__.__name__)
-    (models.Donate, states.Trading.Donated),
+                          for ams in [
-    (models.Rent, states.Trading.Renting),
+                              (models.Sell, states.Trading.Sold),
-    (models.DisposeProduct, states.Trading.ProductDisposed)
+                              (models.Donate, states.Trading.Donated),
-])
+                              (models.Rent, states.Trading.Renting),
+                              (models.DisposeProduct, states.Trading.ProductDisposed)
+                          ]))
 def test_trade(action_model_state: Tuple[models.Action, states.Trading], user: UserClient):
     """Tests POSTing all Trade actions."""
     action_model, state = action_model_state

tests/test_workbench.py

@@ -9,7 +9,7 @@ import pytest
 
 from ereuse_devicehub.client import UserClient
 from ereuse_devicehub.resources.action import models as em
-from ereuse_devicehub.resources.action.models import VisualTest, RateComputer
+from ereuse_devicehub.resources.action.models import RateComputer, VisualTest
 from ereuse_devicehub.resources.device.exceptions import NeedsId
 from ereuse_devicehub.resources.device.models import Device
 from ereuse_devicehub.resources.tag.model import Tag
@@ -299,20 +299,21 @@ def test_real_eee_1000h(user: UserClient):
 
 
 SNAPSHOTS_NEED_ID = {
-    'box-xavier.snapshot.json',
+    'core2.snapshot.json',
-    'custom.lshw.snapshot.json',
+    'asus-all-series.snapshot.json',
-    'nox.lshw.snapshot.json',
+    'all-series.snapshot.json',
-    'core2.lshw.snapshot.json',
+    'nox.snapshot.json',
-    'all-series.lshw.snapshot.json',
+    'ecs-computers.snapshot.json',
-    'ecs-2.lshw.snapshot.json',
+    'custom.snapshot.json',
-    'ecs-computers.lshw.snapshot.json',
+    'ecs-2.snapshot.json'
-    'asus-all-series.lshw.snapshot.json'
 }
 """Snapshots that do not generate HID requiring a custom ID."""
 
 
 @pytest.mark.parametrize('file',
-                         pathlib.Path(__file__).parent.joinpath('workbench_files').iterdir())
+                         (pytest.param(f, id=f.name)
+                          for f in pathlib.Path().parent.joinpath('workbench_files').iterdir())
+                         )
 def test_workbench_fixtures(file: pathlib.Path, user: UserClient):
     """Uploads the Snapshot files Workbench tests generate.
 

tests/workbench_files/1000h.snapshot.json

@@ -3,97 +3,122 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Laptop",
     "manufacturer": "ASUSTeK Computer INC.",
     "model": "1000H",
     "serialNumber": "8BOAAQ191999",
-    "actions": [],
+    "chassis": "Netbook",
-    "type": "Laptop",
+    "sku": "90OAM0HB83311735E12DQ",
-    "chassis": "Netbook"
+    "version": null
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Atom CPU N270 @ 1.60GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 1.6,
       "address": 32,
-      "threads": 8
+      "threads": 8,
+      "brand": "Atom",
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "SDRAM"
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": null,
       "model": "TS32GSSD370S",
       "serialNumber": "C304332411",
-      "actions": [],
+      "size": 32017.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 30533,
+      "variant": "4H"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "Mobile 945GSE Express Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Qualcomm Atheros",
       "model": "AR8121/AR8113/AR8114 Gigabit or Fast Ethernet",
       "serialNumber": "00:23:54:8d:be:66",
-      "actions": [],
+      "speed": 100.0,
-      "type": "NetworkAdapter",
+      "variant": "b0",
-      "speed": 100,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Ralink corp.",
       "model": "RT2790 Wireless 802.11n 1T/2R PCIe",
       "serialNumber": "00:15:af:dc:44:eb",
-      "actions": [],
+      "speed": null,
-      "type": "NetworkAdapter",
+      "variant": "00",
       "wireless": true
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "NM10/ICH7 Family High Definition Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Chicony Electronics Co., Ltd.",
       "model": "CNF7129",
-      "serialNumber": "SN0001",
+      "serialNumber": "SN0001"
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Display",
+      "model": "SAMSUNG SyncMaster",
+      "manufacturer": "SAM SAMSUNG",
+      "serialNumber": "H1CRA03915",
+      "resolutionWidth": 1024,
+      "resolutionHeight": 768,
+      "refreshRate": 70,
+      "size": 15.0,
+      "technology": null,
+      "productionDate": "2001-10-28T00:00:00"
+    },
+    {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "ASUSTeK Computer INC.",
       "model": "1000H",
       "serialNumber": "Eee0123456789",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 5,
       "firewire": 0,
       "serial": 0,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2009-10-21T00:00:00",
+      "version": "2204",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/1001pxd.snapshot.json

@@ -0,0 +1,143 @@
+{
+  "type": "Snapshot",
+  "uuid": "00000000-0000-0000-0000-000000000000",
+  "software": "Workbench",
+  "version": "11.0a1",
+  "closed": true,
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
+  "device": {
+    "actions": [],
+    "type": "Laptop",
+    "manufacturer": "ASUSTeK Computer INC.",
+    "model": "1001PXD",
+    "serialNumber": "B8OAAS048286",
+    "chassis": "Netbook",
+    "sku": "1001PXD",
+    "version": null
+  },
+  "components": [
+    {
+      "actions": [],
+      "type": "Processor",
+      "manufacturer": "Intel Corp.",
+      "model": "Intel Atom CPU N455 @ 1.66GHz",
+      "serialNumber": null,
+      "speed": 1.667,
+      "address": 64,
+      "cores": 1,
+      "threads": 2,
+      "brand": "Atom",
+      "generation": null
+    },
+    {
+      "actions": [],
+      "type": "RamModule",
+      "manufacturer": null,
+      "model": null,
+      "serialNumber": null,
+      "format": "DIMM",
+      "size": 1024.0,
+      "interface": "DDR2",
+      "speed": 667.0
+    },
+    {
+      "actions": [],
+      "type": "HardDrive",
+      "manufacturer": "Hitachi",
+      "model": "HTS54322",
+      "serialNumber": "E2024242CV86HJ",
+      "size": 250059.0,
+      "interface": null,
+      "variant": "A60W"
+    },
+    {
+      "actions": [],
+      "type": "GraphicCard",
+      "manufacturer": "Intel Corporation",
+      "model": "Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller",
+      "serialNumber": null,
+      "memory": null
+    },
+    {
+      "actions": [],
+      "type": "NetworkAdapter",
+      "manufacturer": "Qualcomm Atheros",
+      "model": "AR9285 Wireless Network Adapter",
+      "serialNumber": "74:2f:68:8b:fd:c8",
+      "speed": null,
+      "variant": "01",
+      "wireless": true
+    },
+    {
+      "actions": [],
+      "type": "NetworkAdapter",
+      "manufacturer": "Qualcomm Atheros",
+      "model": "AR8152 v2.0 Fast Ethernet",
+      "serialNumber": "14:da:e9:42:f6:7c",
+      "speed": 100.0,
+      "variant": "c1",
+      "wireless": false
+    },
+    {
+      "actions": [],
+      "type": "SoundCard",
+      "manufacturer": "Intel Corporation",
+      "model": "NM10/ICH7 Family High Definition Audio Controller",
+      "serialNumber": null
+    },
+    {
+      "actions": [],
+      "type": "SoundCard",
+      "manufacturer": "Azurewave",
+      "model": "USB 2.0 UVC VGA WebCam",
+      "serialNumber": "0x0001"
+    },
+    {
+      "actions": [],
+      "type": "Display",
+      "model": "InfoVision LCD Monitor",
+      "manufacturer": "IVO InfoVision",
+      "serialNumber": null,
+      "resolutionWidth": 1024,
+      "resolutionHeight": 600,
+      "refreshRate": 60,
+      "size": 10.0,
+      "technology": "LCD",
+      "productionDate": "2010-03-14T00:00:00"
+    },
+    {
+      "actions": [
+        {
+          "type": "MeasureBattery",
+          "severity": "Info",
+          "size": 3801.0,
+          "voltage": 12248.0,
+          "cycleCount": null
+        }
+      ],
+      "type": "Battery",
+      "serialNumber": null,
+      "manufacturer": "ASUS",
+      "model": "1001PXD",
+      "size": 4400,
+      "technology": "LiIon"
+    },
+    {
+      "actions": [],
+      "type": "Motherboard",
+      "manufacturer": "ASUSTeK Computer INC.",
+      "model": "1001PXD",
+      "serialNumber": "Eee0123456789",
+      "usb": 5,
+      "firewire": 0,
+      "serial": 1,
+      "pcmcia": 0,
+      "slots": 0,
+      "biosDate": "2011-04-12T00:00:00",
+      "version": "0703",
+      "ramSlots": 2,
+      "ramMaxSize": 4
+    }
+  ]
+}

tests/workbench_files/415522G.snapshot.json

@@ -3,132 +3,169 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "LENOVO",
     "model": "415522G",
     "serialNumber": "S4T6208",
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": null,
-    "chassis": "Tower"
+    "version": "ThinkStation D20"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Xeon CPU E5520 @ 2.27GHz",
       "serialNumber": null,
-      "actions": [],
+      "speed": 1.596,
-      "type": "Processor",
-      "speed": 1.729,
       "address": 64,
       "cores": 4,
-      "threads": 8
+      "threads": 8,
+      "brand": "Xeon",
+      "generation": 1
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1066.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1066.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1066.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1066.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
+      "manufacturer": null,
+      "model": null,
+      "serialNumber": null,
+      "format": "DIMM",
+      "size": 4096.0,
+      "interface": "DDR3",
+      "speed": 1066.0
+    },
+    {
+      "actions": [],
+      "type": "RamModule",
+      "manufacturer": null,
+      "model": null,
+      "serialNumber": null,
+      "format": "DIMM",
+      "size": 4096.0,
+      "interface": "DDR3",
+      "speed": 1066.0
+    },
+    {
+      "actions": [],
+      "type": "HardDrive",
+      "manufacturer": "Western Digital",
+      "model": "WDC WDS120G1G0A-",
+      "serialNumber": "173586804248",
+      "size": 120034.0,
+      "interface": null,
+      "variant": "1000"
+    },
+    {
+      "actions": [],
+      "type": "HardDrive",
+      "manufacturer": "Seagate",
+      "model": "ST160LM000 HM161",
+      "serialNumber": "S24NJ9CBC00089",
+      "size": 160042.0,
+      "interface": null,
+      "variant": "0001"
+    },
+    {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "NVIDIA Corporation",
       "model": "GT200GL Quadro FX 3800",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
-      "manufacturer": "NVIDIA Corporation",
-      "model": "GF100GL Quadro 4000",
-      "serialNumber": null,
       "actions": [],
-      "type": "GraphicCard",
+      "type": "NetworkAdapter",
-      "memory": null
-    },
-    {
       "manufacturer": "Broadcom Limited",
       "model": "NetXtreme BCM5755 Gigabit Ethernet PCI Express",
       "serialNumber": "00:27:13:53:ec:62",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "02",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Broadcom Limited",
       "model": "NetXtreme BCM5754 Gigabit Ethernet PCI Express",
       "serialNumber": "00:27:13:53:ec:63",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "02",
-      "speed": 1000,
       "wireless": false
     },
     {
-      "manufacturer": "NVIDIA Corporation",
-      "model": "GF100 High Definition Audio Controller",
-      "serialNumber": null,
       "actions": [],
-      "type": "SoundCard"
+      "type": "SoundCard",
-    },
-    {
       "manufacturer": "Intel Corporation",
       "model": "82801JI HD Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "LENOVO",
       "model": "LENOVO",
       "serialNumber": null,
-      "actions": [],
-      "type": "Motherboard",
       "usb": 8,
       "firewire": 1,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2010-02-22T00:00:00",
+      "version": "61KT34AUS",
+      "ramSlots": 12,
+      "ramMaxSize": 384
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/7220w3t.snapshot.json

@@ -3,95 +3,105 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "LENOVO",
     "model": "7220W3T",
     "serialNumber": "S4R6062",
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": null,
-    "chassis": "Tower"
+    "version": "ThinkCentre M58p"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core2 Duo CPU E8400 @ 3.00GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 3.0,
       "address": 64,
       "cores": 2,
-      "threads": 2
+      "threads": 2,
+      "brand": "Core2 Duo",
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR2",
       "speed": 1067.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR2",
       "speed": 1067.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Seagate",
       "model": "ST3250318AS",
       "serialNumber": "6VY54ZKX",
-      "actions": [],
+      "size": 250059.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 238475,
+      "variant": "CC66"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "4 Series Chipset Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "82567LM-3 Gigabit Network Connection",
       "serialNumber": "00:24:7e:02:19:d7",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "02",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "82801JD/DO HD Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "LENOVO",
       "model": "LENOVO",
       "serialNumber": null,
-      "actions": [],
-      "type": "Motherboard",
       "usb": 8,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2010-02-01T00:00:00",
+      "version": "5CKT61AUS",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/7900.snapshot.json

@@ -3,93 +3,114 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "Hewlett-Packard",
     "model": "HP Compaq dc7900 Small Form Factor",
     "serialNumber": "CZC901381R",
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": "KP721AV",
-    "chassis": "Tower"
+    "version": null
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core2 Duo CPU E8400 @ 3.00GHz",
       "serialNumber": null,
-      "actions": [],
+      "speed": 1.9980000000000002,
-      "type": "Processor",
-      "speed": 3.0,
       "address": 64,
       "cores": 2,
-      "threads": 2
+      "threads": 2,
+      "brand": "Core2 Duo",
+      "generation": null
     },
     {
-      "manufacturer": "JEDEC ID:AD 00 00 00 00 00 00 00",
-      "model": "HYMP125U64CP8-S6",
-      "serialNumber": "01200000",
       "actions": [],
       "type": "RamModule",
+      "manufacturer": null,
+      "model": "HYMP125U64CP8-S6",
+      "serialNumber": null,
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR2",
       "speed": 800.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Seagate",
       "model": "ST3160815AS",
       "serialNumber": "6RX7AWEZ",
-      "actions": [],
+      "size": 160042.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 152627,
+      "variant": "H"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "HardDrive",
+      "manufacturer": "Western Digital",
+      "model": "WDC WD3200AAJS-0",
+      "serialNumber": "WD-WCARW0244414",
+      "size": 320073.0,
+      "interface": null,
+      "variant": "1B02"
+    },
+    {
+      "actions": [],
+      "type": "HardDrive",
+      "manufacturer": "Western Digital",
+      "model": "WDC WD5000AAKX-6",
+      "serialNumber": "WD-WCC2ETY84203",
+      "size": 500108.0,
+      "interface": null,
+      "variant": "1H18"
+    },
+    {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "4 Series Chipset Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "82567LM-3 Gigabit Network Connection",
       "serialNumber": "00:23:7d:49:5e:31",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "02",
-      "speed": 1000,
       "wireless": false
     },
     {
-      "manufacturer": "Realtek Semiconductor Co., Ltd.",
-      "model": "RTL8169 PCI Gigabit Ethernet Controller",
-      "serialNumber": "00:b0:c2:02:ab:b7",
       "actions": [],
-      "type": "NetworkAdapter",
+      "type": "SoundCard",
-      "speed": 1000,
-      "wireless": false
-    },
-    {
       "manufacturer": "Intel Corporation",
       "model": "82801JD/DO HD Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Hewlett-Packard",
       "model": "3031h",
       "serialNumber": "CZC901381R",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 8,
       "firewire": 0,
       "serial": 0,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2008-08-25T00:00:00",
+      "version": "786G1 v01.08",
+      "ramSlots": 1,
+      "ramMaxSize": 4
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/8100.snapshot.json

@@ -3,117 +3,127 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "Hewlett-Packard",
     "model": "HP Compaq 8100 Elite SFF",
     "serialNumber": "CZC0408YPV",
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": "AY032AV",
-    "chassis": "Tower"
+    "version": null
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i3 CPU 530 @ 2.93GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 2.9330000000000003,
       "address": 64,
       "cores": 2,
-      "threads": 4
+      "threads": 4,
+      "brand": "Core i3",
+      "generation": 1
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "JEDEC ID:80 2C",
       "model": "16JTF25664AZ-1G4F",
       "serialNumber": "92072F30",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR3",
       "speed": 1333.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "JEDEC ID:80 2C",
       "model": "16JTF25664AZ-1G4F",
       "serialNumber": "A4482E29",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR3",
       "speed": 1333.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "JEDEC ID:80 2C",
       "model": "16JTF25664AZ-1G4F",
       "serialNumber": "939E2E29",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR3",
       "speed": 1333.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "JEDEC ID:80 2C",
       "model": "16JTF25664AZ-1G4F",
       "serialNumber": "48FD2E30",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR3",
       "speed": 1333.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Western Digital",
       "model": "WDC WD3200AAJS-6",
       "serialNumber": "WD-WCAV2U856544",
-      "actions": [],
+      "size": 320073.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 305245,
+      "variant": "3E03"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "Core Processor Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "82578DM Gigabit Network Connection",
       "serialNumber": "6c:62:6d:81:4d:ae",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "05",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "5 Series/3400 Series Chipset High Definition Audio",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Hewlett-Packard",
       "model": "304Ah",
       "serialNumber": "CZC0408YPV",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 2,
       "firewire": 0,
       "serial": 0,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2010-06-09T00:00:00",
+      "version": "786H1 v01.05",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/TM1613.snapshot.json

@@ -3,88 +3,111 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Laptop",
     "manufacturer": "Timi",
     "model": "TM1613",
     "serialNumber": "13138/00064437",
-    "actions": [],
+    "chassis": "Netbook",
-    "type": "Laptop",
+    "sku": null,
-    "chassis": "Netbook"
+    "version": "A05"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i5-6200U CPU @ 2.30GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 2.684156,
       "address": 64,
       "cores": 2,
-      "threads": 4
+      "threads": 4,
+      "brand": "Core i5",
+      "generation": 6
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Samsung",
       "model": "M471A1K43BB0-CPB",
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "SODIMM",
-      "size": 8192,
+      "size": 8192.0,
       "speed": 2133.0
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "Sky Lake Integrated Graphics",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "NVIDIA Corporation",
       "model": "NVIDIA Corporation",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "Wireless 8260",
       "serialNumber": "a0:c5:89:41:a8:a7",
-      "actions": [],
+      "speed": null,
-      "type": "NetworkAdapter",
+      "variant": "3a",
       "wireless": true
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "SunplusIT Inc",
       "model": "XiaoMi USB 2.0 Webcam",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "Intel Corporation",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Display",
+      "model": "SAMSUNG SyncMaster",
+      "manufacturer": "SAM SAMSUNG",
+      "serialNumber": "H1CRA03915",
+      "resolutionWidth": 1024,
+      "resolutionHeight": 768,
+      "refreshRate": 70,
+      "size": 15.0,
+      "technology": null,
+      "productionDate": "2001-10-28T00:00:00"
+    },
+    {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Timi",
       "model": "TM1613",
       "serialNumber": "MMG5S000000226B1P02YK",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 1,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2016-08-11T00:00:00",
+      "version": "A05",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/acer-aspire-5737z.snapshot.json

@@ -3,88 +3,113 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Laptop",
     "manufacturer": "Acer",
     "model": "Aspire 5737Z",
     "serialNumber": "LXAZ70X0669112B8DB1601",
-    "actions": [],
+    "chassis": "Netbook",
-    "type": "Laptop",
+    "sku": null,
-    "chassis": "Netbook"
+    "version": "V1.06"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core2 Duo CPU T6400 @ 2.00GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 2.0,
       "address": 64,
       "cores": 2,
-      "threads": 2
+      "threads": 2,
+      "brand": "Core2 Duo",
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Western Digital",
       "model": "WDC WD5000BEVT-2",
       "serialNumber": "WD-WXN209S36759",
-      "actions": [],
+      "size": 500108.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 476940,
+      "variant": "1A01"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "NVIDIA Corporation",
       "model": "C79 GeForce 9400M G",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Broadcom Inc. and subsidiaries",
       "model": "NetXtreme BCM5764M Gigabit Ethernet PCIe",
       "serialNumber": "00:23:5a:5f:6b:8d",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "10",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Qualcomm Atheros",
       "model": "AR928X Wireless Network Adapter",
       "serialNumber": "00:24:2b:d3:dd:19",
-      "actions": [],
+      "speed": null,
-      "type": "NetworkAdapter",
+      "variant": "01",
       "wireless": true
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Chicony Electronics Co., Ltd.",
       "model": "CNF7017",
-      "serialNumber": "SN0001",
+      "serialNumber": "SN0001"
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "NVIDIA Corporation",
       "model": "MCP79 High Definition Audio",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Display",
+      "model": "SAMSUNG SyncMaster",
+      "manufacturer": "SAM SAMSUNG",
+      "serialNumber": "H1CRA03915",
+      "resolutionWidth": 1024,
+      "resolutionHeight": 768,
+      "refreshRate": 70,
+      "size": 15.0,
+      "technology": null,
+      "productionDate": "2001-10-28T00:00:00"
+    },
+    {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "Motherboard",
       "usb": 4,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2009-02-23T00:00:00",
+      "version": "V1.06",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/all-series.snapshot.json

@@ -3,84 +3,94 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "ASUS",
     "model": "All Series",
     "serialNumber": null,
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": "All",
-    "chassis": "Tower"
+    "version": "System Version"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i5-4440 CPU @ 3.10GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 3.299993,
       "address": 64,
       "cores": 4,
-      "threads": 4
+      "threads": 4,
+      "brand": "Core i5",
+      "generation": 4
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Kingston",
       "model": "99U5584-003.A00LF",
       "serialNumber": "290E5155",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 4096,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1600.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Western Digital",
       "model": "WDC WD5000AAKX-0",
       "serialNumber": "WD-WMC2E8912230",
-      "actions": [],
+      "size": 500108.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 476940,
+      "variant": "1H19"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Realtek Semiconductor Co., Ltd.",
       "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
       "serialNumber": "40:16:7e:64:11:7f",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "0c",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "8 Series/C220 Series Chipset High Definition Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "ASUSTeK COMPUTER INC.",
       "model": "H81M-K",
       "serialNumber": "140322933901299",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 3,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2014-05-13T00:00:00",
+      "version": "0804",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/asus-all-series.snapshot.json

@@ -3,84 +3,94 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "ASUS",
     "model": "All Series",
     "serialNumber": null,
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": "All",
-    "chassis": "Tower"
+    "version": "System Version"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i5-4440 CPU @ 3.10GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 1.4710990000000002,
       "address": 64,
       "cores": 4,
-      "threads": 4
+      "threads": 4,
+      "brand": "Core i5",
+      "generation": 4
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Kingston",
       "model": "9905584-017.A00LF",
       "serialNumber": "9D341297",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 4096,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1600.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Western Digital",
       "model": "WDC WD5000AAKX-0",
       "serialNumber": "WD-WCC2EVE36697",
-      "actions": [],
+      "size": 500108.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 476940,
+      "variant": "1H19"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Realtek Semiconductor Co., Ltd.",
       "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
       "serialNumber": "e0:3f:49:1a:cf:8d",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "0c",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "8 Series/C220 Series Chipset High Definition Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "ASUSTeK COMPUTER INC.",
       "model": "H81M-K",
       "serialNumber": "131219772601126",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 3,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2014-01-02T00:00:00",
+      "version": "0703",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/boxnuc6cayh.snapshot.json

@@ -3,92 +3,104 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
-    "manufacturer": null,
-    "model": null,
-    "serialNumber": null,
     "actions": [],
     "type": "Desktop",
-    "chassis": "Tower"
+    "manufacturer": "Intel Corporation",
+    "model": "NUC6CAYH",
+    "serialNumber": "G6AY80800F4D",
+    "chassis": "Tower",
+    "sku": null,
+    "version": "J26843-405"
   },
   "components": [
     {
-      "manufacturer": "Intel Corp.",
-      "model": "Intel Celeron CPU N3050 @ 1.60GHz",
-      "serialNumber": null,
       "actions": [],
       "type": "Processor",
-      "speed": 0.47998,
+      "manufacturer": "Intel Corp.",
+      "model": "Intel Celeron CPU J3455 @ 1.50GHz",
+      "serialNumber": null,
+      "speed": 2.191406,
       "address": 64,
-      "cores": 2,
+      "cores": 4,
-      "threads": 2
+      "threads": 4,
+      "brand": "Celeron",
+      "generation": null
     },
     {
-      "manufacturer": "Kingston",
-      "model": "99U5469-044.A00LF",
-      "serialNumber": "17220285",
       "actions": [],
       "type": "RamModule",
+      "manufacturer": "Kingston",
+      "model": "99U5469-070.A00LF",
+      "serialNumber": "181AFB16",
       "format": "SODIMM",
-      "size": 4096,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1600.0
     },
     {
-      "manufacturer": "Toshiba",
-      "model": "THNSNS12",
-      "serialNumber": "Y2IS101GT4BY",
       "actions": [],
       "type": "HardDrive",
-      "size": 122104,
+      "manufacturer": null,
-      "interface": null
+      "model": "KINGSTON SA400S3",
+      "serialNumber": "50026B77821CF9DE",
+      "size": 120034.0,
+      "interface": null,
+      "variant": "71E0"
     },
     {
-      "manufacturer": "Intel Corporation",
-      "model": "Atom/Celeron/Pentium Processor x5-E8000/J3xxx/N3xxx Integrated Graphics Controller",
-      "serialNumber": null,
       "actions": [],
       "type": "GraphicCard",
+      "manufacturer": "Intel Corporation",
+      "model": "Intel Corporation",
+      "serialNumber": null,
       "memory": null
     },
     {
-      "manufacturer": "Intel Corporation",
-      "model": "Wireless 3165",
-      "serialNumber": "34:02:86:5b:47:b2",
       "actions": [],
       "type": "NetworkAdapter",
+      "manufacturer": "Intel Corporation",
+      "model": "Dual Band Wireless-AC 3168NGW Stone Peak",
+      "serialNumber": "b8:08:cf:aa:11:f3",
+      "speed": null,
+      "variant": "10",
       "wireless": true
     },
     {
-      "manufacturer": "Realtek Semiconductor Co., Ltd.",
-      "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
-      "serialNumber": "b8:ae:ed:76:91:83",
       "actions": [],
       "type": "NetworkAdapter",
-      "speed": 1000,
+      "manufacturer": "Realtek Semiconductor Co., Ltd.",
+      "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
+      "serialNumber": "94:c6:91:1b:7e:93",
+      "speed": 1000.0,
+      "variant": "15",
       "wireless": false
     },
     {
-      "manufacturer": "Intel Corporation",
-      "model": "Atom/Celeron/Pentium Processor x5-E8000/J3xxx/N3xxx Series High Definition Audio Controller",
-      "serialNumber": null,
       "actions": [],
-      "type": "SoundCard"
+      "type": "SoundCard",
+      "manufacturer": "Intel Corporation",
+      "model": "Celeron N3350/Pentium N4200/Atom E3900 Series Audio Cluster",
+      "serialNumber": null
     },
     {
-      "manufacturer": "Intel Corporation",
-      "model": "NUC5CPYB",
-      "serialNumber": "GEPY523011FH",
       "actions": [],
       "type": "Motherboard",
+      "manufacturer": "Intel Corporation",
+      "model": "NUC6CAYB",
+      "serialNumber": "GEAY80600ECM",
       "usb": 1,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2017-11-23T00:00:00",
+      "version": "AYAPLCEL.86A.0043.2017.1123.1559",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/core2.snapshot.json

@@ -3,83 +3,93 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": null,
     "model": null,
     "serialNumber": null,
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": null,
-    "chassis": "Tower"
+    "version": "System Version"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core2 CPU 6600 @ 2.40GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 2.394,
       "address": 64,
-      "threads": 8
+      "threads": 8,
+      "brand": null,
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 1024,
+      "size": 1024.0,
       "interface": "SDRAM",
       "speed": 667.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": null,
       "model": "SAMSUNG HD250HJ",
       "serialNumber": "S0URJDQP811025",
-      "actions": [],
+      "size": 250059.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 238475,
+      "variant": "0-05"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "82G965 Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Realtek Semiconductor Co., Ltd.",
       "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
       "serialNumber": "00:1b:fc:30:75:09",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "01",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "82801H HD Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "ASUSTeK Computer INC.",
       "model": "P5B-VM",
       "serialNumber": "MB-1234567890",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 7,
       "firewire": 1,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2007-01-18T00:00:00",
+      "version": "0613",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/custom.snapshot.json

@@ -3,84 +3,94 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "ASUS",
     "model": "All Series",
     "serialNumber": null,
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": "All",
-    "chassis": "Tower"
+    "version": "System Version"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i5-4440 CPU @ 3.10GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 3.1001890000000003,
       "address": 64,
       "cores": 4,
-      "threads": 4
+      "threads": 4,
+      "brand": "Core i5",
+      "generation": 4
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Kingston",
       "model": "9905584-017.A00LF",
       "serialNumber": "9D341297",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 4096,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1600.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Western Digital",
       "model": "WDC WD5000AAKX-0",
       "serialNumber": "WD-WCC2EVE36697",
-      "actions": [],
+      "size": 500108.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 476940,
+      "variant": "1H19"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Realtek Semiconductor Co., Ltd.",
       "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
       "serialNumber": "e0:3f:49:1a:cf:8d",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "0c",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "8 Series/C220 Series Chipset High Definition Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "ASUSTeK COMPUTER INC.",
       "model": "H81M-K",
       "serialNumber": "131219772601126",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 3,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2014-01-02T00:00:00",
+      "version": "0703",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/david.snapshot.json

@@ -0,0 +1,154 @@
+{
+  "type": "Snapshot",
+  "uuid": "00000000-0000-0000-0000-000000000000",
+  "software": "Workbench",
+  "version": "11.0a1",
+  "closed": true,
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
+  "device": {
+    "actions": [],
+    "type": "Laptop",
+    "manufacturer": "Dell Inc.",
+    "model": "Latitude E6440",
+    "serialNumber": "FJBQVZ1",
+    "chassis": "Laptop",
+    "sku": "Latitude E6440",
+    "version": "01"
+  },
+  "components": [
+    {
+      "actions": [],
+      "type": "Processor",
+      "manufacturer": "Intel Corp.",
+      "model": "Intel Core i7-4600M CPU @ 2.90GHz",
+      "serialNumber": null,
+      "speed": 1.259899,
+      "address": 64,
+      "cores": 2,
+      "threads": 4,
+      "brand": "Core i7",
+      "generation": 4
+    },
+    {
+      "actions": [],
+      "type": "RamModule",
+      "manufacturer": "Samsung",
+      "model": "M471B5173DB0-YK0",
+      "serialNumber": "732CD498",
+      "format": "SODIMM",
+      "size": 4096.0,
+      "interface": "DDR3",
+      "speed": 1600.0
+    },
+    {
+      "actions": [],
+      "type": "RamModule",
+      "manufacturer": "Samsung",
+      "model": "M471B5173DB0-YK0",
+      "serialNumber": "152DD498",
+      "format": "SODIMM",
+      "size": 4096.0,
+      "interface": "DDR3",
+      "speed": 1600.0
+    },
+    {
+      "actions": [],
+      "type": "HardDrive",
+      "manufacturer": null,
+      "model": "Crucial_CT525MX3",
+      "serialNumber": "164014297BCC",
+      "size": 525113.0,
+      "interface": null,
+      "variant": "R031"
+    },
+    {
+      "actions": [],
+      "type": "GraphicCard",
+      "manufacturer": "Intel Corporation",
+      "model": "4th Gen Core Processor Integrated Graphics Controller",
+      "serialNumber": null,
+      "memory": null
+    },
+    {
+      "actions": [],
+      "type": "NetworkAdapter",
+      "manufacturer": "Intel Corporation",
+      "model": "Ethernet Connection I217-LM",
+      "serialNumber": "ec:f4:bb:0b:18:90",
+      "speed": 1000.0,
+      "variant": "04",
+      "wireless": false
+    },
+    {
+      "actions": [],
+      "type": "NetworkAdapter",
+      "manufacturer": "Intel Corporation",
+      "model": "Centrino Advanced-N 6235",
+      "serialNumber": "c4:d9:87:47:90:e1",
+      "speed": null,
+      "variant": "24",
+      "wireless": true
+    },
+    {
+      "actions": [],
+      "type": "NetworkAdapter",
+      "manufacturer": null,
+      "model": null,
+      "serialNumber": "da:b4:3a:25:88:6c",
+      "speed": null,
+      "variant": null,
+      "wireless": false
+    },
+    {
+      "actions": [],
+      "type": "SoundCard",
+      "manufacturer": "Intel Corporation",
+      "model": "Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller",
+      "serialNumber": null
+    },
+    {
+      "actions": [],
+      "type": "SoundCard",
+      "manufacturer": "CNFCH52J48303+YF2",
+      "model": "Laptop_Integrated_Webcam_HD",
+      "serialNumber": null
+    },
+    {
+      "actions": [],
+      "type": "SoundCard",
+      "manufacturer": "Intel Corporation",
+      "model": "8 Series/C220 Series Chipset High Definition Audio Controller",
+      "serialNumber": null
+    },
+    {
+      "actions": [],
+      "type": "Display",
+      "model": "SAMSUNG SyncMaster",
+      "manufacturer": "SAM SAMSUNG",
+      "serialNumber": "H1CRA03915",
+      "resolutionWidth": 1024,
+      "resolutionHeight": 768,
+      "refreshRate": 70,
+      "size": 15.0,
+      "technology": null,
+      "productionDate": "2001-10-28T00:00:00"
+    },
+    {
+      "actions": [],
+      "type": "Motherboard",
+      "manufacturer": "Dell Inc.",
+      "model": "0159N7",
+      "serialNumber": "/FJBQVZ1/CN1296342I009B/",
+      "usb": 3,
+      "firewire": 0,
+      "serial": 1,
+      "pcmcia": 0,
+      "slots": 0,
+      "biosDate": "2013-09-03T00:00:00",
+      "version": "A02",
+      "ramSlots": null,
+      "ramMaxSize": null
+    }
+  ]
+}

tests/workbench_files/e5530.snapshot.json

@@ -3,110 +3,152 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Laptop",
     "manufacturer": "Dell Inc.",
     "model": "Latitude E5530 non-vPro",
     "serialNumber": "D8FTRY1",
-    "actions": [],
+    "chassis": "Laptop",
-    "type": "Laptop",
+    "sku": "Latitude E5530 non-vPro",
-    "chassis": "Laptop"
+    "version": "01"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i5-3340M CPU @ 2.70GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 1.204321,
       "address": 64,
       "cores": 2,
-      "threads": 4
+      "threads": 4,
+      "brand": "Core i5",
+      "generation": 3
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Micron",
       "model": "8KTF51264HZ-1G6E1",
       "serialNumber": "E88F671D",
-      "actions": [],
-      "type": "RamModule",
       "format": "SODIMM",
-      "size": 4096,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1600.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Micron",
       "model": "8KTF51264HZ-1G6E1",
       "serialNumber": "E88F671E",
-      "actions": [],
-      "type": "RamModule",
       "format": "SODIMM",
-      "size": 4096,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1600.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": null,
       "model": "HGST HTS725050A7",
       "serialNumber": "TF755AWHKL0LHM",
-      "actions": [],
+      "size": 500108.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 476940,
+      "variant": "A560"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "3rd Gen Core processor Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Broadcom Limited",
       "model": "BCM43228 802.11a/b/g/n",
       "serialNumber": null,
-      "actions": [],
+      "speed": null,
-      "type": "NetworkAdapter",
+      "variant": "00",
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Broadcom Limited",
       "model": "NetXtreme BCM5761 Gigabit Ethernet PCIe",
       "serialNumber": "f0:1f:af:41:3f:18",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "10",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "CN0Y4TWT7248737FA56RA01",
       "model": "Laptop_Integrated_Webcam_E4HD",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "7 Series/C216 Chipset Family High Definition Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Display",
+      "model": "DC9YJ 156WFC LCD Monitor",
+      "manufacturer": "LGD DC9YJ 156WFC",
+      "serialNumber": null,
+      "resolutionWidth": 1920,
+      "resolutionHeight": 1080,
+      "refreshRate": 60,
+      "size": 16.0,
+      "technology": "LCD",
+      "productionDate": "2011-01-02T00:00:00"
+    },
+    {
+      "actions": [
+        {
+          "type": "MeasureBattery",
+          "severity": "Info",
+          "size": 1997.0,
+          "voltage": 10914.0,
+          "cycleCount": null
+        }
+      ],
+      "type": "Battery",
+      "serialNumber": "19075",
+      "manufacturer": "LGC-LGC2.8",
+      "model": "DELL HMYXT37",
+      "size": 5600,
+      "technology": "LiIon"
+    },
+    {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Dell Inc.",
       "model": "0VP63H",
       "serialNumber": "/D8FTRY1/CN1296139I001F/",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 3,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2013-08-07T00:00:00",
+      "version": "A12",
+      "ramSlots": 2,
+      "ramMaxSize": 16
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/ecs-2.snapshot.json

@@ -3,105 +3,115 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": null,
     "model": null,
     "serialNumber": null,
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": null,
-    "chassis": "Tower"
+    "version": "System Version"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core2 CPU 6600 @ 2.40GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 2.394,
       "address": 64,
-      "threads": 8
+      "threads": 8,
+      "brand": null,
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 1024,
+      "size": 1024.0,
       "interface": "SDRAM",
       "speed": 533.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 1024,
+      "size": 1024.0,
       "interface": "SDRAM",
       "speed": 533.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 1024,
+      "size": 1024.0,
       "interface": "SDRAM",
       "speed": 533.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": null,
       "model": "SAMSUNG HD250HJ",
       "serialNumber": "S0URJDQP811025",
-      "actions": [],
+      "size": 250059.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 238475,
+      "variant": "0-05"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "82G965 Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Realtek Semiconductor Co., Ltd.",
       "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
       "serialNumber": "00:1b:fc:30:75:09",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "01",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "82801H HD Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "ASUSTeK Computer INC.",
       "model": "P5B-VM",
       "serialNumber": "MB-1234567890",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 7,
       "firewire": 1,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2007-01-18T00:00:00",
+      "version": "0613",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/ecs-computers.snapshot.json

@@ -3,84 +3,94 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "ASUS",
     "model": "All Series",
     "serialNumber": null,
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": "All",
-    "chassis": "Tower"
+    "version": "System Version"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i5-4440 CPU @ 3.10GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 2.200311,
       "address": 64,
       "cores": 4,
-      "threads": 4
+      "threads": 4,
+      "brand": "Core i5",
+      "generation": 4
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Kingston",
       "model": "99U5584-003.A00LF",
       "serialNumber": "8618F309",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 4096,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1600.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Western Digital",
       "model": "WDC WD5000AAKX-6",
       "serialNumber": "WD-WCC2ETY84203",
-      "actions": [],
+      "size": 500108.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 476940,
+      "variant": "1H18"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Realtek Semiconductor Co., Ltd.",
       "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
       "serialNumber": "e0:3f:49:1a:d0:44",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "0c",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "8 Series/C220 Series Chipset High Definition Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "ASUSTeK COMPUTER INC.",
       "model": "H81M-K",
       "serialNumber": "131219772601195",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 3,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2014-01-02T00:00:00",
+      "version": "0703",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/hp-pavilion-dv4000.snapshot.json

@@ -3,100 +3,125 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Laptop",
     "manufacturer": "Hewlett-Packard",
     "model": "Pavilion dv4000",
     "serialNumber": "2CE5270ZWC",
-    "actions": [],
+    "chassis": "Netbook",
-    "type": "Laptop",
+    "sku": null,
-    "chassis": "Netbook"
+    "version": null
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Pentium M processor 1.60GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 1.6,
       "address": 32,
-      "threads": 8
+      "threads": 8,
+      "brand": "Pentium",
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 512,
+      "size": 512.0,
       "interface": "DDR"
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 512,
+      "size": 512.0,
       "interface": "DDR"
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Fujitsu",
       "model": "MHT2080A",
       "serialNumber": "NN4FT561BDC2",
-      "actions": [],
+      "size": 80026.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 76319,
+      "variant": "0022"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "Mobile 915GM/GMS/910GML Express Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "PRO/Wireless 2200BG Calexico2 Network Connection",
       "serialNumber": "00:12:f0:c7:68:51",
-      "actions": [],
+      "speed": null,
-      "type": "NetworkAdapter",
+      "variant": "05",
       "wireless": true
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Realtek Semiconductor Co., Ltd.",
       "model": "RTL-8100/8101L/8139 PCI Fast Ethernet Adapter",
       "serialNumber": "00:0a:e4:d4:71:82",
-      "actions": [],
+      "speed": 100.0,
-      "type": "NetworkAdapter",
+      "variant": "10",
-      "speed": 100,
       "wireless": false
     },
     {
-      "manufacturer": "Intel Corporation",
-      "model": "82801FB/FBM/FR/FW/FRW AC'97 Audio Controller",
-      "serialNumber": null,
       "actions": [],
-      "type": "SoundCard"
+      "type": "SoundCard",
+      "manufacturer": "Intel Corporation",
+      "model": "82801FB/FBM/FR/FW/FRW AC97 Audio Controller",
+      "serialNumber": null
     },
     {
+      "actions": [],
+      "type": "Display",
+      "model": "SAMSUNG SyncMaster",
+      "manufacturer": "SAM SAMSUNG",
+      "serialNumber": "H1CRA03915",
+      "resolutionWidth": 1024,
+      "resolutionHeight": 768,
+      "refreshRate": 70,
+      "size": 15.0,
+      "technology": null,
+      "productionDate": "2001-10-28T00:00:00"
+    },
+    {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Hewlett-Packard",
       "model": "09BC",
       "serialNumber": null,
-      "actions": [],
-      "type": "Motherboard",
       "usb": 5,
       "firewire": 1,
       "serial": 1,
       "pcmcia": 1,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2005-06-02T00:00:00",
+      "version": "F.13",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/lenovo-as-intel.snapshot.json

@@ -3,95 +3,105 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "LENOVO",
     "model": "7220W3T",
     "serialNumber": "S4R6460",
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": null,
-    "chassis": "Tower"
+    "version": "ThinkCentre M58p"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core2 Duo CPU E8400 @ 3.00GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 3.0,
       "address": 64,
       "cores": 2,
-      "threads": 2
+      "threads": 2,
+      "brand": "Core2 Duo",
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR2",
       "speed": 1067.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR2",
       "speed": 1067.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": null,
       "model": "SAMSUNG HD251HJ",
       "serialNumber": "S1L6J9BZ103714",
-      "actions": [],
+      "size": 250059.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 238475,
+      "variant": "1116"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "4 Series Chipset Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "82567LM-3 Gigabit Network Connection",
       "serialNumber": "00:24:7e:02:15:1a",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "02",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "82801JD/DO HD Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "LENOVO",
       "model": "LENOVO",
       "serialNumber": null,
-      "actions": [],
-      "type": "Motherboard",
       "usb": 8,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2010-02-01T00:00:00",
+      "version": "5CKT61AUS",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/lenovo-thinkcentre-edge.snapshot.json

@@ -3,84 +3,94 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "LENOVO",
     "model": "3493BAG",
     "serialNumber": "PB357N0",
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": "LENOVO_MT_3493",
-    "chassis": "Tower"
+    "version": "ThinkCentre Edge72"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Pentium CPU G645 @ 2.90GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 1.674792,
       "address": 64,
       "cores": 2,
-      "threads": 2
+      "threads": 2,
+      "brand": "Pentium",
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Micron",
       "model": "16JTF25664AZ-1G4F1",
       "serialNumber": "292E48DA",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR3",
       "speed": 1333.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Seagate",
       "model": "ST250DM000-1BD14",
       "serialNumber": "Z2AYPLNP",
-      "actions": [],
+      "size": 250059.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 238475,
+      "variant": "KC45"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "2nd Generation Core Processor Family Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Realtek Semiconductor Co., Ltd.",
       "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
       "serialNumber": "d4:3d:7e:41:c4:c4",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "06",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "6 Series/C200 Series Chipset Family High Definition Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "LENOVO",
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "Motherboard",
       "usb": 2,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2012-10-12T00:00:00",
+      "version": "F1KT39AUS",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/lenovo.snapshot.json

@@ -1,97 +0,0 @@
-{
-  "type": "Snapshot",
-  "uuid": "00000000-0000-0000-0000-000000000000",
-  "software": "Workbench",
-  "version": "11.0a1",
-  "closed": false,
-  "endTime": "2000-01-01 00:00:00+00:00",
-  "device": {
-    "manufacturer": "LENOVO",
-    "model": "7220W3T",
-    "serialNumber": "S4WV119",
-    "actions": [],
-    "type": "Desktop",
-    "chassis": "Tower"
-  },
-  "components": [
-    {
-      "manufacturer": "Intel Corp.",
-      "model": "Intel Core2 Duo CPU E8400 @ 3.00GHz",
-      "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
-      "speed": 3.0,
-      "address": 64,
-      "cores": 2,
-      "threads": 2
-    },
-    {
-      "manufacturer": null,
-      "model": null,
-      "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
-      "format": "DIMM",
-      "size": 2048,
-      "interface": "DDR2",
-      "speed": 1067.0
-    },
-    {
-      "manufacturer": null,
-      "model": null,
-      "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
-      "format": "DIMM",
-      "size": 2048,
-      "interface": "DDR2",
-      "speed": 1067.0
-    },
-    {
-      "manufacturer": "Seagate",
-      "model": "ST3250318AS",
-      "serialNumber": "6VY52H7X",
-      "actions": [],
-      "type": "HardDrive",
-      "size": 238475,
-      "interface": null
-    },
-    {
-      "manufacturer": "Intel Corporation",
-      "model": "4 Series Chipset Integrated Graphics Controller",
-      "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
-      "memory": null
-    },
-    {
-      "manufacturer": "Intel Corporation",
-      "model": "82567LM-3 Gigabit Network Connection",
-      "serialNumber": "1c:6f:65:03:fd:c4",
-      "actions": [],
-      "type": "NetworkAdapter",
-      "speed": 1000,
-      "wireless": false
-    },
-    {
-      "manufacturer": "Intel Corporation",
-      "model": "82801JD/DO HD Audio Controller",
-      "serialNumber": null,
-      "actions": [],
-      "type": "SoundCard"
-    },
-    {
-      "manufacturer": "LENOVO",
-      "model": "LENOVO",
-      "serialNumber": null,
-      "actions": [],
-      "type": "Motherboard",
-      "usb": 8,
-      "firewire": 0,
-      "serial": 1,
-      "pcmcia": 0,
-      "slots": 1
-    }
-  ],
-  "elapsed": 0
-}

tests/workbench_files/nec.snapshot.json

@@ -3,95 +3,105 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "NEC Computers SAS",
     "model": "Powermate MLxxx",
     "serialNumber": "SN 123456789ABC",
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": null,
-    "chassis": "Tower"
+    "version": null
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core2 Duo CPU E8400 @ 3.00GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 3.0,
       "address": 64,
       "cores": 2,
-      "threads": 2
+      "threads": 2,
+      "brand": "Core2 Duo",
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Samsung",
       "model": "M3 78T2863QZS-CE6",
       "serialNumber": "253C8F0C",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 1024,
+      "size": 1024.0,
       "interface": "DDR2",
       "speed": 667.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Samsung",
       "model": "M3 78T2863QZS-CE6",
       "serialNumber": "253C8DE7",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 1024,
+      "size": 1024.0,
       "interface": "DDR2",
       "speed": 667.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Hitachi",
       "model": "HDT72103",
       "serialNumber": "STA2L7MV39LL6D",
-      "actions": [],
+      "size": 320073.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 305245,
+      "variant": "A3CC"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "82Q35 Express Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "82566DM-2 Gigabit Network Connection",
       "serialNumber": "00:24:21:7a:90:02",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "02",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "82801I HD Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Micro-Star International Co Ltd",
       "model": "MS-7377",
       "serialNumber": "9516777584",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 8,
       "firewire": 1,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2008-07-02T00:00:00",
+      "version": "V00L",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/nox.snapshot.json

@@ -3,84 +3,94 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": null,
     "model": null,
     "serialNumber": null,
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": null,
-    "chassis": "Tower"
+    "version": "System Version"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i3-2100 CPU @ 3.10GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 1.6862300000000001,
       "address": 64,
       "cores": 2,
-      "threads": 2
+      "threads": 2,
+      "brand": "Core i3",
+      "generation": 2
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Kingston",
       "model": "9905403-038.A00LF",
       "serialNumber": "8F17943",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 4096,
+      "size": 4096.0,
       "interface": "DDR3",
       "speed": 1333.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Seagate",
       "model": "ST3500413AS",
       "serialNumber": "Z2A3HR7N",
-      "actions": [],
+      "size": 500108.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 476940,
+      "variant": "JC45"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "2nd Generation Core Processor Family Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Realtek Semiconductor Co., Ltd.",
       "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
       "serialNumber": "f4:6d:04:12:9b:85",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "06",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "6 Series/C200 Series Chipset Family High Definition Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "ASUSTeK Computer INC.",
       "model": "P8H61-M LE",
       "serialNumber": "109192430003459",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 2,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2011-02-11T00:00:00",
+      "version": "0401",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/optiplex-745.snapshot.json

@@ -3,95 +3,105 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "Dell Inc.",
     "model": "OptiPlex 745",
     "serialNumber": "HQ5583J",
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": null,
-    "chassis": "Tower"
+    "version": null
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core2 CPU 6400 @ 2.13GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 2.133,
       "address": 64,
       "cores": 2,
-      "threads": 2
+      "threads": 2,
+      "brand": null,
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Infineon",
       "model": "64T128020HU3SB",
       "serialNumber": "07129114",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 1024,
+      "size": 1024.0,
       "interface": "DDR",
       "speed": 667.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Infineon",
       "model": "64T128020HU3SB",
       "serialNumber": "07127E11",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 1024,
+      "size": 1024.0,
       "interface": "DDR",
       "speed": 667.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Western Digital",
       "model": "WDC WD3200AAKS-7",
       "serialNumber": "WD-WMAV2W580992",
-      "actions": [],
+      "size": 320073.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 305245,
+      "variant": "3E02"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "82Q963/Q965 Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Broadcom Limited",
       "model": "NetXtreme BCM5754 Gigabit Ethernet PCI Express",
       "serialNumber": "00:1a:a0:e0:60:62",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "02",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "82801H HD Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Dell Inc.",
       "model": "0HP962",
       "serialNumber": "..CN137407AJ02SW.",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 7,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2007-08-21T00:00:00",
+      "version": "2.4.1",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/optiplex-gx520.snapshot.json

@@ -3,94 +3,104 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "Dell Inc.",
     "model": "OptiPlex GX520",
     "serialNumber": "6G0772J",
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": null,
-    "chassis": "Tower"
+    "version": null
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Pentium 4 CPU 3.00GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 3.0,
       "address": 64,
-      "threads": 8
+      "threads": 8,
+      "brand": "Pentium",
+      "generation": null
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Nanya Technology",
       "model": "NT512T64U88A0BY-37",
       "serialNumber": "197312A4",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 512,
+      "size": 512.0,
       "interface": "DDR",
       "speed": 533.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": null,
       "model": null,
       "serialNumber": null,
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 512,
+      "size": 512.0,
       "interface": "DDR",
       "speed": 533.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Seagate",
       "model": "ST3808110AS",
       "serialNumber": "5LR30DTZ",
-      "actions": [],
+      "size": 80000.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 76293,
+      "variant": "H"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "82945G/GZ Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Broadcom Limited",
       "model": "NetXtreme BCM5751 Gigabit Ethernet PCI Express",
       "serialNumber": "00:13:72:78:53:12",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "01",
-      "speed": 1000,
       "wireless": false
     },
     {
-      "manufacturer": "Intel Corporation",
-      "model": "82801G AC'97 Audio Controller",
-      "serialNumber": null,
       "actions": [],
-      "type": "SoundCard"
+      "type": "SoundCard",
+      "manufacturer": "Intel Corporation",
+      "model": "82801G AC97 Audio Controller",
+      "serialNumber": null
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Dell Inc.",
       "model": "0UG982",
       "serialNumber": "..CN1374063201S5.",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 5,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2006-02-20T00:00:00",
+      "version": "A06",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/pc-laudem.snapshot.json

@@ -1,95 +0,0 @@
-{
-  "type": "Snapshot",
-  "uuid": "00000000-0000-0000-0000-000000000000",
-  "software": "Workbench",
-  "version": "11.0a1",
-  "closed": false,
-  "endTime": "2000-01-01 00:00:00+00:00",
-  "device": {
-    "manufacturer": "Hewlett-Packard",
-    "model": "HP Compaq dc7900 Small Form Factor",
-    "serialNumber": "CZC901381R",
-    "actions": [],
-    "type": "Desktop",
-    "chassis": "Tower"
-  },
-  "components": [
-    {
-      "manufacturer": "Intel Corp.",
-      "model": "Intel Core2 Duo CPU E8400 @ 3.00GHz",
-      "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
-      "speed": 3.0,
-      "address": 64,
-      "cores": 2,
-      "threads": 2
-    },
-    {
-      "manufacturer": "JEDEC ID:AD 00 00 00 00 00 00 00",
-      "model": "HYMP125U64CP8-S6",
-      "serialNumber": "01200000",
-      "actions": [],
-      "type": "RamModule",
-      "format": "DIMM",
-      "size": 2048,
-      "interface": "DDR2",
-      "speed": 800.0
-    },
-    {
-      "manufacturer": "Seagate",
-      "model": "ST3160815AS",
-      "serialNumber": "6RX7AWEZ",
-      "actions": [],
-      "type": "HardDrive",
-      "size": 152627,
-      "interface": null
-    },
-    {
-      "manufacturer": "Intel Corporation",
-      "model": "4 Series Chipset Integrated Graphics Controller",
-      "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
-      "memory": null
-    },
-    {
-      "manufacturer": "Intel Corporation",
-      "model": "82567LM-3 Gigabit Network Connection",
-      "serialNumber": "00:23:7d:49:5e:31",
-      "actions": [],
-      "type": "NetworkAdapter",
-      "speed": 1000,
-      "wireless": false
-    },
-    {
-      "manufacturer": "Realtek Semiconductor Co., Ltd.",
-      "model": "RTL8169 PCI Gigabit Ethernet Controller",
-      "serialNumber": "00:b0:c2:02:ab:b7",
-      "actions": [],
-      "type": "NetworkAdapter",
-      "speed": 1000,
-      "wireless": false
-    },
-    {
-      "manufacturer": "Intel Corporation",
-      "model": "82801JD/DO HD Audio Controller",
-      "serialNumber": null,
-      "actions": [],
-      "type": "SoundCard"
-    },
-    {
-      "manufacturer": "Hewlett-Packard",
-      "model": "3031h",
-      "serialNumber": "CZC901381R",
-      "actions": [],
-      "type": "Motherboard",
-      "usb": 8,
-      "firewire": 0,
-      "serial": 0,
-      "pcmcia": 0,
-      "slots": 1
-    }
-  ],
-  "elapsed": 0
-}

tests/workbench_files/test_isard_probook.snapshot.json

@@ -0,0 +1,126 @@
+{
+  "type": "Snapshot",
+  "uuid": "00000000-0000-0000-0000-000000000000",
+  "software": "Workbench",
+  "version": "11.0a1",
+  "closed": true,
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
+  "device": {
+    "actions": [],
+    "type": "Laptop",
+    "manufacturer": "HP",
+    "model": "ProBook 430 G4",
+    "serialNumber": "5CD7314HDY",
+    "chassis": "Netbook",
+    "sku": "W6P93AV",
+    "version": null
+  },
+  "components": [
+    {
+      "actions": [],
+      "type": "Processor",
+      "manufacturer": "Intel Corp.",
+      "model": "Intel Core i5-7200U CPU @ 2.50GHz",
+      "serialNumber": null,
+      "speed": 3.1001220000000003,
+      "address": 64,
+      "cores": 2,
+      "threads": 4,
+      "brand": "Core i5",
+      "generation": 7
+    },
+    {
+      "actions": [],
+      "type": "RamModule",
+      "manufacturer": "Samsung",
+      "model": "M471A1K43CB1-CRC",
+      "serialNumber": "362E4E84",
+      "format": "SODIMM",
+      "size": 8192.0,
+      "interface": "DDR4",
+      "speed": 2133.0
+    },
+    {
+      "actions": [],
+      "type": "HardDrive",
+      "manufacturer": null,
+      "model": "SAMSUNG MZNTY256",
+      "serialNumber": "S2ZPNB0J121952",
+      "size": 256061.0,
+      "interface": null,
+      "variant": "1H3Q"
+    },
+    {
+      "actions": [],
+      "type": "GraphicCard",
+      "manufacturer": "Intel Corporation",
+      "model": "Intel Corporation",
+      "serialNumber": null,
+      "memory": null
+    },
+    {
+      "actions": [],
+      "type": "NetworkAdapter",
+      "manufacturer": "Realtek Semiconductor Co., Ltd.",
+      "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
+      "serialNumber": "f4:30:b9:a8:6d:15",
+      "speed": 1000.0,
+      "variant": "15",
+      "wireless": false
+    },
+    {
+      "actions": [],
+      "type": "NetworkAdapter",
+      "manufacturer": "Intel Corporation",
+      "model": "Wireless 7265",
+      "serialNumber": "16:7b:5f:33:d2:3d",
+      "speed": null,
+      "variant": "59",
+      "wireless": true
+    },
+    {
+      "actions": [],
+      "type": "SoundCard",
+      "manufacturer": "SunplusIT Inc",
+      "model": "HP HD Camera",
+      "serialNumber": null
+    },
+    {
+      "actions": [],
+      "type": "SoundCard",
+      "manufacturer": "Intel Corporation",
+      "model": "Intel Corporation",
+      "serialNumber": null
+    },
+    {
+      "actions": [],
+      "type": "Display",
+      "model": "SAMSUNG SyncMaster",
+      "manufacturer": "SAM SAMSUNG",
+      "serialNumber": "H1CRA03915",
+      "resolutionWidth": 1024,
+      "resolutionHeight": 768,
+      "refreshRate": 70,
+      "size": 15.0,
+      "technology": null,
+      "productionDate": "2001-10-28T00:00:00"
+    },
+    {
+      "actions": [],
+      "type": "Motherboard",
+      "manufacturer": "HP",
+      "model": "822C",
+      "serialNumber": "PGDZN018J887YS",
+      "usb": 1,
+      "firewire": 0,
+      "serial": 1,
+      "pcmcia": 0,
+      "slots": 0,
+      "biosDate": "2017-06-18T00:00:00",
+      "version": "P85 Ver. 01.06",
+      "ramSlots": null,
+      "ramMaxSize": null
+    }
+  ]
+}

tests/workbench_files/test_pc_hpCompaq8100.snapshot.json

@@ -0,0 +1,129 @@
+{
+  "type": "Snapshot",
+  "uuid": "00000000-0000-0000-0000-000000000000",
+  "software": "Workbench",
+  "version": "11.0a1",
+  "closed": true,
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
+  "device": {
+    "actions": [],
+    "type": "Desktop",
+    "manufacturer": "Hewlett-Packard",
+    "model": "HP Compaq 8100 Elite SFF",
+    "serialNumber": "CZC0408YPV",
+    "chassis": "Tower",
+    "sku": "AY032AV",
+    "version": null
+  },
+  "components": [
+    {
+      "actions": [],
+      "type": "Processor",
+      "manufacturer": "Intel Corp.",
+      "model": "Intel Core i3 CPU 530 @ 2.93GHz",
+      "serialNumber": null,
+      "speed": 1.733,
+      "address": 64,
+      "cores": 2,
+      "threads": 4,
+      "brand": "Core i3",
+      "generation": 1
+    },
+    {
+      "actions": [],
+      "type": "RamModule",
+      "manufacturer": "JEDEC ID:80 2C",
+      "model": "16JTF25664AZ-1G4F",
+      "serialNumber": "92072F30",
+      "format": "DIMM",
+      "size": 2048.0,
+      "interface": "DDR3",
+      "speed": 1333.0
+    },
+    {
+      "actions": [],
+      "type": "RamModule",
+      "manufacturer": "JEDEC ID:80 2C",
+      "model": "16JTF25664AZ-1G4F",
+      "serialNumber": "A4482E29",
+      "format": "DIMM",
+      "size": 2048.0,
+      "interface": "DDR3",
+      "speed": 1333.0
+    },
+    {
+      "actions": [],
+      "type": "RamModule",
+      "manufacturer": "JEDEC ID:80 2C",
+      "model": "16JTF25664AZ-1G4F",
+      "serialNumber": "939E2E29",
+      "format": "DIMM",
+      "size": 2048.0,
+      "interface": "DDR3",
+      "speed": 1333.0
+    },
+    {
+      "actions": [],
+      "type": "RamModule",
+      "manufacturer": "JEDEC ID:80 2C",
+      "model": "16JTF25664AZ-1G4F",
+      "serialNumber": "48FD2E30",
+      "format": "DIMM",
+      "size": 2048.0,
+      "interface": "DDR3",
+      "speed": 1333.0
+    },
+    {
+      "actions": [],
+      "type": "HardDrive",
+      "manufacturer": null,
+      "model": "KINGSTON SA400S3",
+      "serialNumber": "50026B7782018EE6",
+      "size": 120034.0,
+      "interface": null,
+      "variant": "71E0"
+    },
+    {
+      "actions": [],
+      "type": "GraphicCard",
+      "manufacturer": "Intel Corporation",
+      "model": "Core Processor Integrated Graphics Controller",
+      "serialNumber": null,
+      "memory": null
+    },
+    {
+      "actions": [],
+      "type": "NetworkAdapter",
+      "manufacturer": "Intel Corporation",
+      "model": "82578DM Gigabit Network Connection",
+      "serialNumber": "6c:62:6d:81:4d:ae",
+      "speed": 1000.0,
+      "variant": "05",
+      "wireless": false
+    },
+    {
+      "actions": [],
+      "type": "SoundCard",
+      "manufacturer": "Intel Corporation",
+      "model": "5 Series/3400 Series Chipset High Definition Audio",
+      "serialNumber": null
+    },
+    {
+      "actions": [],
+      "type": "Motherboard",
+      "manufacturer": "Hewlett-Packard",
+      "model": "304Ah",
+      "serialNumber": "CZC0408YPV",
+      "usb": 2,
+      "firewire": 0,
+      "serial": 0,
+      "pcmcia": 0,
+      "slots": 0,
+      "biosDate": "2010-06-09T00:00:00",
+      "version": "786H1 v01.05",
+      "ramSlots": null,
+      "ramMaxSize": null
+    }
+  ]
+}

tests/workbench_files/toshiba.snapshot.json

@@ -3,106 +3,133 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Laptop",
     "manufacturer": "TOSHIBA",
     "model": "PORTEGE R700",
     "serialNumber": "YA059622H",
-    "actions": [],
+    "chassis": "Netbook",
-    "type": "Laptop",
+    "sku": null,
-    "chassis": "Netbook"
+    "version": "PT311E-02W004CE"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i5 CPU M 560 @ 2.67GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 1.199,
       "address": 64,
-      "threads": 8
+      "threads": 8,
+      "brand": "Core i5",
+      "generation": 1
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Samsung",
       "model": "M471B5773CHS-CH9",
       "serialNumber": "67900CDD",
-      "actions": [],
-      "type": "RamModule",
       "format": "SODIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR3",
       "speed": 1067.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Hitachi",
       "model": "HTS54505",
       "serialNumber": "101022PBN40317KS46YE",
-      "actions": [],
+      "size": 500108.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 476940,
+      "variant": "C64G"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "Core Processor Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "82577LM Gigabit Network Connection",
       "serialNumber": "00:23:18:02:0d:94",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "06",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "Centrino Advanced-N 6200",
       "serialNumber": "00:27:10:cd:5e:44",
-      "actions": [],
+      "speed": null,
-      "type": "NetworkAdapter",
+      "variant": "35",
       "wireless": true
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": null,
       "model": null,
       "serialNumber": "02:80:37:ec:02:00",
-      "actions": [],
+      "speed": null,
-      "type": "NetworkAdapter",
+      "variant": null,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Realtek",
       "model": "2SF001",
-      "serialNumber": "0x0001",
+      "serialNumber": "0x0001"
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "5 Series/3400 Series Chipset High Definition Audio",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Display",
+      "model": "SAMSUNG SyncMaster",
+      "manufacturer": "SAM SAMSUNG",
+      "serialNumber": "H1CRA03915",
+      "resolutionWidth": 1024,
+      "resolutionHeight": 768,
+      "refreshRate": 70,
+      "size": 15.0,
+      "technology": null,
+      "productionDate": "2001-10-28T00:00:00"
+    },
+    {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "TOSHIBA",
       "model": "Portable PC",
       "serialNumber": null,
-      "actions": [],
-      "type": "Motherboard",
       "usb": 2,
       "firewire": 0,
       "serial": 0,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2010-09-15T00:00:00",
+      "version": "Version 1.60",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/virtualbox-client.snapshot.json

@@ -3,47 +3,55 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Computer",
     "manufacturer": "innotek GmbH",
     "model": "VirtualBox",
     "serialNumber": "0",
-    "actions": [],
+    "chassis": "Virtual",
-    "type": "Computer",
+    "sku": null,
-    "chassis": "Virtual"
+    "version": "1.2"
   },
   "components": [
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": null,
       "model": "VBOX HARDDISK",
       "serialNumber": "VBd9783eb3-8ef7f22a",
-      "actions": [],
+      "size": 80590.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 76856,
+      "variant": "1.0"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "82540EM Gigabit Ethernet Controller",
       "serialNumber": "08:00:27:43:d0:65",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "02",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Oracle Corporation",
       "model": "VirtualBox",
       "serialNumber": "0",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 1,
       "firewire": 0,
       "serial": 0,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2006-12-01T00:00:00",
+      "version": "VirtualBox",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/virtualbox-no-hdd-yes-usb.snapshot.json

@@ -3,45 +3,52 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Computer",
     "manufacturer": "innotek GmbH",
     "model": "VirtualBox",
     "serialNumber": "0",
-    "actions": [],
+    "chassis": "Virtual",
-    "type": "Computer",
+    "sku": null,
-    "chassis": "Virtual"
+    "version": "1.2"
   },
   "components": [
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "82540EM Gigabit Ethernet Controller",
       "serialNumber": "08:00:27:53:cb:af",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "02",
-      "speed": 1000,
       "wireless": false
     },
     {
-      "manufacturer": "Intel Corporation",
-      "model": "82801AA AC'97 Audio Controller",
-      "serialNumber": null,
       "actions": [],
-      "type": "SoundCard"
+      "type": "SoundCard",
+      "manufacturer": "Intel Corporation",
+      "model": "82801AA AC97 Audio Controller",
+      "serialNumber": null
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Oracle Corporation",
       "model": "VirtualBox",
       "serialNumber": "0",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 2,
       "firewire": 0,
       "serial": 0,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2006-12-01T00:00:00",
+      "version": "VirtualBox",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/virtualbox-no-hdd.snapshot.json

@@ -3,45 +3,52 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Computer",
     "manufacturer": "innotek GmbH",
     "model": "VirtualBox",
     "serialNumber": "0",
-    "actions": [],
+    "chassis": "Virtual",
-    "type": "Computer",
+    "sku": null,
-    "chassis": "Virtual"
+    "version": "1.2"
   },
   "components": [
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Intel Corporation",
       "model": "82540EM Gigabit Ethernet Controller",
       "serialNumber": "08:00:27:53:cb:af",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "02",
-      "speed": 1000,
       "wireless": false
     },
     {
-      "manufacturer": "Intel Corporation",
-      "model": "82801AA AC'97 Audio Controller",
-      "serialNumber": null,
       "actions": [],
-      "type": "SoundCard"
+      "type": "SoundCard",
+      "manufacturer": "Intel Corporation",
+      "model": "82801AA AC97 Audio Controller",
+      "serialNumber": null
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Oracle Corporation",
       "model": "VirtualBox",
       "serialNumber": "0",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 2,
       "firewire": 0,
       "serial": 0,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2006-12-01T00:00:00",
+      "version": "VirtualBox",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }

tests/workbench_files/vostro-260.snapshot.json

@@ -3,95 +3,105 @@
   "uuid": "00000000-0000-0000-0000-000000000000",
   "software": "Workbench",
   "version": "11.0a1",
-  "closed": false,
+  "closed": true,
-  "endTime": "2000-01-01 00:00:00+00:00",
+  "endTime": "0001-01-01 00:00:00+00:00",
+  "elapsed": 0,
   "device": {
+    "actions": [],
+    "type": "Desktop",
     "manufacturer": "Dell Inc.",
     "model": "Vostro 260",
     "serialNumber": "1Q63F5J",
-    "actions": [],
+    "chassis": "Tower",
-    "type": "Desktop",
+    "sku": null,
-    "chassis": "Tower"
+    "version": "00"
   },
   "components": [
     {
+      "actions": [],
+      "type": "Processor",
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i3-2120 CPU @ 3.30GHz",
       "serialNumber": null,
-      "actions": [],
-      "type": "Processor",
       "speed": 1.6709470000000002,
       "address": 64,
       "cores": 2,
-      "threads": 2
+      "threads": 2,
+      "brand": "Core i3",
+      "generation": 2
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Micron",
       "model": "8JTF25664AZ-1G4M1",
       "serialNumber": "E192532D",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR3",
       "speed": 1333.0
     },
     {
+      "actions": [],
+      "type": "RamModule",
       "manufacturer": "Micron",
       "model": "8JTF25664AZ-1G4M1",
       "serialNumber": "E192532C",
-      "actions": [],
-      "type": "RamModule",
       "format": "DIMM",
-      "size": 2048,
+      "size": 2048.0,
       "interface": "DDR3",
       "speed": 1333.0
     },
     {
+      "actions": [],
+      "type": "HardDrive",
       "manufacturer": "Seagate",
       "model": "ST500DM002-1BD14",
       "serialNumber": "Z2AYS308",
-      "actions": [],
+      "size": 500108.0,
-      "type": "HardDrive",
+      "interface": null,
-      "size": 476940,
+      "variant": "KC45"
-      "interface": null
     },
     {
+      "actions": [],
+      "type": "GraphicCard",
       "manufacturer": "Intel Corporation",
       "model": "2nd Generation Core Processor Family Integrated Graphics Controller",
       "serialNumber": null,
-      "actions": [],
-      "type": "GraphicCard",
       "memory": null
     },
     {
+      "actions": [],
+      "type": "NetworkAdapter",
       "manufacturer": "Realtek Semiconductor Co., Ltd.",
       "model": "RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller",
       "serialNumber": "d4:be:d9:ec:2d:ea",
-      "actions": [],
+      "speed": 1000.0,
-      "type": "NetworkAdapter",
+      "variant": "06",
-      "speed": 1000,
       "wireless": false
     },
     {
+      "actions": [],
+      "type": "SoundCard",
       "manufacturer": "Intel Corporation",
       "model": "6 Series/C200 Series Chipset Family High Definition Audio Controller",
-      "serialNumber": null,
+      "serialNumber": null
-      "actions": [],
-      "type": "SoundCard"
     },
     {
+      "actions": [],
+      "type": "Motherboard",
       "manufacturer": "Dell Inc.",
       "model": "0GDG8Y",
       "serialNumber": "..CN70163257067Z.",
-      "actions": [],
-      "type": "Motherboard",
       "usb": 2,
       "firewire": 0,
       "serial": 1,
       "pcmcia": 0,
-      "slots": 1
+      "slots": 0,
+      "biosDate": "2012-05-18T00:00:00",
+      "version": "A06",
+      "ramSlots": null,
+      "ramMaxSize": null
     }
-  ],
+  ]
-  "elapsed": 0
 }