diff --git a/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java index b411c34..d5897ce 100644 --- a/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java @@ -1,13 +1,5 @@ package com.test.test.service.impl; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.*; -import java.util.NoSuchElementException; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.reflect.TypeToken; @@ -16,7 +8,6 @@ import com.test.common.config.TestConfig; import com.test.common.utils.DateUtils; import com.test.common.utils.SecurityUtils; import com.test.common.utils.SeleniumUtils; -import com.test.common.utils.StringUtils; import com.test.test.domain.*; import com.test.test.domain.qo.*; import com.test.test.domain.vo.AssertionReportVO; @@ -25,21 +16,22 @@ import com.test.test.mapper.UiAutomationMapper; import com.test.test.mapper.UiSceneStepsMapper; import com.test.test.mapper.UiSceneStepsReportMapper; import com.test.test.service.*; -import io.github.bonigarcia.wdm.WebDriverManager; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.checkerframework.checker.units.qual.C; import org.openqa.selenium.*; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.support.ui.Select; import org.openqa.selenium.support.ui.UnexpectedTagNameException; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.NoSuchElementException; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + @Service @Slf4j @@ -103,7 +95,7 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService { createSceneStepsReport(orderNumber, step, reportId); } System.setProperty("webdriver.chrome.driver", chromeDriverPath); - + // 配置 ChromeOptions ChromeOptions options = new ChromeOptions(); @@ -1553,13 +1545,13 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService { // 从Map中获取前置和后置操作的数据集合 Map beforeData = (Map) extractedDataMap.get("beforeData"); Map afterData = (Map) extractedDataMap.get("afterData"); - + // 先从前置数据中查找,如果没有再从后置数据中查找 Object value = beforeData != null ? beforeData.get(inputValue) : null; if (value == null && afterData != null) { value = afterData.get(inputValue); } - + if (value != null) { inputValue = value.toString(); log.info("变量 {} 被替换为: {}", inputValue, value); @@ -1602,4 +1594,4 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService { } -} \ No newline at end of file +}