[dubbo-samples] branch master updated: fix migration it (#454)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git


The following commit(s) were added to refs/heads/master by this push:
     new e409e261 fix migration it (#454)
e409e261 is described below

commit e409e261ebae4bbfd407b9c1aef5f47c71126c7c
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Tue Jun 7 17:17:40 2022 +0800

    fix migration it (#454)
---
 .../dubbo/demo/consumer/DemoServiceConfigIT.java      | 19 ++++++++++---------
 .../org/apache/dubbo/demo/consumer/DemoServiceIT.java |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceConfigIT.java b/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceConfigIT.java
index 318824c4..d2a06680 100644
--- a/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceConfigIT.java
+++ b/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceConfigIT.java
@@ -26,8 +26,10 @@ import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.FrameworkModel;
 
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,10 +40,15 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import java.util.HashMap;
 
 public class DemoServiceConfigIT {
-    private ApplicationModel applicationModel;
+    private static ApplicationModel applicationModel;
 
-    @Before
-    public void setup() {
+    @After
+    public void teardown() {
+        System.clearProperty("dubbo.application.service-discovery.migration");
+    }
+
+    @BeforeClass
+    public static void setup() {
         applicationModel = FrameworkModel.defaultModel().newApplication();
         ApplicationConfig applicationConfig = new ApplicationConfig(applicationModel);
         applicationConfig.setName("dubbo-servicediscovery-migration-consumer");
@@ -57,12 +64,6 @@ public class DemoServiceConfigIT {
         UpgradeUtil.clearRule(applicationModel);
     }
 
-    @After
-    public void teardown() {
-        System.clearProperty("dubbo.application.service-discovery.migration");
-        applicationModel.destroy();
-    }
-
     private DemoService buildNormal(String mode) {
         ReferenceConfig<DemoService> referenceConfig = new ReferenceConfig<>(applicationModel.newModule());
         referenceConfig.setInterface(DemoService.class);
diff --git a/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceIT.java b/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceIT.java
index 70ed95f7..2ca6e090 100644
--- a/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceIT.java
+++ b/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceIT.java
@@ -44,6 +44,7 @@ public class DemoServiceIT {
 
     @Test
     public void test() throws InterruptedException {
+        FrameworkStatusReporterImpl.clearReport();
         // FORCE_INTERFACE --> APPLICATION_FIRST
         testInterface();
         testApplication();


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org