projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GlobalSettings: Always use Fusion style on Windows for dark themes
[pulseview.git]
/
test
/
data
/
decoderstack.cpp
diff --git
a/test/data/decoderstack.cpp
b/test/data/decoderstack.cpp
index 84a496f1f2ada2c0292b425ec2efae0ebbf99e0d..3bb2f3eb310d52f525845142cd52baf51e109a8a 100644
(file)
--- a/
test/data/decoderstack.cpp
+++ b/
test/data/decoderstack.cpp
@@
-14,41
+14,43
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
*/
+#if 0
+
#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <boost/test/unit_test.hpp>
#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <boost/test/unit_test.hpp>
-#include <libsigrok
/libsigrok.h
>
+#include <libsigrok
cxx/libsigrokcxx.hpp
>
-#include "../../pv/data/decoderstack.h"
-#include "../../pv/devicemanager.h"
-#include "../../pv/s
igsession.h
"
-#include "../../pv/view/decodetrace.h"
+#include "../../pv/data/decoderstack.h
pp
"
+#include "../../pv/devicemanager.h
pp
"
+#include "../../pv/s
ession.hpp
"
+#include "../../pv/view/decodetrace.h
pp
"
-using namespace boost;
-using namespace std;
+using pv::data::DecoderStack;
+using pv::data::decode::Decoder;
+using pv::view::DecodeTrace;
+using std::shared_ptr;
+using std::vector;
BOOST_AUTO_TEST_SUITE(DecoderStackTest)
BOOST_AUTO_TEST_CASE(TwoDecoderStack)
{
BOOST_AUTO_TEST_SUITE(DecoderStackTest)
BOOST_AUTO_TEST_CASE(TwoDecoderStack)
{
- using namespace pv;
-
- sr_context *ctx = NULL;
+ sr_context *ctx = nullptr;
BOOST_REQUIRE(sr_init(&ctx) == SR_OK);
BOOST_REQUIRE(ctx);
BOOST_REQUIRE(sr_init(&ctx) == SR_OK);
BOOST_REQUIRE(ctx);
- BOOST_REQUIRE(srd_init(
NULL
) == SRD_OK);
+ BOOST_REQUIRE(srd_init(
nullptr
) == SRD_OK);
srd_decoder_load_all();
{
pv::DeviceManager dm(ctx);
srd_decoder_load_all();
{
pv::DeviceManager dm(ctx);
- pv::S
igS
ession ss(dm);
+ pv::Session ss(dm);
const GSList *l = srd_decoder_list();
BOOST_REQUIRE(l);
const GSList *l = srd_decoder_list();
BOOST_REQUIRE(l);
@@
-59,18
+61,18
@@
BOOST_AUTO_TEST_CASE(TwoDecoderStack)
ss.add_decoder(dec);
// Check the signals were created
ss.add_decoder(dec);
// Check the signals were created
- const vector< shared_ptr<
view::
DecodeTrace> > sigs =
+ const vector< shared_ptr<DecodeTrace> > sigs =
ss.get_decode_signals();
ss.get_decode_signals();
- shared_ptr<
data::
DecoderStack> dec0 = sigs[0]->decoder();
+ shared_ptr<DecoderStack> dec0 = sigs[0]->decoder();
BOOST_REQUIRE(dec0);
BOOST_REQUIRE(dec0);
- shared_ptr<
data::
DecoderStack> dec1 = sigs[0]->decoder();
+ shared_ptr<DecoderStack> dec1 = sigs[0]->decoder();
BOOST_REQUIRE(dec1);
// Wait for the decode threads to complete
BOOST_REQUIRE(dec1);
// Wait for the decode threads to complete
- dec0->
_decode_thread
.join();
- dec1->
_decode_thread
.join();
+ dec0->
decode_thread_
.join();
+ dec1->
decode_thread_
.join();
// Check there were no errors
BOOST_CHECK_EQUAL(dec0->error_message().isEmpty(), true);
// Check there were no errors
BOOST_CHECK_EQUAL(dec0->error_message().isEmpty(), true);
@@
-83,3
+85,4
@@
BOOST_AUTO_TEST_CASE(TwoDecoderStack)
}
BOOST_AUTO_TEST_SUITE_END()
}
BOOST_AUTO_TEST_SUITE_END()
+#endif