This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 6ba0df3 [NETBEANS-4501] Fixed tests for Smarty Framework
new f8ad6ea Merge pull request #2218 from
KacerCZ/netbeans-4501-fix-smarty-tests
6ba0df3 is described below
commit 6ba0df3cdcabf0981b8701b245558b2038ef8b41
Author: Tomas Prochazka <[email protected]>
AuthorDate: Sun Jun 28 21:51:00 2020 +0200
[NETBEANS-4501] Fixed tests for Smarty Framework
https://issues.apache.org/jira/browse/NETBEANS-4501
- Updated code completion tests - definition data were not donated.
- Enabled tests in Travis and Github Actions.
---
.github/workflows/main.yml | 2 +-
.travis.yml | 2 +-
.../php/smarty/editor/completion/TplCompletionQueryTest.java | 8 ++++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ffd3480..2399595 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -68,7 +68,7 @@ jobs:
ant -f php/php.phpunit test
ant -f php/php.project test
ant -f php/php.refactoring test
- # ant -f php/php.smarty test
+ ant -f php/php.smarty test
ant -f php/php.symfony test
ant -f php/php.symfony2 test
ant -f php/php.twig test
diff --git a/.travis.yml b/.travis.yml
index 6637666..560963f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -685,7 +685,7 @@ matrix:
- ant $OPTS -f php/php.phpunit test
- ant $OPTS -f php/php.project test
- ant $OPTS -f php/php.refactoring test
- #- ant $OPTS -f php/php.smarty test
+ - ant $OPTS -f php/php.smarty test
- ant $OPTS -f php/php.symfony test
- ant $OPTS -f php/php.symfony2 test
- ant $OPTS -f php/php.twig test
diff --git
a/php/php.smarty/test/unit/src/org/netbeans/modules/php/smarty/editor/completion/TplCompletionQueryTest.java
b/php/php.smarty/test/unit/src/org/netbeans/modules/php/smarty/editor/completion/TplCompletionQueryTest.java
index ec12e88..7b298f7 100644
---
a/php/php.smarty/test/unit/src/org/netbeans/modules/php/smarty/editor/completion/TplCompletionQueryTest.java
+++
b/php/php.smarty/test/unit/src/org/netbeans/modules/php/smarty/editor/completion/TplCompletionQueryTest.java
@@ -43,11 +43,15 @@ public class TplCompletionQueryTest extends CslTestBase {
//
public void testTagAttributeValues() throws Exception {
- assertItems("{|", arr("append", "if", "section"), Match.CONTAINS);
+ // Original test fails because completion data were not donated.
+ // assertItems("{|", arr("append", "if", "section"), Match.CONTAINS);
+ assertItems("{|", arr(), Match.EMPTY);
}
public void testIssue22376() throws Exception {
- assertItems("{|\n", arr("append", "if", "section"), Match.CONTAINS);
+ // Original test fails because completion data were not donated.
+ // assertItems("{|\n", arr("append", "if", "section"), Match.CONTAINS);
+ assertItems("{|\n", arr(), Match.EMPTY);
}
protected void assertItems(String documentText, final String[]
expectedItemsNames, final Match type) throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
