You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by "dan-s1 (via GitHub)" <gi...@apache.org> on 2023/05/15 23:46:51 UTC
[GitHub] [nifi] dan-s1 opened a new pull request, #7250: [NIFI-11550] Refactored Groovy tests to Java.
dan-s1 opened a new pull request, #7250:
URL: https://github.com/apache/nifi/pull/7250
<!-- 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. -->
# Summary
[NIFI-11550](https://issues.apache.org/jira/browse/NIFI-11550)
# Tracking
Please complete the following tracking steps prior to pull request creation.
### Issue Tracking
- [ ] [Apache NiFi Jira](https://issues.apache.org/jira/browse/NIFI) issue created
### Pull Request Tracking
- [ ] Pull Request title starts with Apache NiFi Jira issue number, such as `NIFI-00000`
- [ ] Pull Request commit message starts with Apache NiFi Jira issue number, as such `NIFI-00000`
### Pull Request Formatting
- [ ] Pull Request based on current revision of the `main` branch
- [ ] Pull Request refers to a feature branch with one commit containing changes
# Verification
Please indicate the verification steps performed prior to pull request creation.
### Build
- [ ] Build completed using `mvn clean install -P contrib-check`
- [ ] JDK 11
- [ ] JDK 17
### Licensing
- [ ] New dependencies are compatible with the [Apache License 2.0](https://apache.org/licenses/LICENSE-2.0) according to the [License Policy](https://www.apache.org/legal/resolved.html)
- [ ] New dependencies are documented in applicable `LICENSE` and `NOTICE` files
### Documentation
- [ ] Documentation formatting appears as expected in rendered files
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory closed pull request #7250: [NIFI-11550] Refactored Groovy tests to Java.
Posted by "exceptionfactory (via GitHub)" <gi...@apache.org>.
exceptionfactory closed pull request #7250: [NIFI-11550] Refactored Groovy tests to Java.
URL: https://github.com/apache/nifi/pull/7250
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory commented on a diff in pull request #7250: [NIFI-11550] Refactored Groovy tests to Java.
Posted by "exceptionfactory (via GitHub)" <gi...@apache.org>.
exceptionfactory commented on code in PR #7250:
URL: https://github.com/apache/nifi/pull/7250#discussion_r1194544215
##########
nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java:
##########
@@ -1177,6 +1179,99 @@ public void testReplaceAllWithMatchingGroup() {
verifyEquals("${attr:replaceAll('.*?(l+).*', '$1')}", attributes, "ll");
}
+ @Test
+ public void testReplaceShouldReplaceAllLiteralMatches() {
+ int n = 3;
+ final String ORIGINAL_VALUE = "Hello World";
+ final Map<String, String> attributes = Map.of("single", ORIGINAL_VALUE,
+ "repeating", StringUtils.repeat(ORIGINAL_VALUE, " ", n));
+ final String REPLACEMENT_VALUE = "Goodbye Planet";
+ final String EXPECTED_REPEATING_RESULT = StringUtils.repeat(REPLACEMENT_VALUE, " ", n);
+ final String REPLACE_SINGLE_EXPRESSION = "${single:replace('" + ORIGINAL_VALUE + "', '" + REPLACEMENT_VALUE + "')}";
+ final String REPLACE_REPEATING_EXPRESSION = "${repeating:replace('" + ORIGINAL_VALUE + "', '" + REPLACEMENT_VALUE + "')}";
+ Query replaceSingleQuery = Query.compile(REPLACE_SINGLE_EXPRESSION);
+ Query replaceRepeatingQuery = Query.compile(REPLACE_REPEATING_EXPRESSION);
+
+ QueryResult<?> replaceSingleResult = replaceSingleQuery.evaluate(new StandardEvaluationContext(attributes));
+ QueryResult<?> replaceRepeatingResult = replaceRepeatingQuery.evaluate(new StandardEvaluationContext(attributes));
+
+ assertEquals(REPLACEMENT_VALUE, replaceSingleResult.getValue());
+ assertEquals(AttributeExpression.ResultType.STRING, replaceSingleResult.getResultType());
+ assertEquals(EXPECTED_REPEATING_RESULT, replaceRepeatingResult.getValue());
+ assertEquals(AttributeExpression.ResultType.STRING, replaceRepeatingResult.getResultType());
+ }
+
+ @Test
+ public void testReplaceFirstShouldOnlyReplaceFirstRegexMatch() {
+ // Arrange
Review Comment:
```suggestion
```
##########
nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java:
##########
@@ -1177,6 +1179,99 @@ public void testReplaceAllWithMatchingGroup() {
verifyEquals("${attr:replaceAll('.*?(l+).*', '$1')}", attributes, "ll");
}
+ @Test
+ public void testReplaceShouldReplaceAllLiteralMatches() {
+ int n = 3;
+ final String ORIGINAL_VALUE = "Hello World";
Review Comment:
Understanding that this is a migration, can you correct the style of these methods variables to use camelCase instead of all capital letters?
```suggestion
final String originalValue = "Hello World";
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] dan-s1 commented on a diff in pull request #7250: [NIFI-11550] Refactored Groovy tests to Java.
Posted by "dan-s1 (via GitHub)" <gi...@apache.org>.
dan-s1 commented on code in PR #7250:
URL: https://github.com/apache/nifi/pull/7250#discussion_r1195615956
##########
nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java:
##########
@@ -1177,6 +1179,99 @@ public void testReplaceAllWithMatchingGroup() {
verifyEquals("${attr:replaceAll('.*?(l+).*', '$1')}", attributes, "ll");
}
+ @Test
+ public void testReplaceShouldReplaceAllLiteralMatches() {
+ int n = 3;
+ final String ORIGINAL_VALUE = "Hello World";
+ final Map<String, String> attributes = Map.of("single", ORIGINAL_VALUE,
+ "repeating", StringUtils.repeat(ORIGINAL_VALUE, " ", n));
+ final String REPLACEMENT_VALUE = "Goodbye Planet";
+ final String EXPECTED_REPEATING_RESULT = StringUtils.repeat(REPLACEMENT_VALUE, " ", n);
+ final String REPLACE_SINGLE_EXPRESSION = "${single:replace('" + ORIGINAL_VALUE + "', '" + REPLACEMENT_VALUE + "')}";
+ final String REPLACE_REPEATING_EXPRESSION = "${repeating:replace('" + ORIGINAL_VALUE + "', '" + REPLACEMENT_VALUE + "')}";
+ Query replaceSingleQuery = Query.compile(REPLACE_SINGLE_EXPRESSION);
+ Query replaceRepeatingQuery = Query.compile(REPLACE_REPEATING_EXPRESSION);
+
+ QueryResult<?> replaceSingleResult = replaceSingleQuery.evaluate(new StandardEvaluationContext(attributes));
+ QueryResult<?> replaceRepeatingResult = replaceRepeatingQuery.evaluate(new StandardEvaluationContext(attributes));
+
+ assertEquals(REPLACEMENT_VALUE, replaceSingleResult.getValue());
+ assertEquals(AttributeExpression.ResultType.STRING, replaceSingleResult.getResultType());
+ assertEquals(EXPECTED_REPEATING_RESULT, replaceRepeatingResult.getValue());
+ assertEquals(AttributeExpression.ResultType.STRING, replaceRepeatingResult.getResultType());
+ }
+
+ @Test
+ public void testReplaceFirstShouldOnlyReplaceFirstRegexMatch() {
+ // Arrange
Review Comment:
@exceptionfactory I made the changes you requested.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org