Changeset 9934e48 in sasview


Ignore:
Timestamp:
Mar 24, 2017 3:21:15 AM (2 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
a0f5c36
Parents:
b1e36a3
Message:

Update unit tests for the current JSON

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

    rb1e36a3 r9934e48  
    165165 
    166166        # invoke the method by changing the index 
    167         category_index = self.widget.cbCategory.findText("Shape-Independent") 
     167        category_index = self.widget.cbCategory.findText("Shape Independent") 
    168168        self.widget.cbCategory.setCurrentIndex(category_index) 
    169169 
     
    175175 
    176176        # Observe no such luck 
    177         self.assertEqual(self.widget.cbCategory.currentIndex(), 1) 
     177        self.assertEqual(self.widget.cbCategory.currentIndex(), 6) 
    178178        self.assertEqual(self.widget.cbModel.count(), 29) 
    179179 
     
    191191        self.widget.show() 
    192192        # Change the category index so we have some models 
    193         category_index = self.widget.cbCategory.findText("Shape-Independent") 
     193        category_index = self.widget.cbCategory.findText("Shape Independent") 
    194194        self.widget.cbCategory.setCurrentIndex(category_index) 
    195195 
     
    208208        # Now change the model 
    209209        self.widget.cbModel.setCurrentIndex(3) 
    210         self.assertEqual(self.widget.cbModel.currentText(),'correlation_length') 
     210        self.assertEqual(self.widget.cbModel.currentText(),'dab') 
    211211 
    212212        # No data sent -> no index set, only createDefaultDataset called 
     
    219219        # Reset the sasmodel index 
    220220        self.widget.cbModel.setCurrentIndex(1) 
    221         self.assertEqual(self.widget.cbModel.currentText(),'be_polyelectrolyte') 
     221        self.assertEqual(self.widget.cbModel.currentText(),'broad_peak') 
    222222 
    223223        # Observe calculateQGridForModel called 
     
    230230        self.widget.show() 
    231231        # Change the category index so we have some models 
    232         category_index = self.widget.cbCategory.findText("Shape-Independent") 
     232        category_index = self.widget.cbCategory.findText("Shape Independent") 
    233233        self.widget.cbCategory.setCurrentIndex(category_index) 
    234234        # Change the model to one that supports structure factors 
     
    331331        self.widget.show() 
    332332        # Change the category index so we have a model with no poly 
    333         category_index = self.widget.cbCategory.findText("Shape-Independent") 
     333        category_index = self.widget.cbCategory.findText("Shape Independent") 
    334334        self.widget.cbCategory.setCurrentIndex(category_index) 
    335335        # Check the poly model 
     
    341341 
    342342        # Check the poly model 
    343         self.assertEqual(self.widget._poly_model.rowCount(), 3) 
     343        self.assertEqual(self.widget._poly_model.rowCount(), 4) 
    344344        self.assertEqual(self.widget._poly_model.columnCount(), 7) 
    345345 
     
    360360        self.widget.show() 
    361361        # Change the category index so we have a model available 
    362         category_index = self.widget.cbCategory.findText("Shapes") 
     362        category_index = self.widget.cbCategory.findText("Sphere") 
    363363        self.widget.cbCategory.setCurrentIndex(category_index) 
    364364 
     
    389389        self.widget.show() 
    390390        # Change the model to multi shell 
    391         category_index = self.widget.cbCategory.findText("Shapes") 
     391        category_index = self.widget.cbCategory.findText("Sphere") 
    392392        self.widget.cbCategory.setCurrentIndex(category_index) 
    393393        model_index = self.widget.cbModel.findText("core_multi_shell") 
Note: See TracChangeset for help on using the changeset viewer.