[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kdnssd/multiengine/kdelibs/dnssd
From: Jakub Stachowski <qbast () go2 ! pl>
Date: 2005-08-03 20:06:39
Message-ID: 1123099599.437831.19467.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 442752 by qbast:
Engine now returns one main scope instead of a list. For now i see no
usecase that it will make things hard for.
PublicService still has broken details handling. Oh well, i can disable
its tests for now.
M +17 -26 dnssdtest.cpp
M +1 -1 engine.h
M +2 -4 engines/test/testengine.cpp
M +1 -1 engines/test/testengine.h
M +1 -0 publicservice.cpp
M +5 -6 scope.cpp
--- branches/work/kdnssd/multiengine/kdelibs/dnssd/dnssdtest.cpp #442751:442752
@@ -37,7 +37,7 @@
KUNITTEST_MODULE_REGISTER_TESTER( EngineListTest );
KUNITTEST_MODULE_REGISTER_TESTER( ServiceTypeTest );
KUNITTEST_MODULE_REGISTER_TESTER( ScopeTest );
-KUNITTEST_MODULE_REGISTER_TESTER( PublicServiceTest );
+//KUNITTEST_MODULE_REGISTER_TESTER( PublicServiceTest );
static QCoreApplication *app=0;
@@ -71,7 +71,7 @@
result_called=0;
kdDebug() << "Starting with test engine\n";
discoRoot->start();
- while (result_called<4) qApp->processEvents();
+ while (result_called<3) qApp->processEvents();
CHECK(discoRoot->children().count()>0,true);
result_called=0;
@@ -85,33 +85,33 @@
*/ result_called=0;
kdDebug() << "Stopping\n";
discoRoot->stop();
- while (result_called<6) qApp->processEvents();
- CHECK(result_called,6);
+ while (result_called<3) qApp->processEvents();
+ CHECK(result_called,3);
result_called=0;
kdDebug() << "Restarting\n";
discoRoot->start();
- while (result_called<6) qApp->processEvents();
- CHECK(result_called,6);
+ while (result_called<3) qApp->processEvents();
+ CHECK(result_called,3);
QHash<QString,QVariant> d2;
d2["enabled"]=false;
result_called=0;
kdDebug() << "Setting details (disabling test engine)\n";
discoRoot->setDetails("test",d2);
- while (result_called<4) qApp->processEvents();
- CHECK(result_called,4);
+ while (result_called<2) qApp->processEvents();
+ CHECK(result_called,2);
kdDebug() << "Setting details (reenabling test engine)\n";
result_called=0;
d2["enabled"]=true;
discoRoot->setDetails("test",d2);
- while (result_called<4) qApp->processEvents();
- CHECK(result_called,4);
+ while (result_called<2) qApp->processEvents();
+ CHECK(result_called,2);
kdDebug() << "Checking root\n";
CHECK(discoRoot->root()->name()==QString("everything.core"),true);
- Scope* sec = discoRoot->findChild<Scope*>("second.test");
+ Scope* sec = discoRoot->findChild<Scope*>("first.test");
CHECK(sec->root()->name()==QString("everything.core"),true);
result_called=0;
@@ -119,8 +119,8 @@
kdDebug() << "Setting new parent and deleting it\n";
discoRoot->setParent(q);
delete q;
- while (result_called<6) qApp->processEvents();
- CHECK(result_called,6);
+ while (result_called<3) qApp->processEvents();
+ CHECK(result_called,3);
q = new QObject();
kdDebug() << "Creating scope with parent and starting\n";
@@ -129,14 +129,14 @@
connect(discoRoot,SIGNAL(childRemoved(DNSSD::Scope*)),this,SLOT(childRemoved(DNSSD::Scope*)));
result_called=0;
discoRoot->start();
- while (result_called<6) qApp->processEvents();
+ while (result_called<3) qApp->processEvents();
CHECK(discoRoot->children().count()>0,true);
kdDebug() << "Deleting\n";
result_called=0;
delete q;
- while (result_called<6) qApp->processEvents();
- CHECK(result_called,6);
+ while (result_called<3) qApp->processEvents();
+ CHECK(result_called,3);
}
void ScopeTest::childAdded(DNSSD::Scope* s)
@@ -161,31 +161,22 @@
PublicService a("test",ServiceType("ftp"),80,l);
QHash<QString,QVariant> d2,d;
- QStringList s;
- s << "first.test" << "second.test";
- d2["first.test"]=true;
- d2["second.test"]=false;
- d2["scopes"]=s;
result_called=false;
kdDebug() << "Publishing with test scopes" << endl;
- root->setDetails("test",d2);
- kdDebug() << "After set details " << endl;
connect(&a,SIGNAL(published(bool)),this,SLOT(result(bool)));
a.publish();
while (!result_called) qApp->processEvents();
CHECK(result_called,true);
CHECK(res,true);
CHECK(a.isPublished(),true);
- CHECK(a.scopes().count(),2);
-// a.removeScope(Scope::get("first.test"));
CHECK(a.scopes().count(),1);
// FIXME details handling in PublicService is broken
kdDebug() << "Publishing with engines disabled" << endl;
d["enabled"]=false;
root->setDetails("test",d);
- root->setDetails("dnssd",d);
+// root->setDetails("dnssd",d);
result_called=false;
a.publish();
// while (!result_called) qApp->processEvents();
--- branches/work/kdnssd/multiengine/kdelibs/dnssd/engine.h #442751:442752
@@ -56,7 +56,7 @@
virtual int capabilities() =0;
virtual const QString engineID() =0;
virtual Publisher* createPublisher(PublicService* service,Scope::Ptr scope)=0;
- virtual QList<ActiveScope*> getScopes(Scope::Type type, Scope* parent)=0;
+ virtual ActiveScope* getMainScope(Scope::Type type, Scope* parent)=0;
};
--- branches/work/kdnssd/multiengine/kdelibs/dnssd/engines/test/testengine.cpp #442751:442752
@@ -68,11 +68,9 @@
return new TestPublisher(service,scope);
}
-QList<ActiveScope*> TestEngine::getScopes(Scope::Type type, Scope* parent)
+ActiveScope* TestEngine::getMainScope(Scope::Type type, Scope* parent)
{
- QList<ActiveScope*> l;
- l << new TestScope("first",parent,this) << new TestScope("second",parent,this);
- return l;
+ return new TestScope("first",parent,this);
}
const QString TestEngine::engineID()
--- branches/work/kdnssd/multiengine/kdelibs/dnssd/engines/test/testengine.h #442751:442752
@@ -43,7 +43,7 @@
~TestEngine();
virtual bool init();
virtual Publisher* createPublisher(PublicService* service, Scope::Ptr scope);
- virtual QList<ActiveScope*> getScopes(Scope::Type type, Scope* parent);
+ virtual ActiveScope* getMainScope(Scope::Type type, Scope* parent);
virtual const QString engineID();
virtual int capabilities();
--- branches/work/kdnssd/multiengine/kdelibs/dnssd/publicservice.cpp #442751:442752
@@ -61,6 +61,7 @@
d->m_rootScopes = scopes;
// FIXME: and what if top-level scope gets deleted? map its destroyed() to removeScope() ?
foreach(Scope* s,scopes) {
+ childScopeAdded(s);
connect(s,SIGNAL(childAdded(Scope*)),this,SLOT(childScopeAdded(Scope* )));
connect(s,SIGNAL(childRemoved(Scope*)),this,SLOT(childScopeRemoved(Scope* )));
}
--- branches/work/kdnssd/multiengine/kdelibs/dnssd/scope.cpp #442751:442752
@@ -100,12 +100,11 @@
m_running=true;
foreach(Engine* eng, EngineList::self().engines())
if (eng->capabilities()&m_type && eng->capabilities()&Engine::Scopes) {
- QList<ActiveScope*> l = eng->getScopes(m_type,this);
- foreach (ActiveScope* scope,l) {
- scope->setDetails(m_details[scope->engine()->engineID()]);
- m_mainScopes.insert(eng->engineID(),scope);
- scope->start();
- }
+ ActiveScope* scope = eng->getMainScope(m_type,this);
+ if (!scope) continue;
+ scope->setDetails(m_details[scope->engine()->engineID()]);
+ m_mainScopes.insert(eng->engineID(),scope);
+ scope->start();
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic