forked from apache/incubator-seata
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bugfix: fix the inconsistent configuration item names related to Load…
…Balance (apache#5233)
- Loading branch information
1 parent
fc29936
commit d19cfee
Showing
12 changed files
with
98 additions
and
20 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
70 changes: 70 additions & 0 deletions
70
.../java/io/seata/spring/boot/autoconfigure/properties/client/LoadBalancePropertiesTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright 1999-2019 Seata.io Group. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.seata.spring.boot.autoconfigure.properties.client; | ||
|
|
||
| import io.seata.common.loader.EnhancedServiceLoader; | ||
| import io.seata.config.Configuration; | ||
| import io.seata.config.ExtConfigurationProvider; | ||
| import io.seata.config.FileConfiguration; | ||
| import io.seata.config.springcloud.SpringApplicationContextProvider; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.context.annotation.AnnotationConfigApplicationContext; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Import; | ||
|
|
||
| import static io.seata.spring.boot.autoconfigure.StarterConstants.LOAD_BALANCE_PREFIX; | ||
| import static io.seata.spring.boot.autoconfigure.StarterConstants.PROPERTY_BEAN_MAP; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| /** | ||
| * @author xingfudeshi@gmail.com | ||
| **/ | ||
| @Import(SpringApplicationContextProvider.class) | ||
| @org.springframework.context.annotation.Configuration | ||
| public class LoadBalancePropertiesTest { | ||
| private static AnnotationConfigApplicationContext applicationContext; | ||
|
|
||
| @BeforeAll | ||
| public static void initContext() { | ||
| applicationContext = new AnnotationConfigApplicationContext(LoadBalancePropertiesTest.class); | ||
| } | ||
|
|
||
| @Bean | ||
| LoadBalanceProperties loadBalanceProperties() { | ||
| LoadBalanceProperties loadBalanceProperties = new LoadBalanceProperties(); | ||
| PROPERTY_BEAN_MAP.put(LOAD_BALANCE_PREFIX, LoadBalanceProperties.class); | ||
| return loadBalanceProperties; | ||
| } | ||
|
|
||
| @Test | ||
| public void testLoadBalanceProperties() { | ||
| FileConfiguration configuration = mock(FileConfiguration.class); | ||
| Configuration currentConfiguration = | ||
| EnhancedServiceLoader.load(ExtConfigurationProvider.class).provide(configuration); | ||
| System.setProperty("seata.client.loadBalance.virtualNodes", "30"); | ||
| assertEquals(30, currentConfiguration.getInt("client.loadBalance.virtualNodes")); | ||
| System.setProperty("seata.client.loadBalance.type", "test"); | ||
| assertEquals("test", currentConfiguration.getConfig("client.loadBalance.type")); | ||
| } | ||
|
|
||
| @AfterAll | ||
| public static void closeContext() { | ||
| applicationContext.close(); | ||
| } | ||
| } |
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