projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented cql_to_rpn filter. Requires new yazpp from today's CVS.
[metaproxy-moved-to-github.git]
/
src
/
test_filter_factory.cpp
diff --git
a/src/test_filter_factory.cpp
b/src/test_filter_factory.cpp
index
81012d4
..
7f6761c
100644
(file)
--- a/
src/test_filter_factory.cpp
+++ b/
src/test_filter_factory.cpp
@@
-1,8
+1,7
@@
-/* $Id: test_filter_factory.cpp,v 1.10 2006-01-04 14:30:51 adam Exp $
- Copyright (c) 2005, Index Data.
-
-%LICENSE%
+/* $Id: test_filter_factory.cpp,v 1.14 2006-09-14 19:53:57 marc Exp $
+ Copyright (c) 2005-2006, Index Data.
+ See the LICENSE file for details
*/
#include <iostream>
*/
#include <iostream>
@@
-18,34
+17,35
@@
#include <boost/test/auto_unit_test.hpp>
using namespace boost::unit_test;
#include <boost/test/auto_unit_test.hpp>
using namespace boost::unit_test;
+namespace mp = metaproxy_1;
// XFilter
// XFilter
-class XFilter: public yp2::filter::Base {
+class XFilter: public mp::filter::Base {
public:
public:
- void process(yp2::Package & package) const;
+ void process(mp::Package & package) const;
};
};
-void XFilter::process(yp2::Package & package) const
+void XFilter::process(mp::Package & package) const
{
{
- package.data() = 1;
+ //package.data() = 1;
}
}
-static yp2::filter::Base* xfilter_creator(){
+static mp::filter::Base* xfilter_creator(){
return new XFilter;
}
// YFilter ...
return new XFilter;
}
// YFilter ...
-class YFilter: public yp2::filter::Base {
+class YFilter: public mp::filter::Base {
public:
public:
- void process(yp2::Package & package) const;
+ void process(mp::Package & package) const;
};
};
-void YFilter::process(yp2::Package & package) const
+void YFilter::process(mp::Package & package) const
{
{
- package.data() = 2;
+ //package.data() = 2;
}
}
-static yp2::filter::Base* yfilter_creator(){
+static mp::filter::Base* yfilter_creator(){
return new YFilter;
}
return new YFilter;
}
@@
-53,7
+53,7
@@
BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
{
try {
{
try {
- yp2::FactoryFilter ffactory;
+ mp::FactoryFilter ffactory;
XFilter xf;
YFilter yf;
XFilter xf;
YFilter yf;
@@
-66,20
+66,20
@@
BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
BOOST_CHECK(ffactory.add_creator(xfid, xfilter_creator));
BOOST_CHECK(ffactory.add_creator(yfid, yfilter_creator));
BOOST_CHECK(ffactory.add_creator(xfid, xfilter_creator));
BOOST_CHECK(ffactory.add_creator(yfid, yfilter_creator));
- yp2::filter::Base* xfilter = 0;
+ mp::filter::Base* xfilter = 0;
xfilter = ffactory.create(xfid);
xfilter = ffactory.create(xfid);
- yp2::filter::Base* yfilter = 0;
+ mp::filter::Base* yfilter = 0;
yfilter = ffactory.create(yfid);
BOOST_CHECK(0 != xfilter);
BOOST_CHECK(0 != yfilter);
yfilter = ffactory.create(yfid);
BOOST_CHECK(0 != xfilter);
BOOST_CHECK(0 != yfilter);
- yp2::Package pack;
+ mp::Package pack;
xfilter->process(pack);
xfilter->process(pack);
- BOOST_CHECK_EQUAL(pack.data(), 1);
+ //BOOST_CHECK_EQUAL(pack.data(), 1);
yfilter->process(pack);
yfilter->process(pack);
- BOOST_CHECK_EQUAL(pack.data(), 2);
+ //BOOST_CHECK_EQUAL(pack.data(), 2);
}
catch ( ... ) {
throw;
}
catch ( ... ) {
throw;
@@
-92,24
+92,24
@@
BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
BOOST_AUTO_UNIT_TEST( test_filter_factory_2 )
{
try {
BOOST_AUTO_UNIT_TEST( test_filter_factory_2 )
{
try {
- yp2::FactoryFilter ffactory;
+ mp::FactoryFilter ffactory;
const std::string id = "dl";
// first load
const std::string id = "dl";
// first load
- BOOST_CHECK(ffactory.add_creator_dyn(id, ".libs"));
+ BOOST_CHECK(ffactory.add_creator_dl(id, ".libs"));
// test double load
// test double load
- BOOST_CHECK(ffactory.add_creator_dyn(id, ".libs"));
+ BOOST_CHECK(ffactory.add_creator_dl(id, ".libs"));
- yp2::filter::Base* filter = 0;
+ mp::filter::Base* filter = 0;
filter = ffactory.create(id);
BOOST_CHECK(0 != filter);
filter = ffactory.create(id);
BOOST_CHECK(0 != filter);
- yp2::Package pack;
+ mp::Package pack;
filter->process(pack);
filter->process(pack);
- BOOST_CHECK_EQUAL(pack.data(), 42); // magic from filter_dl ..
+ //BOOST_CHECK_EQUAL(pack.data(), 42); // magic from filter_dl ..
}
catch ( ... ) {
throw;
}
catch ( ... ) {
throw;