* filename conventions (second part of it)

git-svn-id: svn://localhost/ardour2/branches/3.0@4510 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/evoral/test/sequence.cpp b/libs/evoral/test/sequence.cpp
deleted file mode 100644 (file)
index 8e3beb2..0000000
--- a/libs/evoral/test/sequence.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "sequence.hpp"
-#include <cassert>
-
-CPPUNIT_TEST_SUITE_REGISTRATION( SequenceTest );
-
-using namespace std;
-
-void 
-SequenceTest::createTest (void)
-{
-               CPPUNIT_ASSERT_EQUAL(size_t(0), seq->sysexes().size());
-               CPPUNIT_ASSERT_EQUAL(size_t(0), seq->notes().size());
-               CPPUNIT_ASSERT(seq->notes().begin() == seq->notes().end());
-}
-
-
-void 
-SequenceTest::preserveEventOrderingTest (void)
-{
-       vector<boost::shared_ptr<Event<Time> > > inserted_events;
-       
-       seq->start_write();
-       
-       for (Notes::const_iterator i = test_notes.begin(); i != test_notes.end(); ++i) {
-               uint8_t buffer[2];
-               Event<Time>* event = new Event<Time>(
-                               DummyTypeMap::CONTROL, (*i)->on_event().time(), 3, buffer, true
-               );
-               
-               event->buffer()[0] = MIDI_CMD_CONTROL;
-               event->buffer()[1] = event->time() / 100;
-               event->buffer()[2] = event->time() / 100;
-               
-               boost::shared_ptr<Event<Time> > event_ptr(event);
-
-               seq->append((*i)->on_event());
-               inserted_events.push_back(
-                               boost::shared_ptr<Event<Time> >(
-                                               new Event<Time>((*i)->on_event(), true)
-               ));
-               
-               seq->append(*event_ptr);
-               inserted_events.push_back(event_ptr);
-               
-               seq->append((*i)->off_event());
-               inserted_events.push_back(
-                               boost::shared_ptr<Event<Time> >(
-                                               new Event<Time>((*i)->off_event(), true)
-               ));
-       }
-       
-       seq->end_write();
-
-       TestSink<Time> sink;
-       sink.writing.connect(sigc::mem_fun(&sink, &TestSink<Time>::assertLastEventTimeLessOrEqualEventTime));
-
-       seq->read(sink, timestamp_t(0), timedur_t(1200), timestamp_t(0));
-       
-       CPPUNIT_ASSERT_EQUAL(size_t(12), test_notes.size());
-       
-}

diff --git a/libs/evoral/test/sequence.hpp b/libs/evoral/test/sequence.hpp
deleted file mode 100644 (file)
index 50ba193..0000000
--- a/libs/evoral/test/sequence.hpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-
-#include <evoral/Sequence.hpp>
-#include <evoral/TypeMap.hpp>
-#include <evoral/EventSink.hpp>
-#include <evoral/midi_events.h>
-#include <evoral/Control.hpp>
-
-#include <sigc++/sigc++.h>
-
-#include <cassert>
-
-
-using namespace Evoral;
-
-class DummyTypeMap : public TypeMap {
-public:
-       
-       enum DummyEventType {
-               NOTE,
-               CONTROL,
-               SYSEX
-       };
-       
-       ~DummyTypeMap() {}
-
-       bool type_is_midi(uint32_t type) const {return true;}
-
-       uint8_t parameter_midi_type(const Parameter& param) const {
-               switch (param.type()) {
-               case CONTROL:       return MIDI_CMD_CONTROL;
-               case SYSEX:         return MIDI_CMD_COMMON_SYSEX;
-               default:            return 0;
-               };              
-       }
-       
-       uint32_t midi_event_type(uint8_t status) const {
-               status &= 0xf0;
-               switch (status) {
-               case MIDI_CMD_CONTROL:          return CONTROL;
-               case MIDI_CMD_COMMON_SYSEX:     return SYSEX;                   
-               default:                        return 0;
-               };
-       }
-       
-       bool is_integer(const Evoral::Parameter& param) const {return true;}
-
-       Parameter new_parameter(uint32_t type, uint8_t channel, uint32_t id) const {
-               Parameter p(type, channel, id);
-               p.set_range(type, 0.0f, 1.0f, 0.0f);
-               return p;
-       }
-
-       std::string to_symbol(const Parameter& param) const {return "control";}
-};
-
-template<typename Time>
-class MySequence : public Sequence<Time> {
-public:
-       MySequence(DummyTypeMap&map, int size) : Sequence<Time>(map, size) {}
-       
-       boost::shared_ptr<Control> control_factory(const Parameter& param) {
-               
-               return boost::shared_ptr<Control>(
-                       new Control(param, boost::shared_ptr<ControlList> (
-                               new ControlList(param)
-               )));
-       }
-};
-
-template<typename Time>
-class TestSink : public EventSink<Time> {
-public:
-       TestSink() : _last_event_time(-1) {}
-       
-       /// return value, time, type, size, buffer
-       sigc::signal<uint32_t, Time, EventType, uint32_t, const uint8_t*> writing;
-       
-       virtual uint32_t write(Time time, EventType type, uint32_t size, const uint8_t* buf) {
-               std::cerr << "last event time: " << _last_event_time << " time: " << time << std::endl;
-               uint32_t result = writing(time, type, size, buf);
-               _last_event_time = time;
-               return result;
-       }
-       
-       uint32_t assertLastEventTimeLessOrEqualEventTime(
-               Time time, EventType type, uint32_t size, const uint8_t* buf) {
-               assert(_last_event_time <= time);
-               return 0;
-       }
-       
-       Time last_event_time() const { return _last_event_time; }
-       
-private:
-       Time _last_event_time;
-};
-
-class SequenceTest : public CppUnit::TestFixture
-{
-    CPPUNIT_TEST_SUITE (SequenceTest);
-    CPPUNIT_TEST (createTest);
-    CPPUNIT_TEST (preserveEventOrderingTest);
-    CPPUNIT_TEST_SUITE_END ();
-
-    public:
-    
-       typedef double Time;
-               typedef std::vector<boost::shared_ptr<Note<Time> > > Notes;
-               
-        void setUp (void) { 
-               std::cerr << "SetUp" << std::endl;
-               type_map = new DummyTypeMap();
-               assert(type_map);
-               seq = new MySequence<Time>(*type_map, 0);
-               assert(seq);
-               
-               for(int i = 0; i < 12; i++) {
-                       test_notes.push_back(boost::shared_ptr<Note<Time> >
-                                       (new Note<Time>(0, i * 100, 100, 64 + i, 64)));
-               }
-        }
-        
-        void tearDown (void) {
-               test_notes.clear();
-               delete seq;
-               delete type_map;
-        }
-
-        void createTest (void);
-        void preserveEventOrderingTest (void);
-
-    private:
-               DummyTypeMap*       type_map;
-               MySequence<Time>*   seq;
-               
-               Notes test_notes;
-};

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 1d94e59e68685c8af04130c3e6b2bd55f641cf08..32386f29f64615a6910018942393febcb8febac2 100644 (file)
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -63,7 +63,7 @@ def build(bld):
        # Unit tests
        obj              = bld.new_task_gen('cxx', 'program')
        obj.source       = '''
-               test/sequence.cpp
+               test/SequenceTest.cpp
                test/testrunner.cpp
        '''
        obj.includes     = ['.', './src']