@@ -105,8 +105,14 @@ TEST(Widget, widget_constructors)
105
105
EXPECT_NO_THROW (generictablewidget_ptr = new GenericTableWidget (" empty_generic_table" ));
106
106
delete generictablewidget_ptr;
107
107
108
+ struct ExplorerWidgetObserverTest : public IExplorerWidgetObserver
109
+ {
110
+ virtual void onExplorerCheckboxesChanged ()
111
+ {
112
+ }
113
+ } explorer_observer_test;
108
114
ExplorerWidget* explorerwidget_ptr = nullptr ;
109
- EXPECT_NO_THROW (explorerwidget_ptr = new ExplorerWidget (" empty_explorer_table" ));
115
+ EXPECT_NO_THROW (explorerwidget_ptr = new ExplorerWidget (" empty_explorer_table" , " empty_explorer_table " , explorer_observer_test ));
110
116
delete explorerwidget_ptr;
111
117
}
112
118
@@ -391,8 +397,8 @@ TEST(WorfklowStepNodeGraph, updateCommands)
391
397
class SessionFilesWidget_Test : public SessionFilesWidget
392
398
{
393
399
public:
394
- SessionFilesWidget_Test (ApplicationHandler& application_handler, SessionFilesWidget::Mode mode, WorkflowManager& workflow_manager) :
395
- SessionFilesWidget (application_handler, mode, workflow_manager, nullptr )
400
+ SessionFilesWidget_Test (ApplicationHandler& application_handler, SessionFilesWidget::Mode mode, WorkflowManager& workflow_manager, SplitWindow& split_window ) :
401
+ SessionFilesWidget (application_handler, mode, workflow_manager, split_window, nullptr )
396
402
{};
397
403
398
404
public:
@@ -426,10 +432,12 @@ class SessionFilesWidget_Test : public SessionFilesWidget
426
432
427
433
TEST (SessionFilesWidget, SessionFilesWidget_Create)
428
434
{
435
+ AllWindows all_windows;
436
+ SplitWindow split_window (all_windows);
429
437
ApplicationHandler application_handler;
430
438
WorkflowManager workflow_manager;
431
439
Filenames filenames = Utilities::buildFilenamesFromDirectory (application_handler, SMARTPEAK_GET_TEST_DATA_PATH (" workflow_csv_files" ));
432
- SessionFilesWidget_Test session_widget_test (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager);
440
+ SessionFilesWidget_Test session_widget_test (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager, split_window );
433
441
434
442
session_widget_test.open (filenames);
435
443
auto & file_editor_fields = session_widget_test.getEditorFileFields ();
@@ -454,20 +462,24 @@ TEST(SessionFilesWidget, SessionFilesWidget_Create)
454
462
455
463
TEST (SessionFilesWidget, SessionFilesWidget_isModified)
456
464
{
465
+ AllWindows all_windows;
466
+ SplitWindow split_window (all_windows);
457
467
ApplicationHandler application_handler;
458
468
WorkflowManager workflow_manager;
459
469
Filenames filenames = Utilities::buildFilenamesFromDirectory (application_handler, SMARTPEAK_GET_TEST_DATA_PATH (" workflow_csv_files" ));
460
- SessionFilesWidget_Test session_widget_test (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager);
470
+ SessionFilesWidget_Test session_widget_test (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager, split_window );
461
471
session_widget_test.open (filenames);
462
472
EXPECT_EQ (session_widget_test.isModified (" parameters" ), false );
463
473
}
464
474
465
475
TEST (SessionFilesWidget, SessionFilesWidget_clearEntry)
466
476
{
477
+ AllWindows all_windows;
478
+ SplitWindow split_window (all_windows);
467
479
ApplicationHandler application_handler;
468
480
WorkflowManager workflow_manager;
469
481
Filenames filenames = Utilities::buildFilenamesFromDirectory (application_handler, SMARTPEAK_GET_TEST_DATA_PATH (" workflow_csv_files" ));
470
- SessionFilesWidget_Test session_widget_test (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager);
482
+ SessionFilesWidget_Test session_widget_test (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager, split_window );
471
483
session_widget_test.open (filenames);
472
484
473
485
auto & file_editor_fields = session_widget_test.getEditorFileFields ();
@@ -484,10 +496,12 @@ TEST(SessionFilesWidget, SessionFilesWidget_clearEntry)
484
496
485
497
TEST (SessionFilesWidget, SessionFilesWidget_doUpdateSession)
486
498
{
499
+ AllWindows all_windows;
500
+ SplitWindow split_window (all_windows);
487
501
ApplicationHandler application_handler;
488
502
WorkflowManager workflow_manager;
489
503
Filenames filenames = Utilities::buildFilenamesFromDirectory (application_handler, SMARTPEAK_GET_TEST_DATA_PATH (" workflow_csv_files" ));
490
- SessionFilesWidget_Test session_widget_test (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager);
504
+ SessionFilesWidget_Test session_widget_test (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager, split_window );
491
505
492
506
session_widget_test.open (filenames);
493
507
session_widget_test.doUpdateSession ();
@@ -502,14 +516,16 @@ TEST(SessionFilesWidget, SessionFilesWidget_doUpdateSession)
502
516
503
517
TEST (SessionFilesWidget, SessionFilesWidget_Modify_ChangeExternalFile)
504
518
{
519
+ AllWindows all_windows;
520
+ SplitWindow split_window (all_windows);
505
521
ApplicationHandler application_handler;
506
522
WorkflowManager workflow_manager;
507
523
Filenames filenames = Utilities::buildFilenamesFromDirectory (application_handler, SMARTPEAK_GET_TEST_DATA_PATH (" workflow_csv_files" ));
508
- SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager);
524
+ SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager, split_window );
509
525
session_widget_test_create.open (filenames);
510
526
session_widget_test_create.doUpdateSession ();
511
527
512
- SessionFilesWidget_Test session_widget_test_modify (application_handler, SessionFilesWidget::Mode::EModification, workflow_manager);
528
+ SessionFilesWidget_Test session_widget_test_modify (application_handler, SessionFilesWidget::Mode::EModification, workflow_manager, split_window );
513
529
session_widget_test_modify.open (application_handler.filenames_ );
514
530
515
531
auto & file_editor_fields = session_widget_test_modify.getEditorFileFields ();
@@ -540,14 +556,16 @@ TEST(SessionFilesWidget, SessionFilesWidget_Modify_ChangeExternalFile)
540
556
541
557
TEST (SessionFilesWidget, SessionFilesWidget_Modify_ChangeFromExternalToEmbedded)
542
558
{
559
+ AllWindows all_windows;
560
+ SplitWindow split_window (all_windows);
543
561
ApplicationHandler application_handler;
544
562
WorkflowManager workflow_manager;
545
563
Filenames filenames = Utilities::buildFilenamesFromDirectory (application_handler, SMARTPEAK_GET_TEST_DATA_PATH (" workflow_csv_files" ));
546
- SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager);
564
+ SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager, split_window );
547
565
session_widget_test_create.open (filenames);
548
566
session_widget_test_create.doUpdateSession ();
549
567
550
- SessionFilesWidget_Test session_widget_test_modify (application_handler, SessionFilesWidget::Mode::EModification, workflow_manager);
568
+ SessionFilesWidget_Test session_widget_test_modify (application_handler, SessionFilesWidget::Mode::EModification, workflow_manager, split_window );
551
569
session_widget_test_modify.open (application_handler.filenames_ );
552
570
553
571
auto & file_editor_fields = session_widget_test_modify.getEditorFileFields ();
@@ -582,7 +600,7 @@ TEST(SessionFilesWidget, SessionFilesWidget_Modify_ChangeFromExternalToEmbedded)
582
600
auto db_path = tmp_dir_path / " session.db" ;
583
601
SaveSession save_session (application_handler);
584
602
save_session.onFilePicked (db_path, &application_handler);
585
- auto session_widget_test_modify2 = std::make_shared<SessionFilesWidget>(application_handler, SessionFilesWidget::Mode::EModification, workflow_manager);
603
+ auto session_widget_test_modify2 = std::make_shared<SessionFilesWidget>(application_handler, SessionFilesWidget::Mode::EModification, workflow_manager, split_window );
586
604
auto load_session_wizard_ = std::make_shared<LoadSessionWizard>(session_widget_test_modify2, workflow_manager, application_handler);
587
605
load_session_wizard_->onFilePicked (db_path, &application_handler);
588
606
ParameterSet& parameter_set3 = application_handler.sequenceHandler_ .getSequence ().at (0 ).getRawData ().getParameters ();
@@ -593,10 +611,12 @@ TEST(SessionFilesWidget, SessionFilesWidget_Modify_ChangeFromExternalToEmbedded)
593
611
594
612
TEST (SessionFilesWidget, SessionFilesWidget_Modify_FileContent)
595
613
{
614
+ AllWindows all_windows;
615
+ SplitWindow split_window (all_windows);
596
616
ApplicationHandler application_handler;
597
617
WorkflowManager workflow_manager;
598
618
Filenames filenames = Utilities::buildFilenamesFromDirectory (application_handler, SMARTPEAK_GET_TEST_DATA_PATH (" workflow_csv_files" ));
599
- SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager);
619
+ SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager, split_window );
600
620
session_widget_test_create.open (filenames);
601
621
session_widget_test_create.doUpdateSession ();
602
622
@@ -606,7 +626,7 @@ TEST(SessionFilesWidget, SessionFilesWidget_Modify_FileContent)
606
626
parameter_set.findParameter (" AbsoluteQuantitation" , " min_points" )->setValueFromString (" 42" );
607
627
application_handler.sequenceHandler_ .notifyParametersUpdated ();
608
628
609
- SessionFilesWidget_Test session_widget_test_modify (application_handler, SessionFilesWidget::Mode::EModification, workflow_manager);
629
+ SessionFilesWidget_Test session_widget_test_modify (application_handler, SessionFilesWidget::Mode::EModification, workflow_manager, split_window );
610
630
session_widget_test_modify.open (application_handler.filenames_ );
611
631
// only the parameter data source should be tagged as to be saved
612
632
auto & file_editor_fields = session_widget_test_modify.getEditorFileFields ();
@@ -618,10 +638,12 @@ TEST(SessionFilesWidget, SessionFilesWidget_Modify_FileContent)
618
638
619
639
TEST (SessionFilesWidget, SessionFilesWidget_Modify_NoPopupError)
620
640
{
641
+ AllWindows all_windows;
642
+ SplitWindow split_window (all_windows);
621
643
ApplicationHandler application_handler;
622
644
WorkflowManager workflow_manager;
623
645
Filenames filenames = Utilities::buildFilenamesFromDirectory (application_handler, SMARTPEAK_GET_TEST_DATA_PATH (" workflow_csv_files" ));
624
- SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager);
646
+ SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager, split_window );
625
647
session_widget_test_create.open (filenames);
626
648
627
649
// Clear all, keep sequence and parameters both embedded
@@ -646,7 +668,7 @@ TEST(SessionFilesWidget, SessionFilesWidget_Modify_NoPopupError)
646
668
save_session.onFilePicked (db_path, &application_handler);
647
669
648
670
// load session
649
- auto session_widget_test_modify = std::make_shared<SessionFilesWidget>(application_handler, SessionFilesWidget::Mode::EModification, workflow_manager);
671
+ auto session_widget_test_modify = std::make_shared<SessionFilesWidget>(application_handler, SessionFilesWidget::Mode::EModification, workflow_manager, split_window );
650
672
auto load_session_wizard_ = std::make_shared<LoadSessionWizard>(session_widget_test_modify, workflow_manager, application_handler);
651
673
load_session_wizard_->onFilePicked (db_path, &application_handler);
652
674
@@ -660,10 +682,12 @@ TEST(SessionFilesWidget, SessionFilesWidget_Modify_NoPopupError)
660
682
661
683
TEST (SessionFilesWidget, LoadSessionWizard_PopupError)
662
684
{
685
+ AllWindows all_windows;
686
+ SplitWindow split_window (all_windows);
663
687
ApplicationHandler application_handler;
664
688
WorkflowManager workflow_manager;
665
689
Filenames filenames = Utilities::buildFilenamesFromDirectory (application_handler, SMARTPEAK_GET_TEST_DATA_PATH (" workflow_csv_files" ));
666
- SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager);
690
+ SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager, split_window );
667
691
session_widget_test_create.open (filenames);
668
692
669
693
// Clear all, keep sequence and parameters, sequence only embedded
@@ -693,7 +717,7 @@ TEST(SessionFilesWidget, LoadSessionWizard_PopupError)
693
717
save_session.onFilePicked (db_path, &application_handler);
694
718
695
719
// load session
696
- auto session_widget_test_modify = std::make_shared<SessionFilesWidget_Test>(application_handler, SessionFilesWidget::Mode::EModification, workflow_manager);
720
+ auto session_widget_test_modify = std::make_shared<SessionFilesWidget_Test>(application_handler, SessionFilesWidget::Mode::EModification, workflow_manager, split_window );
697
721
auto session_widget_modify = std::static_pointer_cast<SessionFilesWidget>(session_widget_test_modify);
698
722
auto load_session_wizard_ = std::make_shared<LoadSessionWizard>(session_widget_modify, workflow_manager, application_handler);
699
723
load_session_wizard_->onFilePicked (db_path, &application_handler);
@@ -726,8 +750,10 @@ TEST(SessionFilesWidget, LoadSessionWizard_IncorrectSessionFile)
726
750
std::string error_;
727
751
};
728
752
// load session (incorrect file: we will use one parameter file instead)
753
+ AllWindows all_windows;
754
+ SplitWindow split_window (all_windows);
729
755
TestApplicationObserver test_application_observer;
730
- auto session_widget_test_modify = std::make_shared<SessionFilesWidget_Test>(application_handler, SessionFilesWidget::Mode::EModification, workflow_manager);
756
+ auto session_widget_test_modify = std::make_shared<SessionFilesWidget_Test>(application_handler, SessionFilesWidget::Mode::EModification, workflow_manager, split_window );
731
757
auto session_widget_modify = std::static_pointer_cast<SessionFilesWidget>(session_widget_test_modify);
732
758
auto load_session_wizard_ = std::make_shared<LoadSessionWizard>(
733
759
session_widget_modify,
@@ -743,11 +769,13 @@ TEST(SessionFilesWidget, SessionFilesWidget_EmbedAllFiles)
743
769
{
744
770
// More integration test like,
745
771
// we just try to embed lot of file from different nature: parameters, feature filters files ...
746
- // Note: we save in working directory as this implies differrent cases compared to other test case above.
772
+ // Note: we save in working directory as this implies different cases compared to other test case above.
773
+ AllWindows all_windows;
774
+ SplitWindow split_window (all_windows);
747
775
ApplicationHandler application_handler;
748
776
WorkflowManager workflow_manager;
749
777
Filenames filenames = Utilities::buildFilenamesFromDirectory (application_handler, SMARTPEAK_GET_TEST_DATA_PATH (" workflow_csv_files" ));
750
- SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager);
778
+ SessionFilesWidget_Test session_widget_test_create (application_handler, SessionFilesWidget::Mode::ECreation, workflow_manager, split_window );
751
779
session_widget_test_create.open (filenames);
752
780
auto & file_editor_fields = session_widget_test_create.getEditorFileFields ();
753
781
EXPECT_EQ (file_editor_fields.size (), 24 );
@@ -776,7 +804,7 @@ TEST(SessionFilesWidget, SessionFilesWidget_EmbedAllFiles)
776
804
SaveSession save_session (application_handler);
777
805
save_session.onFilePicked (db_path, &application_handler);
778
806
779
- auto session_widget_test_modify = std::make_shared<SessionFilesWidget_Test>(application_handler, SessionFilesWidget::Mode::EModification, workflow_manager);
807
+ auto session_widget_test_modify = std::make_shared<SessionFilesWidget_Test>(application_handler, SessionFilesWidget::Mode::EModification, workflow_manager, split_window );
780
808
auto session_widget_modify = std::static_pointer_cast<SessionFilesWidget>(session_widget_test_modify);
781
809
auto load_session_wizard_ = std::make_shared<LoadSessionWizard>(session_widget_modify, workflow_manager, application_handler);
782
810
load_session_wizard_->onFilePicked (db_path, &application_handler);
0 commit comments