Skip to content
Snippets Groups Projects
Commit 2cf13137 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

adapt test

parent 30c89d4a
No related branches found
No related tags found
1 merge request!2141GUI/View rename files and directory
......@@ -27,9 +27,7 @@ const QString SelectedRank("SelectedRank");
} // namespace Tag
} // namespace
DatafilesModel::DatafilesModel(InstrumentModel* instrumentModel, QObject* parent)
: QObject(parent)
, m_instrumentModel(instrumentModel)
DatafilesModel::DatafilesModel()
{
setObjectName("DatafilesModel");
}
......
......@@ -28,7 +28,7 @@ class DatafileItem;
class DatafilesModel : public QObject {
Q_OBJECT
public:
explicit DatafilesModel(InstrumentModel* instrumentModel = nullptr, QObject* parent = nullptr);
explicit DatafilesModel();
~DatafilesModel();
QVector<DataItem*> dataItems() const;
......@@ -61,7 +61,6 @@ public:
private:
DatafilesCleaner dataFilesCleaner;
InstrumentModel* m_instrumentModel;
std::vector<std::unique_ptr<DatafileItem>> m_realItems;
int m_selectedIndex = -1;
int m_selectedRank = -1;
......
......@@ -52,7 +52,6 @@ const QString ActiveView("ActiveView");
ProjectDocument::ProjectDocument()
: m_modified(false)
, m_instrumentEditController(&m_instrumentModel)
, m_realModel(&m_instrumentModel)
, m_lastViewActive(GUI::ID::ViewId::Instrument)
{
connect(&m_instrumentEditController, &MultiInstrumentNotifier::instrumentAddedOrRemoved, this,
......
......@@ -84,7 +84,7 @@ TEST(TestDatafilesModel, saveXMLData)
UTest::GUI::create_dir(dir);
InstrumentModel instrument_model;
DatafilesModel model1(&instrument_model);
DatafilesModel model1;
// add specular DatafileItems with non-default parameters
auto* spec1 = model1.insertDataItem(1);
......@@ -118,7 +118,7 @@ TEST(TestDatafilesModel, saveXMLData)
EXPECT_TRUE(QFile::exists(file1));
// read data to the second model
DatafilesModel model2(&instrument_model);
DatafilesModel model2;
UTest::GUI::readXMLFile<DatafilesModel>(file1, model2, tag);
// write the second model back to disk
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment