You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by il...@apache.org on 2019/07/10 03:21:21 UTC

[dubbo-samples] branch master updated: move sleep from test class into pom

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

iluo 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 912bcaf  move sleep from test class into pom
912bcaf is described below

commit 912bcaf903859b3a37af35f5107ee5476985355b
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Wed Jul 10 11:19:17 2019 +0800

    move sleep from test class into pom
---
 .../pom.xml                                         | 21 +++++++++++++++++++++
 .../metadatareport/configcenter/MetadataIT.java     |  6 ------
 .../pom.xml                                         | 21 +++++++++++++++++++++
 .../metadatareport/local/annotation/MetadataIT.java |  6 ------
 .../pom.xml                                         | 21 +++++++++++++++++++++
 .../metadatareport/local/properties/MetadataIT.java |  6 ------
 .../dubbo-samples-metadata-report-local-xml/pom.xml | 21 +++++++++++++++++++++
 .../metadatareport/local/xml/MetadataIT.java        |  5 -----
 .../dubbo-samples-thrift-impl/pom.xml               | 14 ++++++++++++++
 .../samples/rpc/nativethrift/DemoServiceIT.java     |  6 ------
 10 files changed, 98 insertions(+), 29 deletions(-)

diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/pom.xml b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/pom.xml
index bc5bcac..513db2b 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/pom.xml
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/pom.xml
@@ -165,6 +165,27 @@
                     </plugin>
 
                     <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.6.0</version>
+                        <executions>
+                            <execution>
+                                <id>sleep</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>sleep</executable>
+                                    <arguments>
+                                        <argument>5</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${maven-failsafe-plugin.version}</version>
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java
index 2c67ba5..b0d87f0 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java
@@ -25,7 +25,6 @@ import org.apache.dubbo.samples.metadatareport.configcenter.api.AnnotationServic
 
 import com.google.gson.Gson;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,11 +40,6 @@ public class MetadataIT {
     @Autowired
     private AnnotationAction action;
 
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Thread.sleep(2000);
-    }
-
     /**
      * <pre>
      * {
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/pom.xml b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/pom.xml
index 006402c..17b2e0a 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/pom.xml
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/pom.xml
@@ -165,6 +165,27 @@
                     </plugin>
 
                     <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.6.0</version>
+                        <executions>
+                            <execution>
+                                <id>sleep</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>sleep</executable>
+                                    <arguments>
+                                        <argument>5</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${maven-failsafe-plugin.version}</version>
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java
index cf22e07..4b82179 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java
@@ -25,7 +25,6 @@ import org.apache.dubbo.samples.metadatareport.local.annotation.api.AnnotationSe
 
 import com.google.gson.Gson;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,11 +40,6 @@ public class MetadataIT {
     @Autowired
     private AnnotationAction action;
 
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Thread.sleep(2000);
-    }
-
     /**
      * <pre>
      * {
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/pom.xml b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/pom.xml
index d6ffe8f..2cd23e9 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/pom.xml
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/pom.xml
@@ -166,6 +166,27 @@
                     </plugin>
 
                     <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.6.0</version>
+                        <executions>
+                            <execution>
+                                <id>sleep</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>sleep</executable>
+                                    <arguments>
+                                        <argument>5</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${maven-failsafe-plugin.version}</version>
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java
index 6000def..090b500 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java
@@ -24,7 +24,6 @@ import org.apache.dubbo.samples.metadatareport.local.properties.api.DemoService;
 
 import com.google.gson.Gson;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,11 +39,6 @@ public class MetadataIT {
     @Autowired
     private DemoService demoService;
 
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Thread.sleep(2000);
-    }
-
     /**
      * <pre>
      * {
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/pom.xml b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/pom.xml
index e5e34f2..d257544 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/pom.xml
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/pom.xml
@@ -165,6 +165,27 @@
                     </plugin>
 
                     <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.6.0</version>
+                        <executions>
+                            <execution>
+                                <id>sleep</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>sleep</executable>
+                                    <arguments>
+                                        <argument>5</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${maven-failsafe-plugin.version}</version>
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java
index a43af97..1313d83 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java
@@ -24,7 +24,6 @@ import org.apache.dubbo.samples.metadatareport.local.xml.api.DemoService;
 
 import com.google.gson.Gson;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +39,6 @@ public class MetadataIT {
     @Autowired
     private DemoService demoService;
 
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Thread.sleep(2000);
-    }
 
     /**
      * <pre>
diff --git a/dubbo-samples-thrift/dubbo-samples-thrift-impl/pom.xml b/dubbo-samples-thrift/dubbo-samples-thrift-impl/pom.xml
index 7ce2609..db9554d 100644
--- a/dubbo-samples-thrift/dubbo-samples-thrift-impl/pom.xml
+++ b/dubbo-samples-thrift/dubbo-samples-thrift-impl/pom.xml
@@ -162,6 +162,20 @@
                                     <asyncDestroyOnShutdown>true</asyncDestroyOnShutdown>
                                 </configuration>
                             </execution>
+
+                            <execution>
+                                <id>sleep</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>sleep</executable>
+                                    <arguments>
+                                        <argument>5</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
                         </executions>
 
                     </plugin>
diff --git a/dubbo-samples-thrift/dubbo-samples-thrift-impl/src/test/java/org/apache/dubbo/samples/rpc/nativethrift/DemoServiceIT.java b/dubbo-samples-thrift/dubbo-samples-thrift-impl/src/test/java/org/apache/dubbo/samples/rpc/nativethrift/DemoServiceIT.java
index c860328..bc3f039 100644
--- a/dubbo-samples-thrift/dubbo-samples-thrift-impl/src/test/java/org/apache/dubbo/samples/rpc/nativethrift/DemoServiceIT.java
+++ b/dubbo-samples-thrift/dubbo-samples-thrift-impl/src/test/java/org/apache/dubbo/samples/rpc/nativethrift/DemoServiceIT.java
@@ -20,7 +20,6 @@ package org.apache.dubbo.samples.rpc.nativethrift;
 import org.apache.dubbo.samples.rpc.nativethrift.api.DemoService;
 
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,11 +32,6 @@ public class DemoServiceIT {
     @Autowired
     private DemoService.Iface demoService;
 
-    @BeforeClass
-    public static void sleep() throws Exception {
-        Thread.sleep(5000);
-    }
-
     @Test
     public void test() throws Exception {
         Assert.assertTrue(demoService.echoBool(true));


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