[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/solid
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2007-04-17 7:24:36
Message-ID: 1176794676.192870.26050.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 654882 by wstephens:

Fix the tests

 M  +1 -1      backends/fakenet/fakenetwork.cpp  
 M  +1 -2      backends/fakenet/fakenetworking.xml  
 M  +1 -3      tests/solidnettest.cpp  


--- trunk/KDE/kdelibs/solid/backends/fakenet/fakenetwork.cpp #654881:654882
@@ -62,7 +62,7 @@
 
 QList<QNetworkAddressEntry> FakeNetwork::addressEntries() const
 {
-    return stringlistsToQNetworkAddressEntries( mPropertyMap[ "ipv4addresses" \
].toStringList(), +    return stringlistsToQNetworkAddressEntries( mPropertyMap[ \
                "addresses" ].toStringList(),
                                    mPropertyMap[ "subnet" ].toStringList(),
                                    mPropertyMap[ "broadcast" ].toStringList()
                                  );
--- trunk/KDE/kdelibs/solid/backends/fakenet/fakenetworking.xml #654881:654882
@@ -10,8 +10,7 @@
         <property key="capabilities">manageable,carrierdetect,wirelessscan</property>
  
         <wireless uni="/org/kde/solid/fakenet/eth0/net0">
-            <property key="ipv4addresses">193.1.234.22</property>
-            <property \
key="ipv6addresses">fe80::215:ff:fe39:208e/64,fe80::20d:e1ef:fe12:76c2/64</property> \
+            <property key="addresses">193.1.234.22</property>  <property \
key="subnet">193.1.234.0</property>  <property \
key="broadcast">193.1.234.255</property>  <property \
                key="dns">193.1.214.50,193.1.214.55</property>
--- trunk/KDE/kdelibs/solid/tests/solidnettest.cpp #654881:654882
@@ -155,10 +155,8 @@
 
     QVERIFY( valid_iface.findNetwork( "/org/kde/solid/fakenet/eth0/net0 " )!=0 );
     QCOMPARE( valid_iface.findNetwork( "/org/kde/solid/fakenet/eth0/net0" \
                )->isValid(), true );
-    
-    QCOMPARE( valid_iface.findNetwork( "/org/kde/solid/fakenet/eth0/net0" \
                )->ipV4Addresses().size(), 1 );
-    QCOMPARE( valid_iface.findNetwork( "/org/kde/solid/fakenet/eth0/net0" \
)->ipV6Addresses().size(), 2 );  
+    QCOMPARE( valid_iface.findNetwork( "/org/kde/solid/fakenet/eth0/net0" \
)->addressEntries().size(), 1 );  QCOMPARE( valid_iface.networks().size(), 4 );
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]