Add support for intersection groups #131

alx75 · 2018-01-29T14:52:26Z

This feature modifies the TagTestBlockFilter to handle the intersection groups. It also modifies the ConfigurationProvider to pass the plugin properties as a parameter.

That intersection group could have been added as a custom testTransforms from the configuration of my own project but it was a bit hacky because the current TagTestBlockFilter would have been applied to the test blocks after my own filter. Plus, in the transformer, it wasn't possible to get the properties defined in the surefire plugin.

I ended up creating that PR because I think other cuppa users could benefit it.

Example :
mvn verify -Dgroups=smoke -DintersectGroups=group1,group2
Will return all the smoke tests plus the intersection of group1 and group2

Signed-off-by: Alex ROBUCHON alex.robuchon@forgerock.com

coveralls · 2018-01-29T15:30:31Z

Coverage increased (+0.7%) to 90.057% when pulling 87cd3f2 on alx75:add_support_for_intersection_groups into a3f9d90 on cuppa-framework:master.

mrpotes

I'm not massively keen on adding another property for a specific use case. I would rather add something like -DgroupsExpression=and(group1,group2) for which the grammar would support and(GROUP...), or(GROUP...) and not(GROUP).

mrpotes · 2018-02-05T20:21:55Z

cuppa/src/main/java/org/forgerock/cuppa/ConfigurationProvider.java

     */
-    void configure(Configuration configuration);
+    void configure(Configuration configuration, Map<String, String> properties);


This appears to be a breaking change - is there anything we can do to avoid that?

Looking through the changes, I can't actually see why this change is necessary for the described feature, anyway... Have I missed something?

It's not necessary for the intersection group indeed.
It's useful though if you want to register a TestTreeTransform that needs to be aware of the provider configuration.

I'm not keen to pass it in the Configuration because it's not the cuppa configuration. I can extract that change to another PR

alx75 · 2018-02-05T22:04:08Z

I like the -DgroupsExpression idea. Will update my PR.

phillcunnington · 2018-02-09T10:55:08Z

cuppa/src/main/java/org/forgerock/cuppa/internal/filters/expression/Condition.java

+/**
+ * A condition used by {@link ExpressionTagTestBlockFilter}.
+ */
+public interface Condition {


@FunctionalInterface?

phillcunnington · 2018-02-09T10:57:31Z

cuppa/src/main/java/org/forgerock/cuppa/internal/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 ForgeRock AS.
+ * Copyright 2015-2018 ForgeRock AS.


No change to file so revert

phillcunnington · 2018-02-09T10:58:10Z

cuppa/src/main/java/org/forgerock/cuppa/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 ForgeRock AS.
+ * Copyright 2015-2018 ForgeRock AS.


phillcunnington · 2018-02-09T11:00:04Z

docs/_docs/tagging-tests.md

@@ -35,14 +35,28 @@ For example, to run all tests except tests tagged with `slow`:
 mvn -DexcludedTags=slow test
 ```

+If you want more flexibility wou can use an expression.


phillcunnington · 2018-02-09T11:00:18Z

docs/_docs/tagging-tests.md

@@ -35,14 +35,28 @@ For example, to run all tests except tests tagged with `slow`:
 mvn -DexcludedTags=slow test
 ```

+If you want more flexibility wou can use an expression.
+For example, to run all the tests with`fast` tag or with `smoke` and `ui` tags excluding all `slow` tags :


withfast -> with fast

phillcunnington · 2018-02-09T11:01:01Z

docs/_docs/tagging-tests.md

 <div class="alert alert-info" role="alert">
 #### Note

 When running with a combination of TestNG or JUnit along side Cuppa, you can use the TestNG/JUnit way of 
 specifying/excluding groups so that you can run a sub-set of tests across both TestNG/JUnit and Cuppa.

-It's important to note that you cannot use both `-Dgroups=` and `-Dtags=` or `-DexcludedGroups=` and `-DexcludedTags=` 
-at the same time.
+It's important to note that you cannot use `-Dgroups=` and `-Dtags=` , `-DexcludedGroups=` and `-DexcludedTags=` 


-Dtags= , -DexcludedGroups= -> -Dtags=, -DexcludedGroups=

sorry nit picking :)

phillcunnington · 2018-02-09T11:10:00Z

.../main/java/org/forgerock/cuppa/internal/filters/expression/ExpressionTagTestBlockFilter.java

+        return union;
+    }
+
+    private static class ExpressionParser {


Extract out to package private class as will keep visibility hidden due to all expression classes being in sub-package already and have the added benefit to see which of these methods are called by the outer class?

phillcunnington · 2018-02-16T09:06:09Z

cuppa/src/main/java/org/forgerock/cuppa/Runner.java

@@ -77,8 +78,8 @@ public Runner(Tags runTags) {
     * @param configuration Cuppa configuration to control the behaviour of the runner.
     */
    public Runner(Tags runTags, Configuration configuration) {
-        coreTestTransforms = Arrays.asList(new OnlyTestBlockFilter(), new TagTestBlockFilter(runTags),
-                new EmptyTestBlockFilter());
+        coreTestTransforms = Arrays.asList(new OnlyTestBlockFilter(), new ExpressionTagTestBlockFilter(runTags),


I feel like there shouldn't be a need for 2 tag block filters. But saying that i'd like to look at trying to make changes to allow the groups expression to be an extension to Cuppa core. I will look at that separate to this PR though.

The provider can be called with -DgroupsExpression=and(group1,group2) for which the grammar would support and(GROUP...), or(GROUP...) and not(GROUP) Signed-off-by: Alex ROBUCHON <alex.robuchon@forgerock.com>

alx75 force-pushed the add_support_for_intersection_groups branch from 32c43f2 to d908889 Compare February 1, 2018 17:33

mrpotes reviewed Feb 5, 2018

View reviewed changes

alx75 force-pushed the add_support_for_intersection_groups branch 2 times, most recently from e68d01f to 6d50414 Compare February 7, 2018 16:07

phillcunnington self-requested a review February 9, 2018 10:54

phillcunnington approved these changes Feb 16, 2018

View reviewed changes

Add support for expression groups

87cd3f2

The provider can be called with -DgroupsExpression=and(group1,group2) for which the grammar would support and(GROUP...), or(GROUP...) and not(GROUP) Signed-off-by: Alex ROBUCHON <alex.robuchon@forgerock.com>

alx75 force-pushed the add_support_for_intersection_groups branch from 165b64b to 87cd3f2 Compare February 16, 2018 13:59

phillcunnington merged commit 87cd3f2 into cuppa-framework:master Feb 16, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for intersection groups #131

Add support for intersection groups #131

alx75 commented Jan 29, 2018 •

edited

coveralls commented Jan 29, 2018 •

edited

mrpotes left a comment

mrpotes Feb 5, 2018

mrpotes Feb 5, 2018

alx75 Feb 5, 2018

alx75 commented Feb 5, 2018

phillcunnington Feb 9, 2018

phillcunnington Feb 9, 2018

phillcunnington Feb 9, 2018

phillcunnington Feb 9, 2018

phillcunnington Feb 9, 2018

phillcunnington Feb 9, 2018

phillcunnington Feb 9, 2018

phillcunnington Feb 9, 2018

phillcunnington Feb 16, 2018

Add support for intersection groups #131

Add support for intersection groups #131

Conversation

alx75 commented Jan 29, 2018 • edited

coveralls commented Jan 29, 2018 • edited

mrpotes left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alx75 commented Feb 5, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alx75 commented Jan 29, 2018 •

edited

coveralls commented Jan 29, 2018 •

edited