From 05eff1d5b252f03449dcf59a7b4fb8debd54c668 Mon Sep 17 00:00:00 2001 From: JayWenStar <1599603313@qq.com> Date: Mon, 17 Jan 2022 23:01:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B:=20=E4=BF=AE=E5=A4=8DTestCase?= =?UTF-8?q?=E4=B8=AD=E5=85=A8=E5=B1=80=E5=8F=82=E6=95=B0=E7=9A=84=E5=88=86?= =?UTF-8?q?=E5=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sonic/controller/services/impl/TestCasesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java index 41f00f95..f723c2da 100644 --- a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java +++ b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java @@ -108,7 +108,7 @@ public JSONObject findSteps(int id) { Map> valueMap = new HashMap<>(); for (GlobalParams g : globalParamsList) { if (g.getParamsValue().contains("|")) { - List shuffle = Arrays.asList(g.getParamsValue().split("|")); + List shuffle = Arrays.asList(g.getParamsValue().split("\\|")); Collections.shuffle(shuffle); valueMap.put(g.getParamsKey(), shuffle); } else { From 2df1ea514f740b10691801375522282dc88b19cc Mon Sep 17 00:00:00 2001 From: JayWenStar <1599603313@qq.com> Date: Mon, 17 Jan 2022 23:36:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B:=20=E4=BF=AE=E5=A4=8D=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/sonic/controller/services/impl/StepsServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/StepsServiceImpl.java b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/StepsServiceImpl.java index 7126306a..0af3a687 100644 --- a/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/StepsServiceImpl.java +++ b/sonic-server-controller/src/main/java/org/cloud/sonic/controller/services/impl/StepsServiceImpl.java @@ -121,6 +121,7 @@ public void sortSteps(StepSort stepSort) { .le(Steps::getSort, stepSort.getStartId()) // >= .ge(Steps::getSort, stepSort.getEndId()) + .orderByAsc(Steps::getSort) .list(); if (stepSort.getDirection().equals("down")) {