Merge pull request #159 from utPLSQL/feature/add_tags

pesse · web-flow · commit c5ed09133c0b · 2019-07-09T07:56:30.000+02:00
Feature/add tags
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,7 @@ env:
     - UTPLSQL_VERSION="v3.1.2"
     - UTPLSQL_VERSION="v3.1.3"
     - UTPLSQL_VERSION="v3.1.6"
+    - UTPLSQL_VERSION="v3.1.7"
     - UTPLSQL_VERSION="develop"
       UTPLSQL_FILE="utPLSQL"
 
diff --git a/README.md b/README.md
@@ -102,6 +102,9 @@ utplsql run "my/Username"/"myP@ssword"@connectstring
                       Both formats can be mixed in the list.
                       If only schema is provided, then all suites owner by that schema are executed.
                       If -p is omitted, the current schema is used.
+
+--tags=tags         - A comma separated list of tags to run. 
+                      Format: --tags=tag1[,tag2[,tag3]]
                       
 -f=format           - A reporter to be used for reporting.
 (--format)            If no -f option is provided, the default ut_documentation_reporter is used.
diff --git a/src/main/java/org/utplsql/cli/RunAction.java b/src/main/java/org/utplsql/cli/RunAction.java
@@ -163,7 +163,8 @@ TestRunner newTestRunner(List<Reporter> reporterList) {
                 .includeObjects(Arrays.asList(config.getIncludePackages()))
                 .excludeObjects(Arrays.asList(config.getExcludePackages()))
                 .randomTestOrder(config.isRandomTestOrder())
-                .randomTestOrderSeed(config.getRandomTestOrderSeed());
+                .randomTestOrderSeed(config.getRandomTestOrderSeed())
+                .addTags(Arrays.asList(config.getTags()));
     }
 
     private void outputMainInformation() {
diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java
@@ -23,6 +23,11 @@ public class RunPicocliCommand implements IRunCommand {
                     "-p=[schema|schema:[suite ...][.test]|schema[.suite ...][.test]")
     private List<String> paths = new ArrayList<>();
 
+    @Option(names = {"--tags"},
+            description = "comma-separated list of tags to run",
+            split = ",")
+    private List<String> tags = new ArrayList<>();
+
 
     @Option(
             names = {"-c", "--color"},
@@ -232,7 +237,8 @@ public RunCommandConfig getRunCommandConfig() {
                 timeoutInMinutes,
                 enableDbmsOutput,
                 randomTestOrder,
-                randomTestOrderSeed);
+                randomTestOrderSeed,
+                tags.toArray(new String[0]));
     }
 
     private RunAction getRunAction() {
diff --git a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java
@@ -21,9 +21,10 @@ public class RunCommandConfig extends ConnectionConfig {
     private boolean dbmsOutput = false;
     private boolean randomTestOrder = false;
     private final Integer randomTestOrderSeed;
+    private final String[] tags;
 
-    @ConstructorProperties({"connectString", "suitePaths", "reporters", "outputAnsiColor", "failureExitCode", "skipCompatibilityCheck", "includePackages", "excludePackages", "sourceMapping", "testMapping", "logConfigLevel", "timeoutInMinutes", "dbmsOutput", "randomTestOrder", "randomTestOrderSeed"})
-    public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfig[] reporters, boolean outputAnsiColor, Integer failureExitCode, boolean skipCompatibilityCheck, String[] includePackages, String[] excludePackages, FileMapperConfig sourceMapping, FileMapperConfig testMapping, ConfigLevel logConfigLevel, Integer timeoutInMinutes, boolean dbmsOutput, boolean randomTestOrder, Integer randomTestOrderSeed) {
+    @ConstructorProperties({"connectString", "suitePaths", "reporters", "outputAnsiColor", "failureExitCode", "skipCompatibilityCheck", "includePackages", "excludePackages", "sourceMapping", "testMapping", "logConfigLevel", "timeoutInMinutes", "dbmsOutput", "randomTestOrder", "randomTestOrderSeed", "tags"})
+    public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfig[] reporters, boolean outputAnsiColor, Integer failureExitCode, boolean skipCompatibilityCheck, String[] includePackages, String[] excludePackages, FileMapperConfig sourceMapping, FileMapperConfig testMapping, ConfigLevel logConfigLevel, Integer timeoutInMinutes, boolean dbmsOutput, boolean randomTestOrder, Integer randomTestOrderSeed, String[] tags) {
         super(connectString);
         this.suitePaths = suitePaths;
         this.reporters = reporters;
@@ -39,12 +40,17 @@ public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfi
         this.dbmsOutput = dbmsOutput;
         this.randomTestOrder = randomTestOrder;
         this.randomTestOrderSeed = randomTestOrderSeed;
+        this.tags = tags;
     }
 
     public String[] getSuitePaths() {
         return suitePaths;
     }
 
+    public String[] getTags() {
+        return tags;
+    }
+
     public ReporterConfig[] getReporters() {
         return reporters;
     }
diff --git a/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java b/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java
@@ -20,6 +20,7 @@ void runCommandAllArguments() throws Exception {
         RunCommandConfig config = parseForConfig("run",
                 TestHelper.getConnectionString(),
                 "-p=app.betwnstr,app.basic",
+                "--tags=tag1,tag.2",
                 "-d",
                 "-c",
                 "-q",
@@ -51,6 +52,7 @@ void runCommandAllArguments() throws Exception {
 
         assertNotNull(config.getConnectString());
         assertThat( config.getSuitePaths(), is(new String[]{"app.betwnstr", "app.basic"}));
+        assertThat( config.getTags(), is(new String[]{"tag1", "tag.2"}));
         assertTrue( config.isOutputAnsiColor() );
         assertEquals( LoggerConfiguration.ConfigLevel.NONE, config.getLogConfigLevel());
         assertEquals( 10, config.getFailureExitCode());
diff --git a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java
@@ -17,6 +17,7 @@ public void allArgumentsAreRecognized() {
                 "-f=ut_sonar_test_reporter",
                     "-o=sonar_result.xml",
                     "-s",
+                "--tags=tag1,tag2",
                 "-d",
                 "-c",
                 "--failure-exit-code=10",
@@ -53,4 +54,14 @@ void multiplePaths() {
         assertThat( testRunner.getOptions().pathList, contains("app.test_betwnstr", "app.test_award_bonus") );
 
     }
+
+    @Test
+    void provideTags() {
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
+                "--tags=tag1,tag.2"
+        );
+
+        TestRunner testRunner = runCmd.newTestRunner(new ArrayList<>());
+        assertThat( testRunner.getOptions().tags, contains("tag1", "tag.2") );
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,8 @@ TestRunner newTestRunner(List<Reporter> reporterList) {`
`163`	`163`	`.includeObjects(Arrays.asList(config.getIncludePackages()))`
`164`	`164`	`.excludeObjects(Arrays.asList(config.getExcludePackages()))`
`165`	`165`	`.randomTestOrder(config.isRandomTestOrder())`
`166`		`- .randomTestOrderSeed(config.getRandomTestOrderSeed());`
	`166`	`+ .randomTestOrderSeed(config.getRandomTestOrderSeed())`
	`167`	`+ .addTags(Arrays.asList(config.getTags()));`
`167`	`168`	`}`
`168`	`169`
`169`	`170`	`private void outputMainInformation() {`