dubbo-samples-original-grpc's testcase convert to docker's framework (#228)
diff --git a/dubbo-samples-grpc/dubbo-samples-original/case-configuration.yml b/dubbo-samples-grpc/dubbo-samples-original/case-configuration.yml
new file mode 100644
index 0000000..b3dae45
--- /dev/null
+++ b/dubbo-samples-grpc/dubbo-samples-original/case-configuration.yml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+from: app-builtin-zookeeper.yml
+
+props:
+ project_name: dubbo-samples-original-grpc
+ main_class: org.apache.dubbo.samples.basic.BasicProvider
+ zookeeper_port: 2181
+ dubbo_port: 50051
+
diff --git a/dubbo-samples-grpc/dubbo-samples-original/pom.xml b/dubbo-samples-grpc/dubbo-samples-original/pom.xml
index 6c3448b..83bf319 100644
--- a/dubbo-samples-grpc/dubbo-samples-original/pom.xml
+++ b/dubbo-samples-grpc/dubbo-samples-original/pom.xml
@@ -88,14 +88,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring-test.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>1.15.1</version>
- <scope>test</scope>
</dependency>
</dependencies>
diff --git a/dubbo-samples-grpc/dubbo-samples-original/src/main/java/org/apache/dubbo/samples/basic/BasicProvider.java b/dubbo-samples-grpc/dubbo-samples-original/src/main/java/org/apache/dubbo/samples/basic/BasicProvider.java
index d122e07..d4debba 100644
--- a/dubbo-samples-grpc/dubbo-samples-original/src/main/java/org/apache/dubbo/samples/basic/BasicProvider.java
+++ b/dubbo-samples-grpc/dubbo-samples-original/src/main/java/org/apache/dubbo/samples/basic/BasicProvider.java
@@ -26,6 +26,8 @@
public class BasicProvider {
public static void main(String[] args) throws Exception {
+ new EmbeddedZooKeeper(2181, true).start();
+
ClassPathXmlApplicationContext context =
new ClassPathXmlApplicationContext("spring/dubbo-demo-provider.xml");
context.start();
diff --git a/dubbo-samples-grpc/dubbo-samples-original/src/test/java/org/apache/dubbo/samples/basic/OriginalGrpcIT.java b/dubbo-samples-grpc/dubbo-samples-original/src/test/java/org/apache/dubbo/samples/basic/OriginalGrpcIT.java
index be08b59..292a84f 100644
--- a/dubbo-samples-grpc/dubbo-samples-original/src/test/java/org/apache/dubbo/samples/basic/OriginalGrpcIT.java
+++ b/dubbo-samples-grpc/dubbo-samples-original/src/test/java/org/apache/dubbo/samples/basic/OriginalGrpcIT.java
@@ -24,41 +24,16 @@
import io.grpc.examples.helloworld.HelloReply;
import io.grpc.examples.helloworld.HelloRequest;
import org.junit.Assert;
-import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.testcontainers.containers.FixedHostPortGenericContainer;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath*:spring/dubbo-demo-consumer.xml", "classpath*:spring/dubbo-demo-provider.xml"})
+@ContextConfiguration(locations = {"classpath*:spring/dubbo-demo-consumer.xml"})
public class OriginalGrpcIT {
- //
-// static {
-// try {
-// GenericContainer zookeeper = new GenericContainer<>("zookeeper:3.4.9")
-// .withExposedPorts(2181).waitFor();
-//
-// System.setProperty("zookeeper.address", zookeeper.getContainerIpAddress());
-// System.setProperty("zookeeper.port", zookeeper.getFirstMappedPort() + "");
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-//
- // port mapping, https://github.com/testcontainers/testcontainers-java/issues/256
- @ClassRule
- public static GenericContainer zookeeper = new GenericContainer<>(DockerImageName.parse("zookeeper:3.4.9"))
- .withCreateContainerCmdModifier(
- cmd ->{
- cmd.withPortBindings(new PortBinding(Ports.Binding.bindPort(2181), new ExposedPort(2181)));
- }
- );
@Autowired
@Qualifier("greeter")
