From 1c3c4444231252aa7821191db7774dafc20163e6 Mon Sep 17 00:00:00 2001
From: byb11 <byb11@DESKTOP-EM3PGKQ>
Date: Thu, 4 Feb 2021 14:08:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9ELogin=20Logs=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2Case=20=20=202.=E6=96=B0=E5=A2=9ELoginLogs=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=85=B3=E9=94=AE=E5=AD=97=20=203.=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=8E=9F=E6=9C=89=E7=9A=84Login=20logCase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tsg_ui/Administration/LoginLogsCase.robot | 26 ++++++++++
 01-TestCase/tsg_ui/ui_login/Logincase.robot   | 47 -------------------
 .../administration/Administration.robot       | 21 +++++++--
 3 files changed, 43 insertions(+), 51 deletions(-)
 create mode 100644 01-TestCase/tsg_ui/Administration/LoginLogsCase.robot
 delete mode 100644 01-TestCase/tsg_ui/ui_login/Logincase.robot

diff --git a/01-TestCase/tsg_ui/Administration/LoginLogsCase.robot b/01-TestCase/tsg_ui/Administration/LoginLogsCase.robot
new file mode 100644
index 0000000..c3f0ee6
--- /dev/null
+++ b/01-TestCase/tsg_ui/Administration/LoginLogsCase.robot
@@ -0,0 +1,26 @@
+*** Settings ***
+Force Tags        tsg-ui    Login Logs
+Resource          ../../../02-Keyword/tsg_ui/administration/Administration.robot
+Library           OperatingSystem
+*** Test Cases ***
+
+LoginLogsSearchOperator
+    ${a}  evaluate  random.randint(1000,9999)  random
+    UserCreatePage    0000    ${a}    111111   log    30    log    superuser
+    Login    ${a}    111111
+    AdminOpenPages    sidebarsystem_LoginLog    sidebarsystem_LoginLog
+    LoginLogsSearch    ${a}
+    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[6]/div/div/span/span    ${a}
+    Login    ${username}    ${password}
+    
+LoginLogsPagingDisplay
+    [Tags]    Positive    UI    Administration    Login Logs
+    AdminOpenPages    sidebarsystem_LoginLog    sidebarsystem_LoginLog
+    AuditLogs-PagingDisplay    100
+    
+LoginLogsAdminTurnPage
+    [Tags]    Positive    UI    Administration    Login Logs
+    AdminOpenPages    sidebarsystem_LoginLog    sidebarsystem_LoginLog
+    AdminTurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div/div[4]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div/div[4]/div/button[1]    //*[@id="app"]/div/div[3]/div[2]/div/div/div[4]/div/span[2]/div/input    2
+    ...    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span    1    //*[@id="app"]/div/div[3]/div[2]/div/div/div[4]/div/ul/li[last()] 
+   
\ No newline at end of file
diff --git a/01-TestCase/tsg_ui/ui_login/Logincase.robot b/01-TestCase/tsg_ui/ui_login/Logincase.robot
deleted file mode 100644
index e21ef7c..0000000
--- a/01-TestCase/tsg_ui/ui_login/Logincase.robot
+++ /dev/null
@@ -1,47 +0,0 @@
-*** Settings ***
-Force Tags        tsg-ui    login
-Resource          ../../../02-Keyword/tsg_ui/login/Login.robot
-Library           OperatingSystem
-Resource          ../../../02-Keyword/tsg_ui/Menu.robot
-
-*** Test Cases ***
-search-user-001
-	#打开界面
-    Ui-login
-    #查找
-    Ui-User-login-Search-Name    lyf
-    
-
-search-user-002
-    #打开界面
-    Ui-login
-    #查找
-    Ui-User-Search
-
-search-user-003
-    #打开界面
-    Ui-login
-    #查找
-    User-Search-Name    sunjiangyue
-	
-search-user-004
-    #打开界面
-    Ui-login
-    #查找
-    User-Search-Name      @*%&
-	
-search-user-005
-    #打开界面
-    Ui-login
-    #查找
-    User-Search-Name      a1@й
-	
-search-user-006
-    #打开界面
-    Ui-login
-    #查找
-    User-Search-Name      малый
-    
-user-007
-    Pages 
-    Ui-Pages    5  
\ No newline at end of file
diff --git a/02-Keyword/tsg_ui/administration/Administration.robot b/02-Keyword/tsg_ui/administration/Administration.robot
index 834cc81..68d82d4 100644
--- a/02-Keyword/tsg_ui/administration/Administration.robot
+++ b/02-Keyword/tsg_ui/administration/Administration.robot
@@ -227,6 +227,21 @@ AuditLogsSearch-NotID
     sleep    1
     click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/i
     sleep    2
+    
+LoginLogsSearch
+    [Arguments]    ${Operator}
+    sleep    2
+    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div/input
+    sleep    1
+    click element    xpath=/html/body/div/div[1]/div[1]/ul/li[2]
+    sleep    2
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div[3]/div/div/input    ${Operator}
+    sleep    2
+    click element    xpath=/html/body/div/div/div/ul/li/span[contains(text(), "${Operator}")]
+    sleep    1
+    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/i
+    sleep    2
+    
 
 Login
     [Arguments]    ${UserName}    ${Password}
@@ -335,11 +350,9 @@ AuditLogs-PagingDisplay
     ${Page1}    Evaluate    ${quzheng}+${b}
     ${Page}    Set Variable if    "${qumo}" != "0"    ${Page1}    ${qumo}
     sleep    1
-    ${text}    Get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[4]/div/ul/li[8]
+    ${text}    Get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[4]/div/ul/li[last()]
     Should Be Equal As Strings    ${text}    ${Page}
-    
-
-    
+      
 Assertion
     [Arguments]    ${assertxpath}    ${asserttext} 
     ${text}    Get text    xpath=${assertxpath}