onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 19:57:21 +01:00
Code Issues Releases Wiki Activity

refs #1822 fixed failing unit tests

Browse Source
This commit is contained in:
Vadim Kurland 2010-11-03 18:07:50 -07:00
parent 2c7c81e608
commit a78b279eec
4 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libgui/unit_tests/DiscoveryDruidTest/DiscoveryDruidTest.cpp
View File

@ -145,6 +145,7 @@ void DiscoveryDruidTest::testHostsImport()
// this is running after import dialog is closed
mw->activeProject()->setFileName("result.fwb");
mw->activeProject()->db()->setPredictableIds(mw->activeProject()->db());
mw->activeProject()->save();
compareFwbFiles("output.fwb", "result.fwb");

51
src/libgui/unit_tests/DiscoveryDruidTest/output.fwb
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="17" lastModified="1279717998" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="17" lastModified="1288832643" id="root">
<Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
<AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
<AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@ -143,6 +143,12 @@
<ServiceRef ref="icmp-ping_reply"/>
<ServiceRef ref="icmp-Unreachables"/>
</ServiceGroup>
<ServiceGroup id="id1569X4889" name="Ipv6 unreachable messages" comment="" ro="False">
<ServiceRef ref="idE0D27650"/>
<ServiceRef ref="idCFE27650"/>
<ServiceRef ref="idE0B27650"/>
<ServiceRef ref="id1519Z388"/>
</ServiceGroup>
<ServiceGroup id="id3B4FEDD9" name="kerberos" comment="" ro="False">
<ServiceRef ref="id3B4FEDA5"/>
<ServiceRef ref="id3B4FEDA9"/>
@ -205,6 +211,7 @@
<ICMP6Service id="ipv6-icmp-neighbrsol" code="0" type="135" name="ipv6 neighbrsol" comment="IPv6 neighbor solicitation" ro="False"/>
<ICMP6Service id="ipv6-icmp-neighbradv" code="0" type="136" name="ipv6 neighbradv" comment="IPv6 neighbor advertisement" ro="False"/>
<ICMP6Service id="ipv6-icmp-redir" code="0" type="137" name="ipv6 redir" comment="IPv6 redirect: shorter route exists" ro="False"/>
<ICMP6Service id="id1519Z388" code="-1" type="4" name="ipv6 parameter problem" comment="IPv6 Parameter Problem: RFC4443" ro="False"/>
<ICMP6Service id="idCFE27650" code="0" type="3" name="ipv6 time exceeded" comment="Time exceeded in transit" ro="False"/>
<ICMP6Service id="idCFF27650" code="1" type="3" name="ipv6 time exceeded in reassembly" comment="Time exceeded in reassembly" ro="False"/>
<ICMP6Service id="idE0B27650" code="-1" type="2" name="ipv6 packet too big" comment="" ro="False"/>
@ -419,29 +426,29 @@
<Library id="id0" color="#d2ffd0" name="User" comment="" ro="False">
<ObjectGroup id="id1" name="Objects" comment="" ro="False">
<ObjectGroup id="id2" name="Addresses" comment="" ro="False">
<IPv4 id="id1569X18192" name="host1" comment="" ro="False" address="192.168.1.1" netmask="255.255.255.255"/>
<IPv4 id="id1572X18192" name="host2" comment="" ro="False" address="192.168.1.2" netmask="255.255.255.255"/>
<IPv4 id="id1575X18192" name="host3" comment="" ro="False" address="192.168.1.3" netmask="255.255.255.255"/>
<IPv4 id="id3" name="host1" comment="" ro="False" address="192.168.1.1" netmask="255.255.255.255"/>
<IPv4 id="id4" name="host2" comment="" ro="False" address="192.168.1.2" netmask="255.255.255.255"/>
<IPv4 id="id5" name="host3" comment="" ro="False" address="192.168.1.3" netmask="255.255.255.255"/>
</ObjectGroup>
<ObjectGroup id="id3" name="DNS Names" comment="" ro="False"/>
<ObjectGroup id="id4" name="Address Tables" comment="" ro="False"/>
<ObjectGroup id="id5" name="Groups" comment="" ro="False"/>
<ObjectGroup id="id6" name="Hosts" comment="" ro="False"/>
<ObjectGroup id="id7" name="Networks" comment="" ro="False"/>
<ObjectGroup id="id8" name="Address Ranges" comment="" ro="False"/>
<ObjectGroup id="id6" name="DNS Names" comment="" ro="False"/>
<ObjectGroup id="id7" name="Address Tables" comment="" ro="False"/>
<ObjectGroup id="id8" name="Groups" comment="" ro="False"/>
<ObjectGroup id="id9" name="Hosts" comment="" ro="False"/>
<ObjectGroup id="id10" name="Networks" comment="" ro="False"/>
<ObjectGroup id="id11" name="Address Ranges" comment="" ro="False"/>
</ObjectGroup>
<ServiceGroup id="id9" name="Services" comment="" ro="False">
<ServiceGroup id="id10" name="Groups" comment="" ro="False"/>
<ServiceGroup id="id11" name="ICMP" comment="" ro="False"/>
<ServiceGroup id="id12" name="IP" comment="" ro="False"/>
<ServiceGroup id="id13" name="TCP" comment="" ro="False"/>
<ServiceGroup id="id14" name="UDP" comment="" ro="False"/>
<ServiceGroup id="id15" name="Users" comment="" ro="False"/>
<ServiceGroup id="id16" name="Custom" comment="" ro="False"/>
<ServiceGroup id="id17" name="TagServices" comment="" ro="False"/>
<ServiceGroup id="id12" name="Services" comment="" ro="False">
<ServiceGroup id="id13" name="Groups" comment="" ro="False"/>
<ServiceGroup id="id14" name="ICMP" comment="" ro="False"/>
<ServiceGroup id="id15" name="IP" comment="" ro="False"/>
<ServiceGroup id="id16" name="TCP" comment="" ro="False"/>
<ServiceGroup id="id17" name="UDP" comment="" ro="False"/>
<ServiceGroup id="id18" name="Users" comment="" ro="False"/>
<ServiceGroup id="id19" name="Custom" comment="" ro="False"/>
<ServiceGroup id="id20" name="TagServices" comment="" ro="False"/>
</ServiceGroup>
<ObjectGroup id="id18" name="Firewalls" comment="" ro="False"/>
<ObjectGroup id="id19" name="Clusters" comment="" ro="False"/>
<IntervalGroup id="id20" name="Time" comment="" ro="False"/>
<ObjectGroup id="id21" name="Firewalls" comment="" ro="False"/>
<ObjectGroup id="id22" name="Clusters" comment="" ro="False"/>
<IntervalGroup id="id23" name="Time" comment="" ro="False"/>
</Library>
</FWObjectDatabase>

9
src/libgui/unit_tests/ImporterTest/test_data/ios.fwb
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="17" lastModified="1281062181" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="17" lastModified="1288831958" id="root">
<Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
<AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
<AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@ -143,6 +143,12 @@
<ServiceRef ref="icmp-ping_reply"/>
<ServiceRef ref="icmp-Unreachables"/>
</ServiceGroup>
<ServiceGroup id="id1569X4889" name="Ipv6 unreachable messages" comment="" ro="False">
<ServiceRef ref="idE0D27650"/>
<ServiceRef ref="idCFE27650"/>
<ServiceRef ref="idE0B27650"/>
<ServiceRef ref="id1519Z388"/>
</ServiceGroup>
<ServiceGroup id="id3B4FEDD9" name="kerberos" comment="" ro="False">
<ServiceRef ref="id3B4FEDA5"/>
<ServiceRef ref="id3B4FEDA9"/>
@ -205,6 +211,7 @@
<ICMP6Service id="ipv6-icmp-neighbrsol" code="0" type="135" name="ipv6 neighbrsol" comment="IPv6 neighbor solicitation" ro="False"/>
<ICMP6Service id="ipv6-icmp-neighbradv" code="0" type="136" name="ipv6 neighbradv" comment="IPv6 neighbor advertisement" ro="False"/>
<ICMP6Service id="ipv6-icmp-redir" code="0" type="137" name="ipv6 redir" comment="IPv6 redirect: shorter route exists" ro="False"/>
<ICMP6Service id="id1519Z388" code="-1" type="4" name="ipv6 parameter problem" comment="IPv6 Parameter Problem: RFC4443" ro="False"/>
<ICMP6Service id="idCFE27650" code="0" type="3" name="ipv6 time exceeded" comment="Time exceeded in transit" ro="False"/>
<ICMP6Service id="idCFF27650" code="1" type="3" name="ipv6 time exceeded in reassembly" comment="Time exceeded in reassembly" ro="False"/>
<ICMP6Service id="idE0B27650" code="-1" type="2" name="ipv6 packet too big" comment="" ro="False"/>

9
src/libgui/unit_tests/ImporterTest/test_data/ipt.fwb
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="17" lastModified="1284428538" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="17" lastModified="1288831958" id="root">
<Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
<AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
<AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@ -143,6 +143,12 @@
<ServiceRef ref="icmp-ping_reply"/>
<ServiceRef ref="icmp-Unreachables"/>
</ServiceGroup>
<ServiceGroup id="id1569X4889" name="Ipv6 unreachable messages" comment="" ro="False">
<ServiceRef ref="idE0D27650"/>
<ServiceRef ref="idCFE27650"/>
<ServiceRef ref="idE0B27650"/>
<ServiceRef ref="id1519Z388"/>
</ServiceGroup>
<ServiceGroup id="id3B4FEDD9" name="kerberos" comment="" ro="False">
<ServiceRef ref="id3B4FEDA5"/>
<ServiceRef ref="id3B4FEDA9"/>
@ -205,6 +211,7 @@
<ICMP6Service id="ipv6-icmp-neighbrsol" code="0" type="135" name="ipv6 neighbrsol" comment="IPv6 neighbor solicitation" ro="False"/>
<ICMP6Service id="ipv6-icmp-neighbradv" code="0" type="136" name="ipv6 neighbradv" comment="IPv6 neighbor advertisement" ro="False"/>
<ICMP6Service id="ipv6-icmp-redir" code="0" type="137" name="ipv6 redir" comment="IPv6 redirect: shorter route exists" ro="False"/>
<ICMP6Service id="id1519Z388" code="-1" type="4" name="ipv6 parameter problem" comment="IPv6 Parameter Problem: RFC4443" ro="False"/>
<ICMP6Service id="idCFE27650" code="0" type="3" name="ipv6 time exceeded" comment="Time exceeded in transit" ro="False"/>
<ICMP6Service id="idCFF27650" code="1" type="3" name="ipv6 time exceeded in reassembly" comment="Time exceeded in reassembly" ro="False"/>
<ICMP6Service id="idE0B27650" code="-1" type="2" name="ipv6 packet too big" comment="" ro="False"/>