new jl selector refactoring

Signed-off-by: bdattoma <[email protected]>

Author: bdattoma

src/JupyterLibrary/clients/jupyterlab/Notebook.resource

@@ -55,11 +55,11 @@ Run Current JupyterLab Code Cell
 
 Get Selected Tab ID
     [Documentation]    Return the tab ID of the selected notebook tab
-    ${active-nb-tab} =    Get WebElement    xpath:${JL_TABBAR_SELECTED_XPATH}
+    ${active-nb-tab} =    Get WebElement    xpath:${JLAB XP DOCK TAB SELECTED}
     ${tab-id} =    Get Element Attribute    ${active-nb-tab}    id
     [Return]  ${tab-id}
 
 Select Tab By Name
     [Documentation]    Select a notebook tab by filename
     [Arguments]    ${filename}
-    Click Element    xpath:${JL_TABBAR_CONTENT_XPATH}/li/div[.="${filename}"]
+    Click Element    xpath:${JLAB XP DOCK TABBAR CONTENT}/li/div[.="${filename}"]

src/JupyterLibrary/clients/jupyterlab/Output.resource

@@ -46,11 +46,11 @@ Wait Until a Given JupyterLab Code Cell Is Not Active In a Given Tab
   [Documentation]  Waits until the given cell in a specific JL tab no longer has an active prompt "[*]:".
   ...              The cell index starts from 1 and you must count empty and markdown cells too.
   [Arguments]  ${tab_id_to_wait}  ${cell_n}  ${timeout}=120seconds
-  Wait Until Element Is Not Visible  xpath=//div[@aria-labelledby="${tab_id_to_wait}"]/${NB TAB XP CONTENT}/div[${cell_n}]/${CELL XP INPUT STATUS ICON}   ${timeout}
+  Wait Until Element Is Not Visible  xpath=//div[@aria-labelledby="${tab_id_to_wait}"]/${JLAB XP NOTEBOOK CONTENT}/div[${cell_n}]/${JLAB XP CELL INPUT STATUS ICON}   ${timeout}
 
 Get A JupyterLab Code Cell Output In a Given Tab
    [Documentation]  It returns the output of a given cell in a specific JL tab.
    ...              The cell index starts from 1 and you must count empty and markdown cells too.
    [Arguments]  ${tab_id_to_read}  ${cell_n}
-   ${outputtext}=  Get Text  xpath=//div[@aria-labelledby="${tab_id_to_read}"]/${NB TAB XP CONTENT}/div[${cell_n}]/${CELL XP OUTPUT TEXT}
+   ${outputtext}=  Get Text  xpath=//div[@aria-labelledby="${tab_id_to_read}"]/${JLAB XP NOTEBOOK CONTENT}/div[${cell_n}]/${JLAB XP CELL OUTPUT TEXT}}
    [Return]  ${outputtext}

src/JupyterLibrary/clients/jupyterlab/Selectors.resource

@@ -40,5 +40,14 @@ ${JLAB XP NB TOOLBAR}                   //div${JLAB XP NB TOOLBAR FRAG}
 ${JLAB XP BUSY KERNEL}                  //*[local-name() = 'div' and contains(@class, 'jp-FilledCircleIcon' or (local-name() = 'svg' and contains(@data-icon, 'ui-components:circle-filled')))]
 # dock panel
 ${JLAB XP DOCK PANEL}                   //*[@id = 'jp-main-dock-panel']
-${JLAB XP DOCK TAB}                     ${JLAB XP DOCK PANEL}//ul[contains(@class, 'p-TabBar-content')]/li[contains(@class, 'p-TabBar-tab')]
+${JLAB XP DOCK TABBAR CONTENT}          ${JLAB XP DOCK PANEL}//ul[contains(@class, 'p-TabBar-content')]
+${JLAB XP DOCK TAB}                     ${JLAB XP DOCK TABBAR CONTENT}/li[contains(@class, 'p-TabBar-tab')]
 ${JLAB XP DOCK TAB LABEL}               ${JLAB XP DOCK TAB}/div[contains(@class, 'p-TabBar-tabLabel')]
+${JLAB XP DOCK TAB SELECTED}            ${JLAB XP DOCK TABBAR CONTENT}/li[contains(@class,"lm-mod-current p-mod-current")]
+# notebook
+${JLAB XP CELL INPUT AREA}              div[contains(@class, p-Cell-inputWrapper)]/div[contains(@class,"jp-Cell-inputArea")]
+${JLAB XP CELL INPUT STATUS ICON}       ${JLAB XP CELL INPUT AREA}/div[contains(@class,"jp-InputArea-prompt") and (.="[*]:")]
+${JLAB XP CELL OUTPUT AREA}             div[contains(@class, jp-Cell-outputWrapper)]/div[contains(@class,"jp-Cell-outputArea")]
+${JLAB XP CELL OUTPUT TEXT}             ${JLAB XP CELL OUTPUT AREA}//div[contains(@class,"jp-RenderedText")]
+${JLAB XP NOTEBOOK CONTENT}             div[@aria-label="notebook content"]
+