Skip to content

Commit

Permalink
修复UI测试
Browse files Browse the repository at this point in the history
  • Loading branch information
@chengyouling
chengyouling committed Jan 2, 2025
1 parent 1b69b04 commit f67de0f
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 24 deletions.
18 changes: 12 additions & 6 deletions ...transmit-plugin/src/test/java/io/sermant/router/transmit/wrapper/CallableWrapperTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ public class CallableWrapperTest extends BaseTest {
public void testCanTransmit() throws Exception {
Object obj = new Object();
CallableWrapper<Object> wrapper = new CallableWrapper<>(() -> {
Assert.assertNotNull(ThreadLocalUtils.getRequestData());
Assert.assertNotNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
return obj;
}, new RequestTag(null), new RequestData(null, null, null), false);

Expand All @@ -63,8 +65,10 @@ public void testCannotTransmit() throws Exception {

Object obj = new Object();
CallableWrapper<Object> wrapper = new CallableWrapper<>(() -> {
Assert.assertNull(ThreadLocalUtils.getRequestData());
Assert.assertNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
return obj;
}, new RequestTag(null), new RequestData(null, null, null), true);

Expand All @@ -73,7 +77,9 @@ public void testCannotTransmit() throws Exception {

Assert.assertEquals(obj, wrapper.call());

Assert.assertNull(ThreadLocalUtils.getRequestData());
Assert.assertNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
}
}
36 changes: 24 additions & 12 deletions ...ugin/src/test/java/io/sermant/router/transmit/wrapper/RunnableAndCallableWrapperTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ public class RunnableAndCallableWrapperTest extends BaseTest {
@Test
public void testRunCanTransmit() {
RunnableAndCallableWrapper<Object> wrapper = new RunnableAndCallableWrapper<>(() -> {
Assert.assertNotNull(ThreadLocalUtils.getRequestData());
Assert.assertNotNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
}, null, new RequestTag(null), new RequestData(null, null, null), false);

Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
Expand All @@ -62,25 +64,31 @@ public void testRunCannotTransmit() {
Assert.assertNotNull(ThreadLocalUtils.getRequestTag());

RunnableWrapper<Object> wrapper = new RunnableWrapper<>(() -> {
Assert.assertNull(ThreadLocalUtils.getRequestData());
Assert.assertNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
}, new RequestTag(null), new RequestData(null, null, null), true);

Assert.assertNull(ReflectUtils.getFieldValue(wrapper, "requestData").orElse(null));
Assert.assertNull(ReflectUtils.getFieldValue(wrapper, "requestTag").orElse(null));

wrapper.run();

Assert.assertNull(ThreadLocalUtils.getRequestData());
Assert.assertNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
}

@Test
public void testCallCanTransmit() throws Exception {
Object obj = new Object();
RunnableAndCallableWrapper<Object> wrapper = new RunnableAndCallableWrapper<>(null, () -> {
Assert.assertNotNull(ThreadLocalUtils.getRequestData());
Assert.assertNotNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
return obj;
}, new RequestTag(null), new RequestData(null, null, null), false);

Expand All @@ -106,8 +114,10 @@ public void testCallCannotTransmit() throws Exception {

Object obj = new Object();
CallableWrapper<Object> wrapper = new CallableWrapper<>(() -> {
Assert.assertNull(ThreadLocalUtils.getRequestData());
Assert.assertNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
return obj;
}, new RequestTag(null), new RequestData(null, null, null), true);

Expand All @@ -116,7 +126,9 @@ public void testCallCannotTransmit() throws Exception {

Assert.assertEquals(obj, wrapper.call());

Assert.assertNull(ThreadLocalUtils.getRequestData());
Assert.assertNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
}
}
18 changes: 12 additions & 6 deletions ...transmit-plugin/src/test/java/io/sermant/router/transmit/wrapper/RunnableWrapperTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ public class RunnableWrapperTest extends BaseTest {
@Test
public void testCanTransmit() {
RunnableWrapper<?> wrapper = new RunnableWrapper<>(() -> {
Assert.assertNotNull(ThreadLocalUtils.getRequestData());
Assert.assertNotNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
}, new RequestTag(null), new RequestData(null, null, null), false);

Assert.assertNull(ThreadLocalUtils.getRequestData());
Expand All @@ -60,16 +62,20 @@ public void testCannotTransmit() {
Assert.assertNotNull(ThreadLocalUtils.getRequestTag());

RunnableWrapper<Object> wrapper = new RunnableWrapper<>(() -> {
Assert.assertNull(ThreadLocalUtils.getRequestData());
Assert.assertNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
}, new RequestTag(null), new RequestData(null, null, null), true);

Assert.assertNull(ReflectUtils.getFieldValue(wrapper, "requestData").orElse(null));
Assert.assertNull(ReflectUtils.getFieldValue(wrapper, "requestTag").orElse(null));

wrapper.run();

Assert.assertNull(ThreadLocalUtils.getRequestData());
Assert.assertNull(ThreadLocalUtils.getRequestTag());
Assert.assertTrue(ThreadLocalUtils.getRequestData() == null
|| ThreadLocalUtils.getRequestData().getPath() == null);
Assert.assertTrue(ThreadLocalUtils.getRequestTag() == null
|| ThreadLocalUtils.getRequestTag().getTag().isEmpty());
}
}

0 comments on commit f67de0f

Please sign in to comment.