Skip to content

added a few tests, fixed bugs that those tests turned up, and refactored a thew things on the way #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DarkStarDS9 wants to merge 32 commits into
base: v4
Choose a base branch
from
Open

added a few tests, fixed bugs that those tests turned up, and refactored a thew things on the way #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
46b9818
change: rewrite/update BACnetClient API
gralin Nov 29, 2017
8a4e64c
chane: rewrite ReadRange, SubscribeCOV and SubscribeProperty requests
gralin Dec 1, 2017
93ce70c
chore: rewrite remaining confirmed service requests
gralin Dec 3, 2017
dd25d35
chore: sync with YABE repo (svn@267)
gralin Dec 3, 2017
6edd0ee
chore: update copyright
gralin Dec 3, 2017
04a96d7
fix: BacnetStatusFlags instead of BacnetBitString in BacnetLogRecord …
gralin Dec 14, 2017
64da2d2
fix: calculating bits used in BacnetBitString (#8)
gralin Dec 14, 2017
a96722c
new: BACnet Prescale and Scale for Accumulator objects (#16)
Feb 14, 2018
50a55dc
chore: enhancements to improve compatibility (#18)
DarkStarDS9 Feb 19, 2018
7b18fdb
fix: issue with segments that slipped in during PR (#20)
DarkStarDS9 Feb 20, 2018
6c6fca4
Merge branch 'origin/fix-trend-log' into v2
gralin Feb 22, 2018
4241fb0
enhancement: perform APDU retries only on timeout. (#22)
Feb 23, 2018
caf3071
chore: event data refactoring (#23)
DarkStarDS9 Feb 26, 2018
7201985
Added tests for more EventValues
DarkStarDS9 Feb 26, 2018
47b2b02
refactored ChangeOfValue
DarkStarDS9 Feb 26, 2018
926c122
Refactored ChangeOfState
DarkStarDS9 Feb 27, 2018
5d1306d
Added ASHRAE Examples F.1.2, F.1.3 and F.1.4
DarkStarDS9 Feb 27, 2018
abae73f
Added ASHRAE Examples F.1.5 and F.1.6
DarkStarDS9 Feb 27, 2018
f26bfac
Added ASHRAE Example F.1.8
DarkStarDS9 Feb 27, 2018
d85aa83
Added ASHRAE Examples F.1.9 to F.1.11
DarkStarDS9 Feb 28, 2018
80eeef5
Split Serialize.Services into smaller parts
DarkStarDS9 Feb 28, 2018
54abdb4
Added ASHRAE Examples F.2.1 and F.2.2
DarkStarDS9 Feb 28, 2018
92ed10a
Added ASHRAE Examples F.3.1 to F.3.8
DarkStarDS9 Feb 28, 2018
8d959c0
Started to move test-data to its own class so that it can be shared
DarkStarDS9 Mar 1, 2018
52669df
Added ASHRAE Examples F.3.9 and F.3.10
DarkStarDS9 Mar 1, 2018
42788cb
Added ASHRAE Examples F.4.1 to F.4.9
DarkStarDS9 Mar 1, 2018
6c1a779
added some back2back tests, fixed issues
DarkStarDS9 Mar 1, 2018
4113a78
covered AlarmAndEventServices
DarkStarDS9 Mar 2, 2018
550819d
covered FileAccessServices
DarkStarDS9 Mar 2, 2018
858fa06
covered ObjectAccessServices
DarkStarDS9 Mar 5, 2018
654fcad
covered RemoteDeviceManagementServices
DarkStarDS9 Mar 5, 2018
2073f10
added a single test for malformed packets
DarkStarDS9 Mar 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions BACnet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -29,6 +30,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
Expand All @@ -53,10 +55,18 @@
</ItemGroup>
<ItemGroup>
<Compile Include="BacnetAsyncResult.cs" />
<Compile Include="BacnetException.cs" />
<Compile Include="Base\BacnetAbortReason.cs" />
<Compile Include="Base\BacnetAddress.cs" />
<Compile Include="Base\BacnetAddressTypes.cs" />
<Compile Include="Base\BacnetAlarmSummaryData.cs" />
<Compile Include="Base\BacnetApplicationTags.cs" />
<Compile Include="Base\BacnetBinaryPv.cs" />
<Compile Include="Base\BacnetObjectPropertyReference.cs" />
<Compile Include="Base\BacnetProgramError.cs" />
<Compile Include="Base\BacnetProgramRequest.cs" />
<Compile Include="Base\BacnetProgramState.cs" />
<Compile Include="Base\BacnetPrescale.cs" />
<Compile Include="Base\BacnetReinitializedStates.cs" />
<Compile Include="BACnetClient.cs" />
<Compile Include="Base\BacnetBitString.cs" />
Expand All @@ -69,7 +79,21 @@
<Compile Include="Base\BacnetDateRange.cs" />
<Compile Include="Base\BacnetDeviceObjectPropertyReference.cs" />
<Compile Include="Base\BacnetError.cs" />
<Compile Include="Base\BacnetEventNotificationData.cs" />
<Compile Include="Base\BacnetWriteAccessSpecification.cs" />
<Compile Include="Base\Enums\EnableDisable.cs" />
<Compile Include="Base\Enums\EnumUtils.cs" />
<Compile Include="Base\EventNotification\EventValues\EventValuesBase.cs" />
<Compile Include="Base\EventNotification\EventValues\ChangeOfLifeSafety.cs" />
<Compile Include="Helpers\FactoryHelper.cs" />
<Compile Include="Base\EventNotification\EventValues\UnsignedRange.cs" />
<Compile Include="Base\EventNotification\EventValues\ChangeOfState.cs" />
<Compile Include="Base\EventNotification\EventValues\OutOfRange.cs" />
<Compile Include="Base\EventNotification\EventValues\FloatingLimit.cs" />
<Compile Include="Base\EventNotification\EventValues\ChangeOfValue.cs" />
<Compile Include="Base\EventNotification\EventValues\BufferReady.cs" />
<Compile Include="Base\EventNotification\EventValues\ChangeOfBitString.cs" />
<Compile Include="Base\EventNotification\StateTransition.cs" />
<Compile Include="Base\EventNotification\NotificationData.cs" />
<Compile Include="Base\BacnetGenericTime.cs" />
<Compile Include="Base\BacnetGetEventInformationData.cs" />
<Compile Include="Base\BacnetLogRecord.cs" />
Expand All @@ -88,12 +112,12 @@
<Compile Include="Base\BacnetPropertyIds.cs" />
<Compile Include="Base\BacnetPropertyReference.cs" />
<Compile Include="Base\BacnetPropertyValue.cs" />
<Compile Include="Base\BacnetPropetyState.cs" />
<Compile Include="Base\BacnetPtpDisconnectReasons.cs" />
<Compile Include="Base\BacnetPtpFrameTypes.cs" />
<Compile Include="Base\BacnetReadAccessResult.cs" />
<Compile Include="Base\BacnetReadAccessSpecification.cs" />
<Compile Include="Base\BacnetReliability.cs" />
<Compile Include="Base\BacnetScale.cs" />
<Compile Include="Base\BacnetServicesSupported.cs" />
<Compile Include="Base\BacnetStatusFlags.cs" />
<Compile Include="Base\BacnetUnconfirmedServices.cs" />
Expand All @@ -118,17 +142,23 @@
<Compile Include="Base\Enums\BacnetLimitEnable.cs" />
<Compile Include="Base\Enums\BacnetNotifyTypes.cs" />
<Compile Include="Base\Enums\BacnetCOVTypes.cs" />
<Compile Include="Base\IHasStatusFlags.cs" />
<Compile Include="Helpers\BacnetValuesExtensions.cs" />
<Compile Include="Helpers\StringFormatterExtension.cs" />
<Compile Include="Base\BacnetBvlcV6Functions.cs" />
<Compile Include="Base\BacnetBvlcV6Results.cs" />
<Compile Include="Serialize\Services\AlarmAndEventServices.cs" />
<Compile Include="Serialize\Services\FileAccessServices.cs" />
<Compile Include="Serialize\Services\ObjectAccessServices.cs" />
<Compile Include="Serialize\Services\RemoteDeviceManagementServices.cs" />
<Compile Include="Transport\BacnetTransportBase.cs" />
<Compile Include="Transport\IBacnetSerialTransport.cs" />
<Compile Include="Transport\IBacnetTransport.cs" />
<Compile Include="Transport\BacnetMstpProtocolTransport.cs" />
<Compile Include="Transport\BacnetPipeTransport.cs" />
<Compile Include="Transport\BacnetPtpProtocolTransport.cs" />
<Compile Include="Transport\BacnetSerialPortTransport.cs" />
<Compile Include="Transport\BACnetTransport.cs" />
<Compile Include="Transport\BacnetIpUdpProtocolTransport.cs" />
<Compile Include="Transport\BacnetTransportEthernet.cs" />
<Compile Include="Transport\BacnetIpV6UdpProtocolTransport.cs" />
<Compile Include="Transport\BVLCV6.cs" />
Expand All @@ -145,7 +175,6 @@
<Compile Include="Serialize\MSTP.cs" />
<Compile Include="Serialize\NPDU.cs" />
<Compile Include="Serialize\PTP.cs" />
<Compile Include="Serialize\Services.cs" />
<Compile Include="Storage\DeviceStorage.cs" />
<Compile Include="Storage\Object.cs" />
<Compile Include="Storage\Property.cs" />
Expand Down
13 changes: 13 additions & 0 deletions BACnet.csproj.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=base/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=base_005Cenums/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=serialize_005Cnewfolder1/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=serialize_005Cservices/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=transport/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
</wpf:ResourceDictionary>
5 changes: 3 additions & 2 deletions BACnet.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
<id>BACnet</id>
<version>$version$</version>
<title>BACnet</title>
<authors>Morten Kvistgaard, Ela-compil</authors>
<authors>Jakub Brtkowiak, Ela-compil</authors>
<projectUrl>https://github.com/ela-compil/BACnet</projectUrl>
<iconUrl>https://raw.githubusercontent.com/ela-compil/BACnet/master/logo.png</iconUrl>
<description>BACnet protocol library for .NET</description>
<copyright>Copyright © Morten Kvistgaard 2016, MIT License</copyright>
<copyright>Copyright (c) 2017 Jakub Bartkowiak, MIT License</copyright>
<tags>bacnet scada bvlc mstp</tags>
</metadata>
</package>
11 changes: 10 additions & 1 deletion BACnet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2008
VisualStudioVersion = 15.0.27130.2003
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BACnet", "BACnet.csproj", "{66832876-01FC-4B7C-8D92-54195773FABF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BACnet.Tests", "Tests\BACnet.Tests.csproj", "{5DC7DC72-E57B-418C-ABE7-8A26B28AD953}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -15,8 +17,15 @@ Global
{66832876-01FC-4B7C-8D92-54195773FABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66832876-01FC-4B7C-8D92-54195773FABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66832876-01FC-4B7C-8D92-54195773FABF}.Release|Any CPU.Build.0 = Release|Any CPU
{5DC7DC72-E57B-418C-ABE7-8A26B28AD953}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5DC7DC72-E57B-418C-ABE7-8A26B28AD953}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DC7DC72-E57B-418C-ABE7-8A26B28AD953}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5DC7DC72-E57B-418C-ABE7-8A26B28AD953}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {32CA8FD5-D852-4706-BDBF-1A8DBD5D9A4A}
EndGlobalSection
EndGlobal
3 changes: 3 additions & 0 deletions BACnet.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=APDU/@EntryIndexedValue">APDU</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ASHRAE/@EntryIndexedValue">ASHRAE</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ASN/@EntryIndexedValue">ASN</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BBMD/@EntryIndexedValue">BBMD</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BVLC/@EntryIndexedValue">BVLC</s:String>
Expand All @@ -13,4 +14,6 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VMAC/@EntryIndexedValue">VMAC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=MethodPropertyEvent/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="_test" Style="aa_bb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="*" ModuleVersionMask="*" ClassMask="*UnitTests.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="BACnet.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String>
</wpf:ResourceDictionary>
Loading