From fe185a5eb4669e925af908153bdf21778551fdb4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 20:23:36 +0800
Subject: [PATCH] 增加固化流程文件内容比对接口
---
blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/ProgramAnnotationServiceTest.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/ProgramAnnotationServiceTest.java b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/ProgramAnnotationServiceTest.java
index 352578b..44b3136 100644
--- a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/ProgramAnnotationServiceTest.java
+++ b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/ProgramAnnotationServiceTest.java
@@ -2,7 +2,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.springblade.system.pojo.entity.Dict;
+import org.springblade.system.pojo.entity.DictBiz;
import java.util.Arrays;
import java.util.List;
@@ -12,40 +12,37 @@
@Test
public void testIsAnnotation(){
ProgramAnnotationService s = new ProgramAnnotationService();
- Dict fanucDict = new Dict();
+ DictBiz fanucDict = new DictBiz();
fanucDict.setCode("machine_annotation");
fanucDict.setDictKey("FANUC");
fanucDict.setRemark("(,)");
- Dict xmz = new Dict();
+ DictBiz xmz = new DictBiz();
xmz.setCode("machine_annotation");
xmz.setDictKey("XIMENZI");
xmz.setRemark("*-,");
- List<Dict> dictList = Arrays.asList(fanucDict, xmz);
+ List<DictBiz> dictList = Arrays.asList(fanucDict, xmz);
Assertions.assertTrue(s.isAnnotation("(abc)","FANUC", dictList));
-
Assertions.assertFalse(s.isAnnotation("*-","FANUC",dictList));
-
Assertions.assertTrue(s.isAnnotation("*-","XIMENZI", dictList));
}
@Test
public void testIsAnnotation2(){
ProgramAnnotationService s = new ProgramAnnotationService();
- Dict fanucDict = new Dict();
+ DictBiz fanucDict = new DictBiz();
fanucDict.setCode("machine_annotation");
fanucDict.setDictKey("FANUC");
fanucDict.setRemark("(,)");
- Dict xmz = new Dict();
+ DictBiz xmz = new DictBiz();
xmz.setCode("machine_annotation");
xmz.setDictKey("XIMENZI");
xmz.setRemark("*-,");
- List<Dict> dictList = Arrays.asList(fanucDict, xmz);
+ List<DictBiz> dictList = Arrays.asList(fanucDict, xmz);
Assertions.assertEquals("(A)",s.generateAnnotation("A","FANUC",dictList));
-
Assertions.assertEquals("*-A",s.generateAnnotation("A","XIMENZI",dictList));
}
--
Gitblit v1.9.3