From 4235aedfaea94ac6adc86d0db87d0eedd176fa49 Mon Sep 17 00:00:00 2001 From: Harry Jeffery Date: Wed, 15 Oct 2014 16:14:50 +0100 Subject: [PATCH] Refs #10301 Fix broken unit tests --- .../test/ReflLoadedMainViewPresenterTest.h | 10 +++++----- .../CustomInterfaces/test/ReflMainViewMockObjects.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ReflLoadedMainViewPresenterTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ReflLoadedMainViewPresenterTest.h index 5a74e69b1697..85b3847dc682 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/test/ReflLoadedMainViewPresenterTest.h +++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ReflLoadedMainViewPresenterTest.h @@ -77,7 +77,7 @@ class ReflLoadedMainViewPresenterTest : public CxxTest::TestSuite ITableWorkspace_sptr ws = createWorkspace(); TableRow row = ws->appendRow(); - row << "13460" << "0.7" << "13463" << "0.01" << "0.06" << "0.04" << "2" << "1" << ""; + row << "13460" << "0.7" << "13463" << "0.01" << "0.06" << "0.04" << 2.0 << 1 << ""; return ws; } @@ -487,9 +487,9 @@ class ReflLoadedMainViewPresenterTest : public CxxTest::TestSuite { auto ws = createWorkspace("TestWorkspace"); TableRow row = ws->appendRow(); - row << "dataA" << "0.7" << "13463,13464" << "0.01" << "0.06" << "0.04" << "1" << 1; + row << "dataA" << "0.7" << "13463,13464" << "0.01" << "0.06" << "0.04" << 1.0 << 1; row = ws->appendRow(); - row << "dataB" << "2.3" << "13463,13464" << "0.035" << "0.3" << "0.04" << "1" << 1; + row << "dataB" << "2.3" << "13463,13464" << "0.035" << "0.3" << "0.04" << 1.0 << 1; loadWorkspace("INTER13460", "dataA"); loadWorkspace("INTER13462", "dataB"); @@ -547,9 +547,9 @@ class ReflLoadedMainViewPresenterTest : public CxxTest::TestSuite auto ws = createWorkspace("TestWorkspace"); //Autofill everything we can TableRow row = ws->appendRow(); - row << "13460" << "" << "13463,13464" << "" << "" << "" << "1" << 1; + row << "13460" << "" << "13463,13464" << "" << "" << "" << 1.0 << 1; row = ws->appendRow(); - row << "13462" << "" << "13463,13464" << "" << "" << "" << "1" << 1; + row << "13462" << "" << "13463,13464" << "" << "" << "" << 1.0 << 1; MockView mockView; ReflLoadedMainViewPresenter presenter(ws,&mockView); diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h index fbf4504534cc..312289383f2c 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h +++ b/Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h @@ -46,13 +46,13 @@ class MockView : public ReflMainView void addDataForTest() { TableRow row = m_model->appendRow(); - row << "13460" << "0.7" << "13463,13464" << "0.01" << "0.06" << "0.04" << "1" << 3 << ""; + row << "13460" << "0.7" << "13463,13464" << "0.01" << "0.06" << "0.04" << 1.0 << 3 << ""; row = m_model->appendRow(); - row << "13462" << "2.3" << "13463,13464" << "0.035" << "0.3" << "0.04" << "1" << 3 << ""; + row << "13462" << "2.3" << "13463,13464" << "0.035" << "0.3" << "0.04" << 1.0 << 3 << ""; row = m_model->appendRow(); - row << "13469" << "0.7" << "13463,13464" << "0.01" << "0.06" << "0.04" << "1" << 1 << ""; + row << "13469" << "0.7" << "13463,13464" << "0.01" << "0.06" << "0.04" << 1.0 << 1 << ""; row = m_model->appendRow(); - row << "13470" << "2.3" << "13463,13464" << "0.035" << "0.3" << "0.04" << "1" << 1 << ""; + row << "13470" << "2.3" << "13463,13464" << "0.035" << "0.3" << "0.04" << 1.0 << 1 << ""; m_model->removeRow(0); } private: