[#5983] Fix unit tests in nacos-config #5995
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
realJackSun
force-pushed
the
fix5983
branch
3 times, most recently
from
19e501e to
bb57981
Compare
realJackSun
commented
Jun 15, 2021
| @@ -84,6 +84,9 @@ public void onEvent(Event event) { | |||
| Thread.sleep(2000); | |||
| Assert.assertNotNull(reference.get()); | |||
| reference.set(null); | |||
|
|
|||
| EnvUtil.setIsStandalone(true); | |||
| PropertyUtil.setEmbeddedStorage(true); | |||
There was a problem hiding this comment.
这个修改的动机是，这个单测会通过EnvUtil.setIsStandalone(false);破坏原来的EnvUtil的字段值。
这里两行代码，将EnvUtil重置为原先的值。
There was a problem hiding this comment.
在Before方法和After方法中去还原。否则异常情况下仍然会导致不会重制。
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; | ||
| import org.springframework.test.context.web.WebAppConfiguration; | ||
|
|
||
| @RunWith(SpringJUnit4ClassRunner.class) | ||
| @SpringBootTest | ||
| @SpringBootApplication(scanBasePackages = "com.alibaba.nacos") |
There was a problem hiding this comment.
这个和@lzf核对了一下，这个是为了让DumpServiceTest中的
@Autowired DumpService service;
能够扫描到所有的依赖。如果不加就会出现依赖找不到的错误。
| @@ -0,0 +1,36 @@ | |||
| # | |||
There was a problem hiding this comment.
加上这个配置文件的意义在于，没有这个配置文件，DumpServiceTest的前置@SpringBootTest就启动不了。
KomachiSion
requested changes
Jun 16, 2021
| @@ -84,6 +84,9 @@ public void onEvent(Event event) { | |||
| Thread.sleep(2000); | |||
| Assert.assertNotNull(reference.get()); | |||
| reference.set(null); | |||
|
|
|||
| EnvUtil.setIsStandalone(true); | |||
| PropertyUtil.setEmbeddedStorage(true); | |||
There was a problem hiding this comment.
在Before方法和After方法中去还原。否则异常情况下仍然会导致不会重制。
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; | ||
| import org.springframework.test.context.web.WebAppConfiguration; | ||
|
|
||
| @RunWith(SpringJUnit4ClassRunner.class) | ||
| @SpringBootTest | ||
| @SpringBootApplication(scanBasePackages = "com.alibaba.nacos") |
|
Please pull newest codes, which fix ci problem. |
KomachiSion
approved these changes
Jun 17, 2021
KomachiSion
approved these changes
Jun 17, 2021
KomachiSion
approved these changes
Jun 17, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #5983
What is the purpose of the change
XXXXX
Brief changelog
XX
Verifying this change
XXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
[ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=trueto make sure basic checks pass. Runmvn clean install -DskipITsto make sure unit-test pass. Runmvn clean test-compile failsafe:integration-testto make sure integration-test pass.