You've already forked FrameTour-BE
refactor(scenic): 替换ScenicConfigEntity为ScenicConfigManager
- 将所有使用ScenicConfigEntity的地方替换为ScenicConfigManager - 更新获取景区配置的方法调用 - 修改属性访问方式为通过manager的getter方法 - 移除已废弃的ScenicConfigEntity类及相关方法 - 统一配置读取接口,提高代码一致性与可维护性
This commit is contained in:
@@ -35,7 +35,7 @@ class PrepareContextStageTest {
|
||||
private ScenicService scenicService;
|
||||
|
||||
@Mock
|
||||
private ScenicConfigManager scenicConfig;
|
||||
private ScenicConfigManager configManager;
|
||||
|
||||
@Mock
|
||||
private IFaceBodyAdapter faceBodyAdapter;
|
||||
@@ -55,7 +55,7 @@ class PrepareContextStageTest {
|
||||
// Given
|
||||
FaceEntity face = createFace(1L, 100L, 10L, 0); // isManual=0
|
||||
when(faceRepository.getFace(1L)).thenReturn(face);
|
||||
when(scenicRepository.getScenicConfigManager(10L)).thenReturn(scenicConfig);
|
||||
when(scenicRepository.getScenicConfigManager(10L)).thenReturn(configManager);
|
||||
when(scenicService.getScenicFaceBodyAdapter(10L)).thenReturn(faceBodyAdapter);
|
||||
|
||||
// When
|
||||
@@ -64,7 +64,7 @@ class PrepareContextStageTest {
|
||||
// Then
|
||||
assertTrue(result.isSuccess());
|
||||
assertEquals(face, context.getFace());
|
||||
assertEquals(scenicConfig, context.getScenicConfig());
|
||||
assertEquals(configManager, context.getScenicConfig());
|
||||
assertEquals(faceBodyAdapter, context.getFaceBodyAdapter());
|
||||
verify(faceRepository, times(1)).getFace(1L);
|
||||
verify(scenicRepository, times(1)).getScenicConfigManager(10L);
|
||||
@@ -110,7 +110,7 @@ class PrepareContextStageTest {
|
||||
context = FaceMatchingContext.forAutoMatching(1L, true);
|
||||
FaceEntity face = createFace(1L, 100L, 10L, 1); // isManual=1
|
||||
when(faceRepository.getFace(1L)).thenReturn(face);
|
||||
when(scenicRepository.getScenicConfigManager(10L)).thenReturn(scenicConfig);
|
||||
when(scenicRepository.getScenicConfigManager(10L)).thenReturn(configManager);
|
||||
when(scenicService.getScenicFaceBodyAdapter(10L)).thenReturn(faceBodyAdapter);
|
||||
|
||||
// When
|
||||
@@ -119,7 +119,7 @@ class PrepareContextStageTest {
|
||||
// Then
|
||||
assertTrue(result.isSuccess());
|
||||
assertEquals(face, context.getFace());
|
||||
assertEquals(scenicConfig, context.getScenicConfig());
|
||||
assertEquals(configManager, context.getScenicConfig());
|
||||
assertEquals(faceBodyAdapter, context.getFaceBodyAdapter());
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ class PrepareContextStageTest {
|
||||
// Given
|
||||
FaceEntity face = createFace(1L, 100L, 10L, 0);
|
||||
when(faceRepository.getFace(1L)).thenReturn(face);
|
||||
when(scenicRepository.getScenicConfigManager(10L)).thenReturn(scenicConfig);
|
||||
when(scenicRepository.getScenicConfigManager(10L)).thenReturn(configManager);
|
||||
when(scenicService.getScenicFaceBodyAdapter(10L)).thenReturn(null); // 无适配器
|
||||
|
||||
// When
|
||||
@@ -138,7 +138,7 @@ class PrepareContextStageTest {
|
||||
assertTrue(result.isFailed());
|
||||
assertTrue(result.getMessage().contains("人脸识别服务不可用"));
|
||||
assertEquals(face, context.getFace());
|
||||
assertEquals(scenicConfig, context.getScenicConfig());
|
||||
assertEquals(configManager, context.getScenicConfig());
|
||||
assertNull(context.getFaceBodyAdapter());
|
||||
}
|
||||
|
||||
@@ -148,7 +148,7 @@ class PrepareContextStageTest {
|
||||
context = FaceMatchingContext.forAutoMatching(1L, false); // 老用户
|
||||
FaceEntity face = createFace(1L, 100L, 10L, 0);
|
||||
when(faceRepository.getFace(1L)).thenReturn(face);
|
||||
when(scenicRepository.getScenicConfigManager(10L)).thenReturn(scenicConfig);
|
||||
when(scenicRepository.getScenicConfigManager(10L)).thenReturn(configManager);
|
||||
when(scenicService.getScenicFaceBodyAdapter(10L)).thenReturn(faceBodyAdapter);
|
||||
|
||||
// When
|
||||
@@ -165,7 +165,7 @@ class PrepareContextStageTest {
|
||||
context = FaceMatchingContext.forRecognitionOnly(1L);
|
||||
FaceEntity face = createFace(1L, 100L, 10L, 0);
|
||||
when(faceRepository.getFace(1L)).thenReturn(face);
|
||||
when(scenicRepository.getScenicConfigManager(10L)).thenReturn(scenicConfig);
|
||||
when(scenicRepository.getScenicConfigManager(10L)).thenReturn(configManager);
|
||||
when(scenicService.getScenicFaceBodyAdapter(10L)).thenReturn(faceBodyAdapter);
|
||||
|
||||
// When
|
||||
|
||||
Reference in New Issue
Block a user