Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove and translate chinese to english in collector,script,push,remoting and manager module #1774

Merged
merged 18 commits into from
Apr 18, 2024
Merged

remove and translate chinese to english in collector,script,push,remoting and manager module #1774

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
183219b
#1759 Update assembly-linux-amd64.xml
MananPoojara Apr 17, 2024
50c2bed
#1759 Update assembly-linux-arm64.xml
MananPoojara Apr 17, 2024
a58022a
#1759 Update assembly-macos-amd64.xml
MananPoojara Apr 17, 2024
70052bd
#1759 Update assembly-macos-arm64.xml
MananPoojara Apr 17, 2024
48f394d
#1759 Update assembly-windows-64.xml
MananPoojara Apr 17, 2024
d844d7e
#1759 Update assembly.xml
MananPoojara Apr 17, 2024
8067254
#1759 Update pom.xml
MananPoojara Apr 17, 2024
384ccd6
#1759 Update AlertDefineControllerTest.java
MananPoojara Apr 17, 2024
a61a2f4
#1759 Update AlertDefinesControllerTest.java
MananPoojara Apr 17, 2024
7228b1d
#1759 Update AlertReportControllerTest.java
MananPoojara Apr 17, 2024
bbbddcd
#1759 Update AlertsControllerTest.java
MananPoojara Apr 17, 2024
e43060c
#1759 Update pom.xml
MananPoojara Apr 17, 2024
b989eaf
#1759 Update PushController.java
MananPoojara Apr 17, 2024
c96cf1c
#1759 Update PushGatewayController.java
MananPoojara Apr 17, 2024
35bd0a2
#1759 Update README.md
MananPoojara Apr 17, 2024
8661972
#1759 Update pom.xml
MananPoojara Apr 17, 2024
08a02f9
#1759 Update pom.xml
MananPoojara Apr 17, 2024
d9289d7
Merge branch 'master' into master
zqr10159 Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#1759 Update AlertsControllerTest.java 
Signed-off-by: Manan Pujara <[email protected]>
  • Loading branch information
@MananPoojara
MananPoojara committed Apr 17, 2024
commit bbbddcdd3079ac5924c4b759384c7b26e389eb00
6 changes: 3 additions & 3 deletions alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertsControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void setUp() {
// todo: fix this test
void getAlerts() throws Exception {

//定义要用到的测试值
// Define the test values
String sortField = "id";
String orderType = "asc";
int pageIndex = 0;
Expand All @@ -80,7 +80,7 @@ void getAlerts() throws Exception {
Page<Alert> alertPage = new PageImpl<>(Collections.singletonList(Alert.builder().build()));


//打桩
// Stubbing
Mockito.when(
alertService.getAlerts(
Mockito.any(Specification.class)
Expand Down Expand Up @@ -153,7 +153,7 @@ void applyAlertDefinesStatus() throws Exception {

@Test
void getAlertsSummary() throws Exception {
//打桩
// Stubbing
Mockito.when(alertService.getAlertsSummary()).thenReturn(new AlertSummary());

mockMvc.perform(
Expand Down