[test/plugin] removes the dead codes (#3651)

* removes the dead codes

* sync

test/plugin/containers/jvm-container/docker/run.sh

@@ -25,7 +25,6 @@ function exitOnError() {
 function exitAndClean() {
     [[ -f ${SCENARIO_HOME}/data/actualData.yaml ]] && rm -rf ${SCENARIO_HOME}/data/actualData.yaml
     [[ -d ${SCENARIO_HOME}/logs ]] && rm -rf ${SCENARIO_HOME}/logs
-    [[ -d ${SCENARIO_HOME}/package ]] && rm -rf ${SCENARIO_HOME}/package
     exit $1
 }
 
@@ -85,9 +84,8 @@ curl -s http://localhost:12800/receiveData > ${SCENARIO_HOME}/data/actualData.ya
 
 echo "To validate"
 java -jar \
-    -Dv2=true \
     -Xmx256m -Xms256m \
-    -DtestDate="`date +%Y-%m-%d-%H-%M`" \
+    -DcaseName="${SCENARIO_NAME}-${SCENARIO_VERSION}" \
     -DtestCasePath=${SCENARIO_HOME}/data/ \
     ${TOOLS_HOME}/skywalking-validator-tools.jar 1>/dev/null
 status=$?

test/plugin/containers/tomcat-container/docker/run.sh

@@ -72,17 +72,16 @@ curl -s http://localhost:12800/receiveData > ${SCENARIO_HOME}/data/actualData.ya
 
 echo "To validate"
 java -jar \
-  -Dv2=true \
-  -Xmx256m -Xms256m \
-  -DtestDate="`date +%Y-%m-%d-%H-%M`" \
-  -DtestCasePath=${SCENARIO_HOME}/data/ \
-  ${TOOLS_HOME}/skywalking-validator-tools.jar 1>/dev/null
+    -Xmx256m -Xms256m \
+    -DcaseName="${SCENARIO_NAME}-${SCENARIO_VERSION}" \
+    -DtestCasePath=${SCENARIO_HOME}/data/ \
+    ${TOOLS_HOME}/skywalking-validator-tools.jar 1>/dev/null
 status=$?
 
 if [[ $status -eq 0 ]]; then
-  echo "Scenario[${SCENARIO_NAME}-${SCENARIO_VERSION}] passed!" >&2
+    echo "Scenario[${SCENARIO_NAME}-${SCENARIO_VERSION}] passed!" >&2
 else
-  cat ${SCENARIO_HOME}/data/actualData.yaml >&2
-  exitOnError "Scenario[${SCENARIO_NAME}-${SCENARIO_VERSION}] failed!"
+    cat ${SCENARIO_HOME}/data/actualData.yaml >&2
+    exitOnError "Scenario[${SCENARIO_NAME}-${SCENARIO_VERSION}] failed!"
 fi
 exitAndClean $status

test/plugin/mock-collector/pom.xml

@@ -165,26 +165,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.4.13</version>
-                <configuration>
-                    <skipDocker>true</skipDocker>
-                    <imageName>${docker.image.name}</imageName>
-                    <imageTags>
-                        <imageTag>${docker.image.version}</imageTag>
-                    </imageTags>
-                    <dockerDirectory>${project.basedir}/docker</dockerDirectory>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.basedir}/../dist</directory>
-                            <include>${build.finalName}.tar.gz</include>
-                        </resource>
-                    </resources>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

test/plugin/runner-helper/src/main/resources/docker-compose.template

@@ -84,7 +84,7 @@ services:
         <#if service.healthcheck??>
         healthcheck:
         <#list service.healthcheck as item>
-            - ${item}
+            ${item}
         </#list>
         </#if>
 </#list>

test/plugin/runner-helper/src/test/resources/configuration-test.yml

@@ -30,4 +30,9 @@ dependencies:
       - docker-entrypoint.sh
       - solr-precreate
       - mycore
-
+    healthcheck:
+      - 'test: ["CMD", "curl", "-f", "http://localhost"]'
+      - 'interval: 1m30s'
+      - 'timeout: 10s'
+      - 'retries: 3'
+      - 'start_period: 40s'

test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/ConfigHelper.java

@@ -17,76 +17,16 @@
 
 package org.apache.skywalking.plugin.test.agent.tool;
 
-import java.io.File;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 public class ConfigHelper {
-    private static Logger logger = LogManager.getLogger(ConfigHelper.class);
 
     private ConfigHelper() {
     }
 
-    public static String testDate() {
-        return System.getProperty("testDate");
-    }
-
-    public static String testCases() {
-        String testCasesInput = System.getProperty("testCases", "");
-        if (testCasesInput.length() > 0) {
-            return testCasesInput;
-        }
-        String testCasePath = System.getProperty("testCasePath", "");
-
-        if (testCasePath.length() == 0) {
-            logger.warn("test case dir is empty");
-            return "";
-        }
-
-        File testCaseDir = new File(testCasePath);
-        if (!testCaseDir.exists() || !testCaseDir.isDirectory()) {
-            logger.warn("test case dir is not exists or is not directory");
-            return "";
-        }
-
-        StringBuilder testCases = new StringBuilder();
-        File[] testCasesDir = testCaseDir.listFiles();
-        for (File file : testCasesDir) {
-            testCases.append(file.getName() + ",");
-        }
-
-        return testCases.toString();
+    public static String caseName() {
+        return System.getProperty("caseName", "");
     }
 
     public static String testCaseBaseDir() {
         return System.getProperty("testCasePath", "");
     }
-
-    public static boolean isV2() {
-        return Boolean.getBoolean("v2");
-    }
-
-    public static String reportFilePath() {
-        return System.getProperty("reportFilePath");
-    }
-
-    public static String agentBranch() {
-        return System.getProperty("agentBranch");
-    }
-
-    public static String agentCommit() {
-        return System.getProperty("agentCommitId");
-    }
-
-    public static String casesBranch() {
-        return System.getProperty("casesBranch", "").replace("/", "-");
-    }
-
-    public static String caseCommitId() {
-        return System.getProperty("casesCommitId", "");
-    }
-
-    public static String committer() {
-        return System.getProperty("committer", "");
-    }
 }

test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/Main.java

@@ -22,64 +22,45 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.DataAssert;
 import org.apache.skywalking.plugin.test.agent.tool.validator.entity.Data;
-import org.apache.skywalking.plugin.test.agent.tool.report.entity.Report;
-import org.apache.skywalking.plugin.test.agent.tool.report.entity.TestCase;
-import org.apache.skywalking.plugin.test.agent.tool.report.entity.TestCaseDesc;
 import org.apache.skywalking.plugin.test.agent.tool.validator.exception.AssertFailedException;
 
 public class Main {
     private static Logger logger = LogManager.getLogger(Main.class);
 
     public static void main(String[] args) {
-        Report report = new Report();
-        String testCasePath = ConfigHelper.testCaseBaseDir();
-
-        boolean success = false;
-        if (ConfigHelper.isV2()) {
-            success |= verify(new File(testCasePath), TestCaseDesc.ParserV2.parse(), report).isSuccess();
-        } else {
-            String[] testCases = ConfigHelper.testCases().split(",");
-
-            for (String aCase : testCases) {
-                File casePath = new File(testCasePath, aCase);
-                File descFile = new File(casePath, "testcase.desc");
-                success |= verify(casePath, TestCaseDesc.Parser.parse(descFile), report).isSuccess();
-            }
-        }
-
-        if (!ConfigHelper.isV2()) {
-            try {
-                report.generateReport(ConfigHelper.reportFilePath());
-            } catch (Exception e) {
-                logger.error("Failed to generate report file", e);
-            }
-        }
-        System.exit(success ? 0 : 1);
+        System.exit(verify() ? 0 : 1);
     }
 
-    static TestCase verify(File casePath, TestCaseDesc testCaseDesc, Report report) {
-        TestCase testCase = new TestCase(testCaseDesc.getTestComponents());
+    static boolean verify() {
+        File casePath = new File(ConfigHelper.testCaseBaseDir());
         try {
-            logger.info("start to assert data of test case[{}]", testCase.getCaseName());
+            if (!casePath.exists()) {
+                logger.error("test case dir is not exists or is not directory");
+                return false;
+            }
+
+            logger.info("start to assert data of test case[{}]", ConfigHelper.caseName());
             File actualData = new File(casePath, "actualData.yaml");
             File expectedData = new File(casePath, "expectedData.yaml");
 
             if (actualData.exists() && expectedData.exists()) {
                 try {
                     DataAssert.assertEquals(Data.Loader.loadData("expectedData.yaml", expectedData),
                             Data.Loader.loadData("actualData.yaml", actualData));
-                    testCase.testedSuccessfully();
+                    return true;
                 } catch (AssertFailedException e) {
                     logger.error("\nassert failed.\n{}\n", e.getCauseMessage());
                 }
             } else {
-                logger.error("assert failed. because actual data {} and expected data {}", actualData.exists() ? "founded" : "not founded", actualData.exists() ? "founded" : "not founded");
+                logger.error("assert failed. because actual data {} and expected data {}",
+                        actualData.exists() ? "founded" : "not founded",
+                        expectedData.exists() ? "founded" : "not founded"
+                );
             }
         } catch (Exception e) {
-            logger.error("assert test case {} failed.", testCase.getCaseName(), e);
+            logger.error("assert test case {} failed.", ConfigHelper.caseName(), e);
         }
-        report.addTestCase(testCaseDesc.getProjectName(), testCaseDesc.getTestFramework(), testCase);
-        return testCase;
+        return false;
     }
 
 }