# This is a combination of 2 commits.

# This is the 1st commit message:

[WIP]Ftr: 支持java go集成测试互通

# The commit message #2 will be skipped:

#	测试java测试的输出

Author: Lvnszn

build/Makefile

@@ -156,4 +156,11 @@ integration: export DUBBO_GO_CONFIG_PATH ?= $(PROJECT_DIR)/go-client/conf/dubbog
 integration:
 	$(info   >  Running integration test for application $(INTEGRATE_DIR))
 	@go clean -testcache
-	@go test -tags integration -v $(INTEGRATE_DIR)/tests/integration/...
+	@go test -tags integration -v $(INTEGRATE_DIR)/tests/integration/...
+
+## integration-java: Integration java test (for client)
+.PHONY: integration-java
+integration-java:
+	@$(info   >  Running java test $(INTEGRATE_DIR), project name $(PROJECT_NAME))
+	@chmod +x $(INTEGRATE_DIR)/tests/java/run.sh
+	@$(shell )$(INTEGRATE_DIR)/tests/java/run.sh

helloworld/java-server/run.sh

@@ -1,2 +1,2 @@
-mvn install -DSkipTests
+mvn install -DSkipTests
 mvn exec:java -Dexec.mainClass="com.apache.dubbo.sample.basic.ApiProvider"

integrate_test.sh

@@ -32,20 +32,34 @@ INTEGRATE_DIR=$(pwd)/integrate_test/$1
 sleep 5
 
 # start server
-make PROJECT_DIR="$P_DIR" PROJECT_NAME="$(basename "$P_DIR")" INTEGRATE_DIR="$INTEGRATE_DIR" -f build/Makefile start
+make PROJECT_DIR=$P_DIR PROJECT_NAME=$(basename $P_DIR) INTEGRATE_DIR=$INTEGRATE_DIR -f build/Makefile start
 # waiting for registry
 sleep 5
 
 # start integration
-make PROJECT_DIR="$P_DIR" PROJECT_NAME="$(basename "$P_DIR")" INTEGRATE_DIR="$INTEGRATE_DIR" -f build/Makefile integration
+make PROJECT_DIR=$P_DIR PROJECT_NAME=$(basename $P_DIR) INTEGRATE_DIR=$INTEGRATE_DIR -f build/Makefile integration
 result=$?
 
 # if fail print server log
 if [ $result != 0 ];then
-  make PROJECT_DIR="$P_DIR" PROJECT_NAME="$(basename "$P_DIR")" INTEGRATE_DIR="$INTEGRATE_DIR" -f build/Makefile print-server-log
+  make PROJECT_DIR=$P_DIR PROJECT_NAME=$(basename $P_DIR) INTEGRATE_DIR=$INTEGRATE_DIR -f build/Makefile print-server-log
 fi
 
+JAVA_TEST_SHELL=$INTEGRATE_DIR/tests/java
+if [ -e $JAVA_TEST_SHELL ]; then
+  echo "JAVA TEST"
+  # run java test
+  make PROJECT_DIR=$P_DIR PROJECT_NAME=$(basename $P_DIR) INTEGRATE_DIR=$INTEGRATE_DIR -f build/Makefile integration-java
+  result=$?
+
+  # if fail print server log
+  if [ $result != 0 ];then
+    make PROJECT_DIR=$P_DIR PROJECT_NAME=$(basename $P_DIR) INTEGRATE_DIR=$INTEGRATE_DIR -f build/Makefile print-server-log
+  fi
+fi
+
+
 # stop server
-make PROJECT_DIR="$P_DIR" PROJECT_NAME="$(basename "$P_DIR")" INTEGRATE_DIR="$INTEGRATE_DIR" -f build/Makefile clean
+make PROJECT_DIR=$P_DIR PROJECT_NAME=$(basename $P_DIR) INTEGRATE_DIR=$INTEGRATE_DIR -f build/Makefile clean
 
 exit $((result))

integrate_test/helloworld/tests/java/java_test.go

@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+package java
+
+import (
+	"errors"
+	"fmt"
+	"github.com/stretchr/testify/assert"
+	"os"
+	"testing"
+)
+
+func TestStart(t *testing.T) {
+	assert.Nil(t, errors.New("test"))
+	fmt.Println("hello world")
+	os.Exit(1)
+}

integrate_test/helloworld/tests/java/run.sh

@@ -0,0 +1,4 @@
+# !/bin/bash
+
+go test -tags java -v $INTEGRATE_DIR/tests/java/java_test.go
+exit 1

start_integrate_test.sh

@@ -18,32 +18,32 @@
 array=("helloworld")
 
 # direct
-array+=("direct")
-
-# context
-array+=("context/dubbo")
-
-# config-api
-array+=("config-api/rpc/triple")
-array+=("config-api/configcenter/nacos")
-array+=("config-api/configcenter/zookeeper")
-
-# registry
-array+=("registry/zookeeper")
-array+=("registry/nacos")
-array+=("registry/etcd")
-
-# generic
-array+=("generic/default")
-
-# rpc
-array+=("rpc/dubbo")
-array+=("rpc/triple/codec-extension")
-array+=("rpc/triple/hessian2")
-array+=("rpc/triple/msgpack")
-array+=("rpc/triple/pb/dubbogo-grpc")
-array+=("rpc/grpc")
-array+=("rpc/jsonrpc")
+#array+=("direct")
+#
+## context
+#array+=("context/dubbo")
+#
+## config-api
+#array+=("config-api/rpc/triple")
+#array+=("config-api/configcenter/nacos")
+#array+=("config-api/configcenter/zookeeper")
+#
+## registry
+#array+=("registry/zookeeper")
+#array+=("registry/nacos")
+#array+=("registry/etcd")
+#
+## generic
+#array+=("generic/default")
+#
+## rpc
+#array+=("rpc/dubbo")
+#array+=("rpc/triple/codec-extension")
+#array+=("rpc/triple/hessian2")
+#array+=("rpc/triple/msgpack")
+#array+=("rpc/triple/pb/dubbogo-grpc")
+#array+=("rpc/grpc")
+#array+=("rpc/jsonrpc")
 
 
 DOCKER_DIR=$(pwd)/integrate_test/dockercompose

waiting_launch.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+  echo "Provide log file please, like : ./waiting_launch.sh log.sh"
+  exit
+fi
+
+PREV_MD5=""
+MD5=""
+
+# wait 150s at most
+for ((i=1; i<=15; i++));
+do
+  sleep 10s
+  MD5=$(md5sum $1 | cut -d ' ' -f1)
+  if [ "$PREV_MD5" = "$MD5" ]; then
+    exit
+  fi
+  echo "waiting... log file md5: $MD5"
+  PREV_MD5=$MD5
+done
+
+echo "java-server is not launched properly, the launching log will be outputted at below: "
+cat $1