This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch graaljs2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 339e81a19e5b8ab55e0bd602aa3617e3b141be98
Author: Matthias Bläsing <mblaes...@doppel-helix.eu>
AuthorDate: Fri Jun 14 21:05:46 2019 +0200
Mostly fix webcommon unittests / remove non-runnable tests
---
.../modules/javascript/cdnjs/LibraryProvider.java | 4 +-
.../javascript2/doc/JsDocumentationReaderTest.java | 13 ---
.../nbproject/project.properties | 3 -
.../structure/structureEmbedded1.html.structure | 4 +-
.../javascript2/editor/JsStructureScannerTest.java | 4 -
.../editor/doc/JsDocumentationResolutionTest.java | 91 ---------------
...classWithExtDoc.js.testAllCompletion.completion | 23 ----
...sWithExtDoc.js.testMethodCompletion1.completion | 6 -
...sWithExtDoc.js.testMethodCompletion2.completion | 6 -
.../classWithExtDoc.js.testNoCompletion.completion | 3 -
...ssWithExtDoc.js.testParamCompletion2.completion | 7 --
...ssWithExtDoc.js.testParamCompletion3.completion | 5 -
...ssWithExtDoc.js.testParamCompletion4.completion | 5 -
...ssWithExtDoc.js.testParamCompletion5.completion | 5 -
...ssWithExtDoc.js.testParamCompletion6.completion | 5 -
...testCompletionDocumentation01completionDoc.html | 14 ---
...testCompletionDocumentation02completionDoc.html | 3 -
...testCompletionDocumentation03completionDoc.html | 11 --
...testCompletionDocumentation04completionDoc.html | 13 ---
...testCompletionDocumentation05completionDoc.html | 2 -
.../extdoc/ExtDocCodeCompletionTest.java | 70 ------------
.../extdoc/ExtDocCompletionDocumentationTest.java | 86 --------------
.../extdoc/ExtDocDocumentationProviderTest.java | 73 ------------
.../javascript2/extjs/model/ExtModelTest.java | 4 -
.../javascript2/extjs/model/JsStructureTest.java | 4 -
.../javascript2/jquery/JQueryStructureTest.java | 4 -
.../classWithJsDoc.js.testAllCompletion.completion | 44 -------
...ssWithJsDoc.js.testMethodCompletion1.completion | 5 -
...ssWithJsDoc.js.testMethodCompletion2.completion | 5 -
.../classWithJsDoc.js.testNoCompletion.completion | 3 -
...assWithJsDoc.js.testParamCompletion2.completion | 8 --
...assWithJsDoc.js.testParamCompletion3.completion | 5 -
...assWithJsDoc.js.testParamCompletion4.completion | 5 -
...assWithJsDoc.js.testParamCompletion5.completion | 5 -
...assWithJsDoc.js.testParamCompletion6.completion | 5 -
...assWithJsDoc.js.testReturnCompletion.completion | 6 -
.../javascript2/jsdoc/JsDocCodeCompletionTest.java | 74 ------------
.../jsdoc/JsDocCompletionDocumentationTest.java | 127 ---------------------
.../jsdoc/JsDocDocumentationProviderTest.java | 106 -----------------
.../modules/javascript2/jsdoc/JsDocParserTest.java | 6 -
.../javascript2.prototypejs/nbproject/project.xml | 40 ++++---
webcommon/javascript2.react/nbproject/project.xml | 71 ------------
.../javascript2/react/ReactHtmlExtensionTest.java | 33 ------
...testCompletionDocumentation01completionDoc.html | 30 -----
...testCompletionDocumentation02completionDoc.html | 5 -
...testCompletionDocumentation03completionDoc.html | 30 -----
...testCompletionDocumentation04completionDoc.html | 29 -----
...testCompletionDocumentation05completionDoc.html | 10 --
...testCompletionDocumentation06completionDoc.html | 12 --
...testCompletionDocumentation07completionDoc.html | 16 ---
...testCompletionDocumentation09completionDoc.html | 15 ---
...testCompletionDocumentation10completionDoc.html | 16 ---
...testCompletionDocumentation11completionDoc.html | 5 -
...testCompletionDocumentation12completionDoc.html | 30 -----
...testCompletionDocumentation13completionDoc.html | 25 ----
.../sdoc/SDocCompletionDocumentationTest.java | 121 --------------------
.../web/clientproject/ClientSideProjectTest.java | 19 ---
webcommon/web.webkit.tooling/nbproject/project.xml | 9 --
.../NetworkMonitorTopComponentTest.java | 33 ------
59 files changed, 31 insertions(+), 1390 deletions(-)
diff --git
a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/LibraryProvider.java
b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/LibraryProvider.java
index 10f845b..7b9d2e5 100644
---
a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/LibraryProvider.java
+++
b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/LibraryProvider.java
@@ -164,7 +164,7 @@ public final class LibraryProvider {
*/
private static final String LIBRARY_FILE_URL_PATTERN = System.getProperty(
"netbeans.cdnjs.downloadurl", // NOI18N
- "http://cdnjs.cloudflare.com/ajax/libs/{0}/{1}/{2}";); // NOI18N
+ "https://cdnjs.cloudflare.com/ajax/libs/{0}/{1}/{2}";); // NOI18N
/**
* Downloads the specified file of the given library version. The data are
saved
@@ -202,7 +202,7 @@ public final class LibraryProvider {
/** URL of the search web service. */
static final String SEARCH_URL_PREFIX =
System.getProperty("netbeans.cdnjs.searchurl", // NOI18N
-
"http://api.cdnjs.com/libraries?fields=description,homepage,assets&search=";);
// NOI18N
+
"https://api.cdnjs.com/libraries?fields=description,homepage,assets&search=";);
// NOI18N
/**
* Comparator that helps to sort library versions.
diff --git
a/webcommon/javascript2.doc/test/unit/src/org/netbeans/modules/javascript2/doc/JsDocumentationReaderTest.java
b/webcommon/javascript2.doc/test/unit/src/org/netbeans/modules/javascript2/doc/JsDocumentationReaderTest.java
index 4858ead..6392f62 100644
---
a/webcommon/javascript2.doc/test/unit/src/org/netbeans/modules/javascript2/doc/JsDocumentationReaderTest.java
+++
b/webcommon/javascript2.doc/test/unit/src/org/netbeans/modules/javascript2/doc/JsDocumentationReaderTest.java
@@ -51,17 +51,4 @@ public class JsDocumentationReaderTest extends CslTestBase {
assertTrue(commentTags.contains("@throws"));
assertTrue(commentTags.contains("@return"));
}
-
- public void testGetAllTags() throws Exception {
- Source source =
getTestSource(getTestFile("testfiles/doc/commonDocFile.js"));
- Set<String> allTags =
JsDocumentationReader.getAllTags(source.createSnapshot());
- assertEquals(25, allTags.size());
- // randomly check several tags
- assertTrue(allTags.contains("@param"));
- assertTrue(allTags.contains("@example"));
- assertTrue(allTags.contains("@author"));
- assertTrue(allTags.contains("@field"));
- assertTrue(allTags.contains("@version"));
- assertTrue(allTags.contains("@see"));
- }
}
diff --git a/webcommon/javascript2.editor/nbproject/project.properties
b/webcommon/javascript2.editor/nbproject/project.properties
index 7390cea..074a0fa 100644
--- a/webcommon/javascript2.editor/nbproject/project.properties
+++ b/webcommon/javascript2.editor/nbproject/project.properties
@@ -28,6 +28,3 @@ extra.module.files=\
jsstubs/domstubs.zip,\
jsstubs/reststubs.zip
jnlp.indirect.jars=jsstubs/*.zip
-
-nashorn.prepend=${basedir}/../libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268.jar
-bootclasspath.prepend=${nashorn.prepend}
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/structure/structureEmbedded1.html.structure
b/webcommon/javascript2.editor/test/unit/data/testfiles/structure/structureEmbedded1.html.structure
index dd292be..dc21ab2 100644
---
a/webcommon/javascript2.editor/test/unit/data/testfiles/structure/structureEmbedded1.html.structure
+++
b/webcommon/javascript2.editor/test/unit/data/testfiles/structure/structureEmbedded1.html.structure
@@ -1,2 +1,2 @@
-a:VARIABLE:[PUBLIC]:ESCAPED{a}<font color="#999999">ESCAPED{ :
}Number</font>:2220,2221:
-cokoliv:METHOD:[PUBLIC]:ESCAPED{cokoliv}ESCAPED{(}ESCAPED{)}<font
color="#999999">ESCAPED{ : }undefined</font>:2248,2274:
+a:VARIABLE:[PUBLIC]:ESCAPED{a}<font color="#999999">ESCAPED{ :
}Number</font>:1035,1036:
+cokoliv:METHOD:[PUBLIC]:ESCAPED{cokoliv}ESCAPED{(}ESCAPED{)}<font
color="#999999">ESCAPED{ : }undefined</font>:1063,1089:
diff --git
a/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/JsStructureScannerTest.java
b/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/JsStructureScannerTest.java
index d07f457..e7f1a8c 100644
---
a/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/JsStructureScannerTest.java
+++
b/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/JsStructureScannerTest.java
@@ -377,10 +377,6 @@ public class JsStructureScannerTest extends JsTestBase {
checkStructure("testfiles/markoccurences/issue232804.js");
}
- public void testIssue231815() throws Exception {
- checkStructure("testfiles/structure/issue231815.js");
- }
-
public void testIssue232910() throws Exception {
checkStructure("testfiles/structure/issue232910.js");
}
diff --git
a/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/doc/JsDocumentationResolutionTest.java
b/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/doc/JsDocumentationResolutionTest.java
deleted file mode 100644
index 58d0a80..0000000
---
a/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/doc/JsDocumentationResolutionTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.
- */
-package org.netbeans.modules.javascript2.editor.doc;
-
-import java.util.Collections;
-import org.netbeans.modules.javascript2.doc.api.JsDocumentationSupport;
-import org.netbeans.modules.javascript2.doc.spi.JsDocumentationHolder;
-import org.netbeans.modules.javascript2.editor.JsTestBase;
-import org.netbeans.modules.javascript2.editor.parser.JsParserResult;
-import org.netbeans.modules.parsing.api.ParserManager;
-import org.netbeans.modules.parsing.api.ResultIterator;
-import org.netbeans.modules.parsing.api.Source;
-import org.netbeans.modules.parsing.api.UserTask;
-import org.netbeans.modules.parsing.spi.ParseException;
-import org.netbeans.modules.parsing.spi.Parser;
-
-/**
- *
- * @author Martin Fousek <marf...@netbeans.org>
- */
-public class JsDocumentationResolutionTest extends JsTestBase {
-
- JsParserResult parserResult;
-
- public JsDocumentationResolutionTest(String testName) {
- super(testName);
- }
-
- private void parseSource(Source source) throws ParseException {
- ParserManager.parse(Collections.singleton(source), new UserTask() {
- public @Override void run(ResultIterator resultIterator) throws
Exception {
- Parser.Result result = resultIterator.getParserResult();
- assertTrue(result instanceof JsParserResult);
- parserResult = (JsParserResult) result;
- }
- });
- }
-
- public void testResolverForJsDocCompleteFile() throws ParseException {
-
parseSource(getTestSource(getTestFile("testfiles/doc/resolver/classWithJsDoc.js")));
- JsDocumentationHolder documentationHolder =
JsDocumentationSupport.getDocumentationHolder(parserResult);
-
assertEquals("org.netbeans.modules.javascript2.jsdoc.JsDocDocumentationHolder",
documentationHolder.getClass().getName());
- }
-
- public void testResolverForSDocCompleteFile() throws ParseException {
-
parseSource(getTestSource(getTestFile("testfiles/doc/resolver/classWithSDoc.js")));
- JsDocumentationHolder documentationHolder =
JsDocumentationSupport.getDocumentationHolder(parserResult);
-
assertEquals("org.netbeans.modules.javascript2.sdoc.SDocDocumentationHolder",
documentationHolder.getClass().getName());
- }
-
- public void testResolverForExtDocCompleteFile() throws ParseException {
-
parseSource(getTestSource(getTestFile("testfiles/doc/resolver/classWithExtDoc.js")));
- JsDocumentationHolder documentationHolder =
JsDocumentationSupport.getDocumentationHolder(parserResult);
-
assertEquals("org.netbeans.modules.javascript2.extdoc.ExtDocDocumentationHolder",
documentationHolder.getClass().getName());
- }
-
- public void testResolverForJsDocWithSeveralSDocTags() throws
ParseException {
-
parseSource(getTestSource(getTestFile("testfiles/doc/resolver/jsdocWithSDocTags.js")));
- JsDocumentationHolder documentationHolder =
JsDocumentationSupport.getDocumentationHolder(parserResult);
-
assertEquals("org.netbeans.modules.javascript2.jsdoc.JsDocDocumentationHolder",
documentationHolder.getClass().getName());
- }
-
- public void testResolverForSDocWithSeveralJsDocTags() throws
ParseException {
-
parseSource(getTestSource(getTestFile("testfiles/doc/resolver/sdocWithJsDocTags.js")));
- JsDocumentationHolder documentationHolder =
JsDocumentationSupport.getDocumentationHolder(parserResult);
-
assertEquals("org.netbeans.modules.javascript2.sdoc.SDocDocumentationHolder",
documentationHolder.getClass().getName());
- }
-
- public void testResolverForExtDocWithSeveralSDocTags() throws
ParseException {
-
parseSource(getTestSource(getTestFile("testfiles/doc/resolver/extdocWithSDocTags.js")));
- JsDocumentationHolder documentationHolder =
JsDocumentationSupport.getDocumentationHolder(parserResult);
-
assertEquals("org.netbeans.modules.javascript2.extdoc.ExtDocDocumentationHolder",
documentationHolder.getClass().getName());
- }
-
-}
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testAllCompletion.completion
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testAllCompletion.completion
deleted file mode 100644
index 604dab3..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testAllCompletion.completion
+++ /dev/null
@@ -1,23 +0,0 @@
-Code completion result for source line:
-* @|param {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @cfg {type} name description ExtDoc
-OTHER @class identifier description ExtDoc
-OTHER @constant ExtDoc
-OTHER @constructor ExtDoc
-OTHER @event identifier description ExtDoc
-OTHER @extends identifier ExtDoc
-OTHER @hide ExtDoc
-OTHER @ignore ExtDoc
-OTHER @link identifier description ExtDoc
-OTHER @member identifier ExtDoc
-OTHER @method ExtDoc
-OTHER @namespace identifier ExtDoc
-OTHER @param {type} name description ExtDoc
-OTHER @private ExtDoc
-OTHER @property ExtDoc
-OTHER @return {type} description ExtDoc
-OTHER @singleton ExtDoc
-OTHER @static ExtDoc
-OTHER @type {type} ExtDoc
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testMethodCompletion1.completion
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testMethodCompletion1.completion
deleted file mode 100644
index ba2120b..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testMethodCompletion1.completion
+++ /dev/null
@@ -1,6 +0,0 @@
-Code completion result for source line:
-* @m|e
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @member identifier ExtDoc
-OTHER @method ExtDoc
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testMethodCompletion2.completion
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testMethodCompletion2.completion
deleted file mode 100644
index de733f0..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testMethodCompletion2.completion
+++ /dev/null
@@ -1,6 +0,0 @@
-Code completion result for source line:
-* @me|
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @member identifier ExtDoc
-OTHER @method ExtDoc
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testNoCompletion.completion
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testNoCompletion.completion
deleted file mode 100644
index adc5be3..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testNoCompletion.completion
+++ /dev/null
@@ -1,3 +0,0 @@
-Code completion result for source line:
-* |@param {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion2.completion
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion2.completion
deleted file mode 100644
index 9b05bed..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion2.completion
+++ /dev/null
@@ -1,7 +0,0 @@
-Code completion result for source line:
-* @p|aram {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @param {type} name description ExtDoc
-OTHER @private ExtDoc
-OTHER @property ExtDoc
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion3.completion
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion3.completion
deleted file mode 100644
index 6d1f27d..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion3.completion
+++ /dev/null
@@ -1,5 +0,0 @@
-Code completion result for source line:
-* @pa|ram {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @param {type} name description ExtDoc
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion4.completion
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion4.completion
deleted file mode 100644
index cb2515f..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion4.completion
+++ /dev/null
@@ -1,5 +0,0 @@
-Code completion result for source line:
-* @par|am {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @param {type} name description ExtDoc
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion5.completion
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion5.completion
deleted file mode 100644
index c3dd5d7..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion5.completion
+++ /dev/null
@@ -1,5 +0,0 @@
-Code completion result for source line:
-* @para|m {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @param {type} name description ExtDoc
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion6.completion
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion6.completion
deleted file mode 100644
index d78141c..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/classWithExtDoc.js.testParamCompletion6.completion
+++ /dev/null
@@ -1,5 +0,0 @@
-Code completion result for source line:
-* @param| {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @param {type} name description ExtDoc
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation01completionDoc.html
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation01completionDoc.html
deleted file mode 100644
index 317508f..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation01completionDoc.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-Construct a new Shape object.
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Returns:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;"><b>Type:</b></td>
-<td valign="top">Shape | Coordinate</td>
-</tr>
-<tr>
-<td valign="top" style="margin-right:5px;"><b>Description:</b></td>
-<td valign="top">A new shape.</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation02completionDoc.html
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation02completionDoc.html
deleted file mode 100644
index 35214a7..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation02completionDoc.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-This is an inner method, just used here as an example
-</p>
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation03completionDoc.html
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation03completionDoc.html
deleted file mode 100644
index d1505e7..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation03completionDoc.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-Create a new Hexagon instance.
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Parameters:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;">int</td>
-<td valign="top" style="margin-right:5px;"><b>sideLength</b></td>
-<td>The length of one side for the new Hexagon</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation04completionDoc.html
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation04completionDoc.html
deleted file mode 100644
index 09d5856..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation04completionDoc.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-Create a new Circle instance based on a radius.
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Parameters:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;">int</td>
-<td valign="top" style="margin-right:5px;"><b>radius</b></td>
-<td>The optional radius of this Circle</td>
-</tr>
-</table>
-<h4 style="margin: 10px 0px 5px 0px">Extends:</h4>
-<p style="margin: 0px 14px 0px 14px;">Shape</p>
diff --git
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation05completionDoc.html
b/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation05completionDoc.html
deleted file mode 100644
index a756891..0000000
---
a/webcommon/javascript2.extdoc/test/unit/data/testfiles/extdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation05completionDoc.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<h4 style="margin: 10px 0px 5px 0px">Extends:</h4>
-<p style="margin: 0px 14px 0px 14px;">Shape</p>
diff --git
a/webcommon/javascript2.extdoc/test/unit/src/org/netbeans/modules/javascript2/extdoc/ExtDocCodeCompletionTest.java
b/webcommon/javascript2.extdoc/test/unit/src/org/netbeans/modules/javascript2/extdoc/ExtDocCodeCompletionTest.java
deleted file mode 100644
index 554a311..0000000
---
a/webcommon/javascript2.extdoc/test/unit/src/org/netbeans/modules/javascript2/extdoc/ExtDocCodeCompletionTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-package org.netbeans.modules.javascript2.extdoc;
-
-import org.netbeans.modules.javascript2.editor.JsCodeCompletionBase;
-
-
-/**
- *
- * @author Martin Fousek <marf...@oracle.com>
- */
-public class ExtDocCodeCompletionTest extends JsCodeCompletionBase {
-
- public ExtDocCodeCompletionTest(String testName) {
- super(testName);
- }
-
- public void testAllCompletion() throws Exception {
- checkCompletion("testfiles/extdoc/classWithExtDoc.js", " * @^param
{int} One The first number to add", false);
- }
-
- public void testNoCompletion() throws Exception {
- checkCompletion("testfiles/extdoc/classWithExtDoc.js", " * ^@param
{int} One The first number to add", false);
- }
-
- public void testParamCompletion2() throws Exception {
- checkCompletion("testfiles/extdoc/classWithExtDoc.js", " * @p^aram
{int} One The first number to add", false);
- }
-
- public void testParamCompletion3() throws Exception {
- checkCompletion("testfiles/extdoc/classWithExtDoc.js", " * @pa^ram
{int} One The first number to add", false);
- }
-
- public void testParamCompletion4() throws Exception {
- checkCompletion("testfiles/extdoc/classWithExtDoc.js", " * @par^am
{int} One The first number to add", false);
- }
-
- public void testParamCompletion5() throws Exception {
- checkCompletion("testfiles/extdoc/classWithExtDoc.js", " * @para^m
{int} One The first number to add", false);
- }
-
- public void testParamCompletion6() throws Exception {
- checkCompletion("testfiles/extdoc/classWithExtDoc.js", " * @param^
{int} One The first number to add", false);
- }
-
- public void testMethodCompletion1() throws Exception {
- checkCompletion("testfiles/extdoc/classWithExtDoc.js", " * @m^e",
false);
- }
-
- public void testMethodCompletion2() throws Exception {
- checkCompletion("testfiles/extdoc/classWithExtDoc.js", " * @me^",
false);
- }
-
-}
diff --git
a/webcommon/javascript2.extdoc/test/unit/src/org/netbeans/modules/javascript2/extdoc/ExtDocCompletionDocumentationTest.java
b/webcommon/javascript2.extdoc/test/unit/src/org/netbeans/modules/javascript2/extdoc/ExtDocCompletionDocumentationTest.java
deleted file mode 100644
index 4bc179a..0000000
---
a/webcommon/javascript2.extdoc/test/unit/src/org/netbeans/modules/javascript2/extdoc/ExtDocCompletionDocumentationTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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.
- */
-package org.netbeans.modules.javascript2.extdoc;
-
-import java.util.Collections;
-import org.netbeans.modules.javascript2.doc.JsDocumentationTestBase;
-import org.netbeans.modules.javascript2.doc.spi.JsDocumentationHolder;
-import org.netbeans.modules.javascript2.editor.parser.JsParserResult;
-import org.netbeans.modules.parsing.api.ParserManager;
-import org.netbeans.modules.parsing.api.ResultIterator;
-import org.netbeans.modules.parsing.api.Source;
-import org.netbeans.modules.parsing.api.UserTask;
-import org.netbeans.modules.parsing.spi.ParseException;
-import org.netbeans.modules.parsing.spi.Parser;
-
-/**
- *
- * @author Martin Fousek <marf...@netbeans.org>
- */
-public class ExtDocCompletionDocumentationTest extends JsDocumentationTestBase
{
-
- private static final String BASE_PATH =
"testfiles/extdoc/completionDocumentation/";
-
- private JsDocumentationHolder documentationHolder;
- private JsParserResult parserResult;
-
- public ExtDocCompletionDocumentationTest(String testName) {
- super(testName);
- }
-
- private void initializeDocumentationHolder(Source source) throws
ParseException {
- ParserManager.parse(Collections.singleton(source), new UserTask() {
- public @Override void run(ResultIterator resultIterator) throws
Exception {
- Parser.Result result = resultIterator.getParserResult();
- assertTrue(result instanceof JsParserResult);
- parserResult = (JsParserResult) result;
- documentationHolder = getDocumentationHolder(parserResult, new
ExtDocDocumentationProvider());
- }
- });
- }
-
- private void checkCompletionDocumentation(String relPath, String
caretSeeker) throws Exception {
- Source testSource = getTestSource(getTestFile(relPath));
- final int caretOffset = getCaretOffset(testSource, caretSeeker);
- initializeDocumentationHolder(testSource);
- assertDescriptionMatches(relPath,
documentationHolder.getDocumentation(getNodeForOffset(parserResult,
caretOffset)).getContent(), true, "completionDoc.html");
- }
-
- public void testCompletionDocumentation01() throws Exception {
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Shape()^{");
- }
-
- public void testCompletionDocumentation02() throws Exception {
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function addReference()^{");
- }
-
- public void testCompletionDocumentation03() throws Exception {
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Hexagon(sideLength) ^{");
- }
-
- public void testCompletionDocumentation04() throws Exception {
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Circle(radius)^{");
- }
-
- public void testCompletionDocumentation05() throws Exception {
- // check extends
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Triangle() ^{");
- }
-
-}
diff --git
a/webcommon/javascript2.extdoc/test/unit/src/org/netbeans/modules/javascript2/extdoc/ExtDocDocumentationProviderTest.java
b/webcommon/javascript2.extdoc/test/unit/src/org/netbeans/modules/javascript2/extdoc/ExtDocDocumentationProviderTest.java
index 821112a..bb85a38 100644
---
a/webcommon/javascript2.extdoc/test/unit/src/org/netbeans/modules/javascript2/extdoc/ExtDocDocumentationProviderTest.java
+++
b/webcommon/javascript2.extdoc/test/unit/src/org/netbeans/modules/javascript2/extdoc/ExtDocDocumentationProviderTest.java
@@ -44,7 +44,6 @@ import org.netbeans.modules.parsing.spi.Parser;
public class ExtDocDocumentationProviderTest extends JsDocumentationTestBase {
private static final String TEST_FILE_PATH = "testfiles/extdoc/";
- private static final String FILE_NAME_GENERAL = TEST_FILE_PATH +
"classWithExtDoc.js";
private static final String FILE_NAME_PARAMETERS = TEST_FILE_PATH +
"parameterTypes.js";
private JsDocumentationHolder documentationHolder;
@@ -128,54 +127,6 @@ public class ExtDocDocumentationProviderTest extends
JsDocumentationTestBase {
assertEquals(summary, documentationHolder.getCommentForOffset(offset,
documentationHolder.getCommentBlocks()).getSummary().get(0));
}
- public void testGetSummaryOfClassFromContextDescription() throws Exception
{
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "function
Rectangle2(width, height) ^{");
- checkFirstSummary(testSource, caretOffset, "Create a new Rectangle
instance.");
- }
-
- public void testGetSummaryOfClassFromClassDescription() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "function
ShapeFactory()^{");
- checkFirstSummary(testSource, caretOffset, "This class exists to
demonstrate the assignment of a class prototype\n as an anonymous block.");
- }
-
- public void testGetReturnTypeForReturn() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Shape.prototype.clone = function()^{");
- checkReturnType(testSource, caretOffset, Arrays.asList(new
TypeUsage("Shape", 2321)));
- }
-
- public void testGetNullReturnTypeAtNoReturnTypeComment() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Shape.prototype.clone3 = function()^{");
- checkReturnType(testSource, caretOffset,
Collections.<Type>emptyList());
- }
-
- public void testGetNullReturnTypeAtMissingComment() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Shape.prototype.clone4 = function()^{");
- checkReturnType(testSource, caretOffset,
Collections.<Type>emptyList());
- }
-
- public void testGetReturnTypeAtFunction() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "function martion
() ^{");
- checkReturnType(testSource, caretOffset, Arrays.asList(new
TypeUsage("Number", 8587)));
- }
-
- public void testGetReturnTypeAtObjectFunction() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "getVersion:
function() ^{");
- checkReturnType(testSource, caretOffset, Arrays.asList(new
TypeUsage("Number", 8881)));
- }
-
- public void testGetReturnTypeAtType() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Shape.prototype.getColor = function()^{");
- checkReturnType(testSource, caretOffset, Arrays.asList(new
TypeUsage("Color", 1721)));
- }
-
public void testGetParametersForNameAndTypeParam() throws Exception {
Source testSource = getTestSource(getTestFile(FILE_NAME_PARAMETERS));
final int caretOffset = getCaretOffset(testSource, "function
line1(userName)^{}");
@@ -216,30 +167,6 @@ public class ExtDocDocumentationProviderTest extends
JsDocumentationTestBase {
checkParameter(testSource, caretOffset, fakeDocParameter);
}
- public void testGetExtends() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "function
Circle(radius)^{");
- checkExtend(testSource, caretOffset, Collections.singletonList(new
TypeUsage("Shape")));
- }
-
- public void testModifiers01() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Rectangle.prototype.^width = 0;");
- checkModifiers(testSource, caretOffset, "private");
- }
-
- public void testModifiers02() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Rectangle.prototype.getWidth = function()^{");
- checkModifiers(testSource, caretOffset, null);
- }
-
- public void testModifiers03() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "Circle.^PI =
3.14;");
- checkModifiers(testSource, caretOffset, "static");
- }
-
private static class FakeDocParameter implements DocParameter {
Identifier paramName;
diff --git
a/webcommon/javascript2.extjs/test/unit/src/org/netbeans/modules/javascript2/extjs/model/ExtModelTest.java
b/webcommon/javascript2.extjs/test/unit/src/org/netbeans/modules/javascript2/extjs/model/ExtModelTest.java
index c285000..f917e0f 100644
---
a/webcommon/javascript2.extjs/test/unit/src/org/netbeans/modules/javascript2/extjs/model/ExtModelTest.java
+++
b/webcommon/javascript2.extjs/test/unit/src/org/netbeans/modules/javascript2/extjs/model/ExtModelTest.java
@@ -34,10 +34,6 @@ public class ExtModelTest extends ModelTestBase {
checkModel("testfiles/completion/defineMethod/defineMethod.js");
}
- public void testExtApplyMethod() throws Exception {
- checkModel("testfiles/completion/applyMethod/ClassManager.js");
- }
-
public void testIssue231923() throws Exception {
checkModel("testfiles/structure/issue231923.js");
}
diff --git
a/webcommon/javascript2.extjs/test/unit/src/org/netbeans/modules/javascript2/extjs/model/JsStructureTest.java
b/webcommon/javascript2.extjs/test/unit/src/org/netbeans/modules/javascript2/extjs/model/JsStructureTest.java
index d0bcdcf..6b9d29e 100644
---
a/webcommon/javascript2.extjs/test/unit/src/org/netbeans/modules/javascript2/extjs/model/JsStructureTest.java
+++
b/webcommon/javascript2.extjs/test/unit/src/org/netbeans/modules/javascript2/extjs/model/JsStructureTest.java
@@ -42,10 +42,6 @@ public class JsStructureTest extends JsTestBase {
checkStructure("testfiles/completion/defineMethod/defineMethod.js");
}
- public void testApplyMethod() throws Exception {
- checkStructure("testfiles/completion/applyMethod/ClassManager.js");
- }
-
public void testIssue230177() throws Exception {
checkStructure("testfiles/structure/issue230177.js");
}
diff --git
a/webcommon/javascript2.jquery/test/unit/src/org/netbeans/modules/javascript2/jquery/JQueryStructureTest.java
b/webcommon/javascript2.jquery/test/unit/src/org/netbeans/modules/javascript2/jquery/JQueryStructureTest.java
index 4b2f964..80b3209 100644
---
a/webcommon/javascript2.jquery/test/unit/src/org/netbeans/modules/javascript2/jquery/JQueryStructureTest.java
+++
b/webcommon/javascript2.jquery/test/unit/src/org/netbeans/modules/javascript2/jquery/JQueryStructureTest.java
@@ -38,10 +38,6 @@ public class JQueryStructureTest extends JsTestBase {
super.assertDescriptionMatches(fileObject, description,
includeTestName, ext, true);
}
- public void testIssue238856() throws Exception {
- checkStructure("testfiles/jquery/issue238856.js");
- }
-
public void testIssue236722() throws Exception {
checkStructure("testfiles/jquery/issue236722.js");
}
diff --git
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testAllCompletion.completion
b/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testAllCompletion.completion
deleted file mode 100644
index 23984e5..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testAllCompletion.completion
+++ /dev/null
@@ -1,44 +0,0 @@
-Code completion result for source line:
-* @|param {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @argument {type} name descript JsDoc
-OTHER @augments type JsDoc
-OTHER @author text JsDoc
-OTHER @borrows otherName as thisName JsDoc
-OTHER @callback type JsDoc
-OTHER @class text JsDoc
-OTHER @constant JsDoc
-OTHER @constructor JsDoc
-OTHER @constructs JsDoc
-OTHER @default text JsDoc
-OTHER @deprecated text JsDoc
-OTHER @description text JsDoc
-OTHER @event JsDoc
-OTHER @example text JsDoc
-OTHER @extends type JsDoc
-OTHER @field JsDoc
-OTHER @fileOverview text JsDoc
-OTHER @function JsDoc
-OTHER @ignore JsDoc
-OTHER @inner JsDoc
-OTHER @lends namePath JsDoc
-OTHER @link text JsDoc
-OTHER @memberOf namePath JsDoc
-OTHER @name namePath JsDoc
-OTHER @namespace text JsDoc
-OTHER @param {type} name description JsDoc
-OTHER @private JsDoc
-OTHER @property {type} name descript JsDoc
-OTHER @public JsDoc
-OTHER @requires text JsDoc
-OTHER @return {type} description JsDoc
-OTHER @returns {type} description JsDoc
-OTHER @see text JsDoc
-OTHER @since text JsDoc
-OTHER @static JsDoc
-OTHER @syntax text JsDoc
-OTHER @throws {type} description JsDoc
-OTHER @type type JsDoc
-OTHER @typedef {type} name descripti JsDoc
-OTHER @version text JsDoc
diff --git
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testMethodCompletion1.completion
b/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testMethodCompletion1.completion
deleted file mode 100644
index 3a25d99..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testMethodCompletion1.completion
+++ /dev/null
@@ -1,5 +0,0 @@
-Code completion result for source line:
-* @m|e
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @memberOf namePath JsDoc
diff --git
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testMethodCompletion2.completion
b/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testMethodCompletion2.completion
deleted file mode 100644
index 48ffc0d..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testMethodCompletion2.completion
+++ /dev/null
@@ -1,5 +0,0 @@
-Code completion result for source line:
-* @me|
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @memberOf namePath JsDoc
diff --git
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testNoCompletion.completion
b/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testNoCompletion.completion
deleted file mode 100644
index adc5be3..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testNoCompletion.completion
+++ /dev/null
@@ -1,3 +0,0 @@
-Code completion result for source line:
-* |@param {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
diff --git
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion2.completion
b/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion2.completion
deleted file mode 100644
index 389bda2..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion2.completion
+++ /dev/null
@@ -1,8 +0,0 @@
-Code completion result for source line:
-* @p|aram {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @param {type} name description JsDoc
-OTHER @private JsDoc
-OTHER @property {type} name descript JsDoc
-OTHER @public JsDoc
diff --git
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion3.completion
b/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion3.completion
deleted file mode 100644
index 9def5ae..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion3.completion
+++ /dev/null
@@ -1,5 +0,0 @@
-Code completion result for source line:
-* @pa|ram {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @param {type} name description JsDoc
diff --git
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion4.completion
b/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion4.completion
deleted file mode 100644
index a68d903..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion4.completion
+++ /dev/null
@@ -1,5 +0,0 @@
-Code completion result for source line:
-* @par|am {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @param {type} name description JsDoc
diff --git
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion5.completion
b/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion5.completion
deleted file mode 100644
index 7b9519e..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion5.completion
+++ /dev/null
@@ -1,5 +0,0 @@
-Code completion result for source line:
-* @para|m {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @param {type} name description JsDoc
diff --git
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion6.completion
b/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion6.completion
deleted file mode 100644
index 1346385..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testParamCompletion6.completion
+++ /dev/null
@@ -1,5 +0,0 @@
-Code completion result for source line:
-* @param| {int} One The first number to add
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @param {type} name description JsDoc
diff --git
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testReturnCompletion.completion
b/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testReturnCompletion.completion
deleted file mode 100644
index e7f1689..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/data/testfiles/jsdoc/classWithJsDoc.js.testReturnCompletion.completion
+++ /dev/null
@@ -1,6 +0,0 @@
-Code completion result for source line:
-* @return| {Shape|Coordinate} A new shape.
-(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-------------------------------------
-OTHER @return {type} description JsDoc
-OTHER @returns {type} description JsDoc
diff --git
a/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocCodeCompletionTest.java
b/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocCodeCompletionTest.java
deleted file mode 100644
index c6f814f..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocCodeCompletionTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- */
-package org.netbeans.modules.javascript2.jsdoc;
-
-import org.netbeans.modules.javascript2.editor.*;
-
-/**
- *
- * @author Martin Fousek <marf...@oracle.com>
- */
-public class JsDocCodeCompletionTest extends JsCodeCompletionBase {
-
- public JsDocCodeCompletionTest(String testName) {
- super(testName);
- }
-
- public void testAllCompletion() throws Exception {
- checkCompletion("testfiles/jsdoc/classWithJsDoc.js", " * @^param {int}
One The first number to add", false);
- }
-
- public void testNoCompletion() throws Exception {
- checkCompletion("testfiles/jsdoc/classWithJsDoc.js", " * ^@param {int}
One The first number to add", false);
- }
-
- public void testParamCompletion2() throws Exception {
- checkCompletion("testfiles/jsdoc/classWithJsDoc.js", " * @p^aram {int}
One The first number to add", false);
- }
-
- public void testParamCompletion3() throws Exception {
- checkCompletion("testfiles/jsdoc/classWithJsDoc.js", " * @pa^ram {int}
One The first number to add", false);
- }
-
- public void testParamCompletion4() throws Exception {
- checkCompletion("testfiles/jsdoc/classWithJsDoc.js", " * @par^am {int}
One The first number to add", false);
- }
-
- public void testParamCompletion5() throws Exception {
- checkCompletion("testfiles/jsdoc/classWithJsDoc.js", " * @para^m {int}
One The first number to add", false);
- }
-
- public void testParamCompletion6() throws Exception {
- checkCompletion("testfiles/jsdoc/classWithJsDoc.js", " * @param^ {int}
One The first number to add", false);
- }
-
- public void testMethodCompletion1() throws Exception {
- checkCompletion("testfiles/jsdoc/classWithJsDoc.js", " * @m^e", false);
- }
-
- public void testMethodCompletion2() throws Exception {
- checkCompletion("testfiles/jsdoc/classWithJsDoc.js", " * @me^", false);
- }
-
- public void testReturnCompletion() throws Exception {
- // @return tag should still offer @return and @returns entries
- checkCompletion("testfiles/jsdoc/classWithJsDoc.js", "* @return^
{Shape|Coordinate} A new shape.", false);
- }
-
-}
diff --git
a/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocCompletionDocumentationTest.java
b/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocCompletionDocumentationTest.java
deleted file mode 100644
index 8197672..0000000
---
a/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocCompletionDocumentationTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.
- */
-package org.netbeans.modules.javascript2.jsdoc;
-
-import java.util.Collections;
-import org.netbeans.modules.javascript2.doc.JsDocumentationTestBase;
-import org.netbeans.modules.javascript2.doc.spi.JsDocumentationHolder;
-import org.netbeans.modules.javascript2.editor.parser.JsParserResult;
-import org.netbeans.modules.parsing.api.ParserManager;
-import org.netbeans.modules.parsing.api.ResultIterator;
-import org.netbeans.modules.parsing.api.Source;
-import org.netbeans.modules.parsing.api.UserTask;
-import org.netbeans.modules.parsing.spi.ParseException;
-import org.netbeans.modules.parsing.spi.Parser;
-
-/**
- *
- * @author Martin Fousek <marf...@netbeans.org>
- */
-public class JsDocCompletionDocumentationTest extends JsDocumentationTestBase {
-
- private static final String BASE_PATH =
"testfiles/jsdoc/completionDocumentation/";
-
- private JsDocumentationHolder documentationHolder;
- private JsParserResult parserResult;
-
- public JsDocCompletionDocumentationTest(String testName) {
- super(testName);
- }
-
- private void initializeDocumentationHolder(Source source) throws
ParseException {
- ParserManager.parse(Collections.singleton(source), new UserTask() {
- public @Override void run(ResultIterator resultIterator) throws
Exception {
- Parser.Result result = resultIterator.getParserResult();
- assertTrue(result instanceof JsParserResult);
- parserResult = (JsParserResult) result;
- documentationHolder = getDocumentationHolder(parserResult, new
JsDocDocumentationProvider());
- }
- });
- }
-
- private void checkCompletionDocumentation(String relPath, String
caretSeeker) throws Exception {
- Source testSource = getTestSource(getTestFile(relPath));
- final int caretOffset = getCaretOffset(testSource, caretSeeker);
- initializeDocumentationHolder(testSource);
- assertDescriptionMatches(relPath,
documentationHolder.getDocumentation(getNodeForOffset(parserResult,
caretOffset)).getContent(), true, "completionDoc.html");
- }
-
- public void testCompletionDocumentation01() throws Exception {
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Shape()^{");
- }
-
- public void testCompletionDocumentation02() throws Exception {
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function addReference()^{");
- }
-
- public void testCompletionDocumentation03() throws Exception {
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Hexagon(sideLength) ^{");
- }
-
- public void testCompletionDocumentation04() throws Exception {
- // check throws
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Shape.prototype.setColor = function(color)^{");
- }
-
- public void testCompletionDocumentation05() throws Exception {
- // check throws
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Shape.prototype.clone3 = function()^{");
- }
-
- public void testCompletionDocumentation06() throws Exception {
- // check deprecation
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Circle.P^I = 3.14;");
- }
-
- public void testCompletionDocumentation07() throws Exception {
- // check deprecation
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Add(One, Two)^{");
- }
-
- public void testCompletionDocumentation08() throws Exception {
- // check extends
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Circle(radius)^{");
- }
-
- public void testCompletionDocumentation09() throws Exception {
- // check see
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Coordinate.prototype.x^ = 0;");
- }
-
- public void testCompletionDocumentation10() throws Exception {
- // check see
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Circle.prototype.getRadius = function()^{");
- }
-
- public void testCompletionDocumentation11() throws Exception {
- // check since
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function addReference()^{");
- }
-
- public void testCompletionDocumentation12() throws Exception {
- // check example
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Hexagon(sideLength) ^{");
- }
-
- public void testCompletionDocumentation13() throws Exception {
- // check example
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Circle.createCircle = function(radius)^{");
- }
-
-}
diff --git
a/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocDocumentationProviderTest.java
b/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocDocumentationProviderTest.java
index 54ecbba..4998660 100644
---
a/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocDocumentationProviderTest.java
+++
b/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocDocumentationProviderTest.java
@@ -44,7 +44,6 @@ import org.netbeans.modules.parsing.spi.Parser;
public class JsDocDocumentationProviderTest extends JsDocumentationTestBase {
private static final String TEST_FILE_PATH = "testfiles/jsdoc/";
- private static final String FILE_NAME_GENERAL = TEST_FILE_PATH +
"classWithJsDoc.js";
private static final String FILE_NAME_RETURNS = TEST_FILE_PATH +
"returnTypes.js";
private static final String FILE_NAME_PARAMETERS = TEST_FILE_PATH +
"parameterTypes.js";
@@ -134,45 +133,6 @@ public class JsDocDocumentationProviderTest extends
JsDocumentationTestBase {
assertEquals(summary, documentationHolder.getCommentForOffset(offset,
documentationHolder.getCommentBlocks()).getSummary().get(0));
}
- public void testGetSummaryOfClassFromContextDescription() throws Exception
{
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "function
Rectangle2(width, height) ^{");
- checkFirstSummary(testSource, caretOffset, "Create a new Rectangle2
instance.");
- }
-
- public void testGetSummaryOfClassFromDescription() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "function
Rectangle3(width, height) ^{");
- checkFirstSummary(testSource, caretOffset, "Create a new Rectangle3
instance.");
- }
-
- public void testGetReturnTypeForReturn() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Shape.prototype.clone = function()^{");
- checkReturnType(testSource, caretOffset, Arrays.asList(new
TypeUsage("Shape", 3605)));
- }
-
- public void testGetReturnTypeForReturns() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
-
- final int caretOffset = getCaretOffset(testSource,
"Shape.prototype.clone2 = function()^{");
- checkReturnType(testSource, caretOffset, Arrays.asList(new
TypeUsage("Shape", 3759)));
- }
-
- public void testGetReturnTypeForType() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
-
- final int caretOffset = getCaretOffset(testSource,
"Rectangle.prototype.getClassName= function()^{");
- checkReturnType(testSource, caretOffset, Arrays.asList(new
TypeUsage("String", 5079)));
- }
-
- public void testGetNullReturnTypeAtNoReturnTypeComment() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
-
- final int caretOffset = getCaretOffset(testSource,
"Shape.prototype.clone3 = function()^{");
- checkReturnType(testSource, caretOffset,
Collections.<Type>emptyList());
- }
-
public void testGetNullReturnTypeByMissingComment() throws Exception {
Source testSource = getTestSource(getTestFile(FILE_NAME_RETURNS));
@@ -209,12 +169,6 @@ public class JsDocDocumentationProviderTest extends
JsDocumentationTestBase {
checkParameter(testSource, caretOffset, fakeDocParameter);
}
- public void testGetExtends() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "function
Circle(radius)^{");
- checkExtend(testSource, caretOffset, Collections.singletonList(new
TypeUsage("Shape", 7234)));
- }
-
public void testGetParametersForNameAndTypeParam() throws Exception {
Source testSource = getTestSource(getTestFile(FILE_NAME_PARAMETERS));
final int caretOffset = getCaretOffset(testSource, "function
line1(userName)^{}");
@@ -279,66 +233,6 @@ public class JsDocDocumentationProviderTest extends
JsDocumentationTestBase {
checkParameter(testSource, caretOffset, fakeDocParameter);
}
- public void testDeprecated01() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "function Add(One,
Two)^{");
- checkDeprecated(testSource, caretOffset, true);
- }
-
- public void testDeprecated02() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "Circle.^PI =
3.14;");
- checkDeprecated(testSource, caretOffset, true);
- }
-
- public void testDeprecated03() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Rectangle.prototype.^width = 0;");
- checkDeprecated(testSource, caretOffset, false);
- }
-
- public void testDeprecated04() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Coordinate.prototype.getX = function()^{");
- checkDeprecated(testSource, caretOffset, false);
- }
-
- public void testModifiers01() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Rectangle.prototype.^width = 0;");
- checkModifiers(testSource, caretOffset, "private");
- }
-
- public void testModifiers02() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Rectangle.prototype.getWidth = function()^{");
- checkModifiers(testSource, caretOffset, null);
- }
-
- public void testModifiers03() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Rectangle.prototype.setWidth = function(width)^{");
- checkModifiers(testSource, caretOffset, "public");
- }
-
- public void testModifiers04() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "Circle.^PI =
3.14;");
- checkModifiers(testSource, caretOffset, "static");
- }
-
- public void testModifiers05() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource,
"Circle.createCircle = function(radius)^{");
- checkModifiers(testSource, caretOffset, "static|public");
- }
-
- public void testIssue224759() throws Exception {
- Source testSource = getTestSource(getTestFile(FILE_NAME_GENERAL));
- final int caretOffset = getCaretOffset(testSource, "function
Issue224759() ^{");
- checkFirstSummary(testSource, caretOffset, "Issue224759 This is not
visible in Help");
- }
-
private static class FakeDocParameter implements DocParameter {
Identifier paramName;
diff --git
a/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocParserTest.java
b/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocParserTest.java
index 10b836d..b5fbee6 100644
---
a/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocParserTest.java
+++
b/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocParserTest.java
@@ -78,12 +78,6 @@ public class JsDocParserTest extends JsTestBase {
assertEquals("This could be description", ((DescriptionElement)
tags.get(0)).getDescription());
}
- public void testParsingLongComments() throws Exception {
- Source source =
getTestSource(getTestFile("testfiles/jsdoc/windowStub.js"));
- List<? extends JsDocElement> tags =
getFirstJsDocBlock(source.createSnapshot()).getTags();
- assertEquals(JsDocElementType.CONTEXT_SENSITIVE,
tags.get(0).getType());
- }
-
public void testNoTagsInBlockComment() throws Exception {
Source source =
getTestSource(getTestFile("testfiles/jsdoc/blockComment.js"));
Iterator<Entry<Integer, JsDocComment>> iterator =
JsDocParser.parse(source.createSnapshot()).entrySet().iterator();
diff --git a/webcommon/javascript2.prototypejs/nbproject/project.xml
b/webcommon/javascript2.prototypejs/nbproject/project.xml
index 369e77c..9e743a7 100644
--- a/webcommon/javascript2.prototypejs/nbproject/project.xml
+++ b/webcommon/javascript2.prototypejs/nbproject/project.xml
@@ -151,55 +151,69 @@
<test-type>
<name>unit</name>
<test-dependency>
-
<code-name-base>org.netbeans.modules.javascript2.requirejs</code-name-base>
- <recursive/>
+
<code-name-base>org.netbeans.libs.junit4</code-name-base>
<compile-dependency/>
</test-dependency>
<test-dependency>
-
<code-name-base>org.netbeans.modules.javascript2.editor</code-name-base>
+
<code-name-base>org.netbeans.modules.csl.api</code-name-base>
<recursive/>
<compile-dependency/>
<test/>
</test-dependency>
<test-dependency>
-
<code-name-base>org.netbeans.libs.junit4</code-name-base>
+
<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
<compile-dependency/>
</test-dependency>
<test-dependency>
-
<code-name-base>org.netbeans.modules.csl.api</code-name-base>
+
<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
<recursive/>
<compile-dependency/>
<test/>
</test-dependency>
<test-dependency>
-
<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+
<code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
<recursive/>
- <compile-dependency/>
</test-dependency>
<test-dependency>
-
<code-name-base>org.netbeans.modules.lexer</code-name-base>
+
<code-name-base>org.netbeans.modules.javascript2.editor</code-name-base>
<recursive/>
<compile-dependency/>
<test/>
</test-dependency>
<test-dependency>
-
<code-name-base>org.openide.util.lookup</code-name-base>
+
<code-name-base>org.netbeans.modules.javascript2.requirejs</code-name-base>
+ <recursive/>
+ <compile-dependency/>
+ </test-dependency>
+ <test-dependency>
+
<code-name-base>org.netbeans.modules.lexer</code-name-base>
+ <recursive/>
<compile-dependency/>
<test/>
</test-dependency>
<test-dependency>
-
<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
+
<code-name-base>org.netbeans.modules.lexer.nbbridge</code-name-base>
<compile-dependency/>
</test-dependency>
<test-dependency>
-
<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
+
<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
<recursive/>
<compile-dependency/>
+ </test-dependency>
+ <test-dependency>
+
<code-name-base>org.netbeans.modules.parsing.api</code-name-base>
<test/>
</test-dependency>
<test-dependency>
-
<code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <recursive/>
+
<code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
+ </test-dependency>
+ <test-dependency>
+
<code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
+ </test-dependency>
+ <test-dependency>
+
<code-name-base>org.openide.util.lookup</code-name-base>
+ <compile-dependency/>
+ <test/>
</test-dependency>
</test-type>
</test-dependencies>
diff --git a/webcommon/javascript2.react/nbproject/project.xml
b/webcommon/javascript2.react/nbproject/project.xml
index 31c60f3..7eb427c 100644
--- a/webcommon/javascript2.react/nbproject/project.xml
+++ b/webcommon/javascript2.react/nbproject/project.xml
@@ -107,77 +107,6 @@
</run-dependency>
</dependency>
</module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.javascript2.extjs</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.javascript2.editor</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.javascript2.model</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.lexer</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.openide.util.lookup</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <recursive/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.parsing.api</code-name-base>
- <test/>
- </test-dependency>
- <test-dependency>
-
<code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
- </test-dependency>
- </test-type>
- </test-dependencies>
<public-packages/>
</data>
<spellchecker-wordlist
xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1";>
diff --git
a/webcommon/javascript2.react/test/unit/src/org/netbeans/modules/javascript2/react/ReactHtmlExtensionTest.java
b/webcommon/javascript2.react/test/unit/src/org/netbeans/modules/javascript2/react/ReactHtmlExtensionTest.java
deleted file mode 100644
index b10545f..0000000
---
a/webcommon/javascript2.react/test/unit/src/org/netbeans/modules/javascript2/react/ReactHtmlExtensionTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.netbeans.modules.javascript2.react;
-
-import org.netbeans.junit.NbTestCase;
-
-/**
- *
- * @author Petr Pisl
- */
-public class ReactHtmlExtensionTest extends NbTestCase{
-
- public ReactHtmlExtensionTest(String name) {
- super(name);
- }
-
-}
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation01completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation01completionDoc.html
deleted file mode 100644
index 3dec759..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation01completionDoc.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-Construct a new Shape object.
-</p>
-<p style="margin: 5px 5px 0px 5px;">
-This is the basic Shape class.
- It can be considered an abstract class, even though no such thing
- really existing in JavaScript
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Returns:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;"><b>Type:</b></td>
-<td valign="top">Shape | Coordinate</td>
-</tr>
-<tr>
-<td valign="top" style="margin-right:5px;"><b>Description:</b></td>
-<td valign="top">A new shape.</td>
-</tr>
-</table>
-<h4 style="margin: 10px 0px 5px 0px">Throws:</h4>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top">MemoryException</td>
-<td valign="top">if there is no more memory</td>
-</tr>
-<tr>
-<td valign="top">GeneralShapeException</td>
-<td valign="top">rarely (if ever)</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation02completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation02completionDoc.html
deleted file mode 100644
index 923f2a8..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation02completionDoc.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-This is an inner method, just used here as an example
-</p>
-<h4 style="margin: 10px 0px 5px 0px">Since:</h4>
-<p style="margin: 0px 14px 0px 14px;">0.5</p>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation03completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation03completionDoc.html
deleted file mode 100644
index 6841601..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation03completionDoc.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-Create a new Hexagon instance.
-</p>
-<p style="margin: 5px 5px 0px 5px;">
-Hexagon is a class that is a <i>logical</i> sublcass of
- Shape (thanks to the <code>@extends</code> tag), but in
- reality it is completely unrelated to Shape.
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Parameters:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;">int</td>
-<td valign="top" style="margin-right:5px;"><b>sideLength</b></td>
-<td>The length of one side for the new Hexagon</td>
-</tr>
-</table>
-<h4 style="margin: 10px 0px 5px 0px">Extends:</h4>
-<p style="margin: 0px 14px 0px 14px;">Shape</p>
-<h4 style="margin: 10px 0px 5px 0px">Examples:</h4>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top">var h = new Hexagon(2);</td>
-</tr>
-<tr>
-<td valign="top">if (hasHex) {
- hex = new Hexagon(5);
- color = hex.getColor();
- }</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation04completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation04completionDoc.html
deleted file mode 100644
index 68f92b4..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation04completionDoc.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-Set the color for this Shape
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Parameters:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;">Color</td>
-<td valign="top" style="margin-right:5px;"><b>color</b></td>
-<td>The color to set for this Shape</td>
-</tr>
-<tr>
-<td valign="top" style="margin-right:5px;"></td>
-<td valign="top" style="margin-right:5px;"><b>other</b></td>
-<td>There is no other param, but it can still be documented if optional
parameters are used</td>
-</tr>
-</table>
-<h4 style="margin: 10px 0px 5px 0px">Throws:</h4>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top">NonExistantColorException</td>
-<td></td>
-</tr>
-</table>
-<h4 style="margin: 10px 0px 5px 0px">See:</h4>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top">#getColor</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation05completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation05completionDoc.html
deleted file mode 100644
index a476d6d..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation05completionDoc.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-Here should be returned null since no type or return tag is available.
-</p>
-<h4 style="margin: 10px 0px 5px 0px">Throws:</h4>
-<table style="margin-left: 10px;">
-<tr>
-<td></td>
-<td valign="top">any exception which can throw Shape constructor</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation06completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation06completionDoc.html
deleted file mode 100644
index ff54779..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation06completionDoc.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<p style="margin: 0px 5px 0px 5px;"><b>Deprecated.</b>
-</p>
-<p style="margin: 5px 5px 0px 5px;">
-A very simple class (static) field that is also a constant
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Returns:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;"><b>Type:</b></td>
-<td valign="top">float</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation07completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation07completionDoc.html
deleted file mode 100644
index 5fe7856..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation07completionDoc.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-Create a new Circle instance based on a radius.
-</p>
-<p style="margin: 5px 5px 0px 5px;">
-Circle class is another subclass of Shape
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Parameters:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;">int</td>
-<td valign="top" style="margin-right:5px;"><b>radius</b></td>
-<td>The optional radius of this Circle</td>
-</tr>
-</table>
-<h4 style="margin: 10px 0px 5px 0px">Extends:</h4>
-<p style="margin: 0px 14px 0px 14px;">Shape</p>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation09completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation09completionDoc.html
deleted file mode 100644
index 6ea52b5..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation09completionDoc.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-The x portion of the Coordinate
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Returns:</h3>
-<table style="margin-left: 10px;">
-</table>
-<h4 style="margin: 10px 0px 5px 0px">See:</h4>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top">#getX</td>
-</tr>
-<tr>
-<td valign="top">#setX</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation10completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation10completionDoc.html
deleted file mode 100644
index c2b66ad..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation10completionDoc.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-Get the radius value for this Circle
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Returns:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;"><b>Type:</b></td>
-<td valign="top">int</td>
-</tr>
-</table>
-<h4 style="margin: 10px 0px 5px 0px">See:</h4>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top">#setRadius</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation11completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation11completionDoc.html
deleted file mode 100644
index 923f2a8..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation11completionDoc.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-This is an inner method, just used here as an example
-</p>
-<h4 style="margin: 10px 0px 5px 0px">Since:</h4>
-<p style="margin: 0px 14px 0px 14px;">0.5</p>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation12completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation12completionDoc.html
deleted file mode 100644
index 6841601..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation12completionDoc.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-Create a new Hexagon instance.
-</p>
-<p style="margin: 5px 5px 0px 5px;">
-Hexagon is a class that is a <i>logical</i> sublcass of
- Shape (thanks to the <code>@extends</code> tag), but in
- reality it is completely unrelated to Shape.
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Parameters:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;">int</td>
-<td valign="top" style="margin-right:5px;"><b>sideLength</b></td>
-<td>The length of one side for the new Hexagon</td>
-</tr>
-</table>
-<h4 style="margin: 10px 0px 5px 0px">Extends:</h4>
-<p style="margin: 0px 14px 0px 14px;">Shape</p>
-<h4 style="margin: 10px 0px 5px 0px">Examples:</h4>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top">var h = new Hexagon(2);</td>
-</tr>
-<tr>
-<td valign="top">if (hasHex) {
- hex = new Hexagon(5);
- color = hex.getColor();
- }</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation13completionDoc.html
b/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation13completionDoc.html
deleted file mode 100644
index ece9a63..0000000
---
a/webcommon/javascript2.sdoc/test/unit/data/testfiles/sdoc/completionDocumentation/completionDocumentation01.js.testCompletionDocumentation13completionDoc.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<p style="margin: 5px 5px 0px 5px;">
-An example of a class (static) method that acts as a factory for Circle
- objects. Given a radius value, this method creates a new Circle.
-</p>
-<h3 style="margin: 10px 0px 5px 0px">Parameters:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;">int</td>
-<td valign="top" style="margin-right:5px;"><b>radius</b></td>
-<td>The radius value to use for the new Circle.</td>
-</tr>
-</table>
-<h3 style="margin: 10px 0px 5px 0px">Returns:</h3>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top" style="margin-right:5px;"><b>Type:</b></td>
-<td valign="top">Circle</td>
-</tr>
-</table>
-<h4 style="margin: 10px 0px 5px 0px">Examples:</h4>
-<table style="margin-left: 10px;">
-<tr>
-<td valign="top">var circle = Circle.createCircle(5);</td>
-</tr>
-</table>
diff --git
a/webcommon/javascript2.sdoc/test/unit/src/org/netbeans/modules/javascript2/sdoc/SDocCompletionDocumentationTest.java
b/webcommon/javascript2.sdoc/test/unit/src/org/netbeans/modules/javascript2/sdoc/SDocCompletionDocumentationTest.java
deleted file mode 100644
index b01bf3e..0000000
---
a/webcommon/javascript2.sdoc/test/unit/src/org/netbeans/modules/javascript2/sdoc/SDocCompletionDocumentationTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * 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.
- */
-package org.netbeans.modules.javascript2.sdoc;
-
-import java.util.Collections;
-import org.netbeans.modules.javascript2.doc.JsDocumentationTestBase;
-import org.netbeans.modules.javascript2.doc.spi.JsDocumentationHolder;
-import org.netbeans.modules.javascript2.editor.parser.JsParserResult;
-import org.netbeans.modules.parsing.api.ParserManager;
-import org.netbeans.modules.parsing.api.ResultIterator;
-import org.netbeans.modules.parsing.api.Source;
-import org.netbeans.modules.parsing.api.UserTask;
-import org.netbeans.modules.parsing.spi.ParseException;
-import org.netbeans.modules.parsing.spi.Parser;
-
-/**
- *
- * @author Martin Fousek <marf...@netbeans.org>
- */
-public class SDocCompletionDocumentationTest extends JsDocumentationTestBase {
-
- private static final String BASE_PATH =
"testfiles/sdoc/completionDocumentation/";
-
- private JsDocumentationHolder documentationHolder;
- private JsParserResult parserResult;
-
- public SDocCompletionDocumentationTest(String testName) {
- super(testName);
- }
-
- private void initializeDocumentationHolder(Source source) throws
ParseException {
- ParserManager.parse(Collections.singleton(source), new UserTask() {
- public @Override void run(ResultIterator resultIterator) throws
Exception {
- Parser.Result result = resultIterator.getParserResult();
- assertTrue(result instanceof JsParserResult);
- parserResult = (JsParserResult) result;
- documentationHolder = getDocumentationHolder(parserResult, new
SDocDocumentationProvider());
- }
- });
- }
-
- private void checkCompletionDocumentation(String relPath, String
caretSeeker) throws Exception {
- Source testSource = getTestSource(getTestFile(relPath));
- final int caretOffset = getCaretOffset(testSource, caretSeeker);
- initializeDocumentationHolder(testSource);
- assertDescriptionMatches(relPath,
documentationHolder.getDocumentation(getNodeForOffset(parserResult,
caretOffset)).getContent(), true, "completionDoc.html");
- }
-
- public void testCompletionDocumentation01() throws Exception {
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Shape()^{");
- }
-
- public void testCompletionDocumentation02() throws Exception {
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function addReference()^{");
- }
-
- public void testCompletionDocumentation03() throws Exception {
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Hexagon(sideLength) ^{");
- }
-
- public void testCompletionDocumentation04() throws Exception {
- // check throws
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Shape.prototype.setColor = function(color)^{");
- }
-
- public void testCompletionDocumentation05() throws Exception {
- // check throws
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Shape.prototype.clone3 = function()^{");
- }
-
- public void testCompletionDocumentation06() throws Exception {
- // check deprecation
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Circle.P^I = 3.14;");
- }
-
- public void testCompletionDocumentation07() throws Exception {
- // check extends
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Circle(radius)^{");
- }
-
- public void testCompletionDocumentation09() throws Exception {
- // check see
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Coordinate.prototype.x^ = 0;");
- }
-
- public void testCompletionDocumentation10() throws Exception {
- // check see
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Circle.prototype.getRadius = function()^{");
- }
-
- public void testCompletionDocumentation11() throws Exception {
- // check since
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function addReference()^{");
- }
-
- public void testCompletionDocumentation12() throws Exception {
- // check example
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "function Hexagon(sideLength) ^{");
- }
-
- public void testCompletionDocumentation13() throws Exception {
- // check example
- checkCompletionDocumentation(BASE_PATH +
"completionDocumentation01.js", "Circle.createCircle = function(radius)^{");
- }
-}
diff --git
a/webcommon/web.clientproject/test/unit/src/org/netbeans/modules/web/clientproject/ClientSideProjectTest.java
b/webcommon/web.clientproject/test/unit/src/org/netbeans/modules/web/clientproject/ClientSideProjectTest.java
index fce315b..b505726 100644
---
a/webcommon/web.clientproject/test/unit/src/org/netbeans/modules/web/clientproject/ClientSideProjectTest.java
+++
b/webcommon/web.clientproject/test/unit/src/org/netbeans/modules/web/clientproject/ClientSideProjectTest.java
@@ -98,25 +98,6 @@ public class ClientSideProjectTest extends NbTestCase {
assertEquals("project does not have any problems", 3,
problemsProvider.getProblems().size());
}
- public void testProjectCreationFromZipTemplate() throws Exception {
- ClientSideProject project = createProject(null, null, null, null);
- SiteZip siteZip = new SiteZip();
- FileObject testTemplate =
FileUtil.toFileObject(getDataDir()).getFileObject("TestTemplate.zip");
- ((SiteZipPanel)
(siteZip.getCustomizer().getComponent())).setTemplate(FileUtil.getFileDisplayName(testTemplate));
- SiteTemplateImplementation.ProjectProperties templateProperties = new
SiteTemplateImplementation.ProjectProperties();
- siteZip.configure(templateProperties);
- ClientSideProjectUtilities.initializeProject(project,
- templateProperties.getSourceFolder(),
- templateProperties.getSiteRootFolder(),
- templateProperties.getTestFolder(),
- templateProperties.getTestSeleniumFolder());
- siteZip.apply(project.getProjectDirectory(), templateProperties,
ProgressHandleFactory.createHandle("somename"));
- ClientSideProjectProperties projectProperties = new
ClientSideProjectProperties(project);
- assertEquals("site root should be created from template",
-
project.getProjectDirectory().getFileObject("custom_siteroot"),
FileUtil.toFileObject(projectProperties.getResolvedSiteRootFolder()));
- assertNoProjectProblems(project);
- }
-
public void testProjectWithProjectServiceProvider() throws Exception {
int instances = MySupport.INSTANCES.get();
ClientSideProject project = createProject("src", "www", "test",
"selenium");
diff --git a/webcommon/web.webkit.tooling/nbproject/project.xml
b/webcommon/web.webkit.tooling/nbproject/project.xml
index 73e5006..fd330e4 100644
--- a/webcommon/web.webkit.tooling/nbproject/project.xml
+++ b/webcommon/web.webkit.tooling/nbproject/project.xml
@@ -183,15 +183,6 @@
</run-dependency>
</dependency>
</module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
-
<code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- </test-type>
- </test-dependencies>
<public-packages/>
</data>
</configuration>
diff --git
a/webcommon/web.webkit.tooling/test/unit/src/org/netbeans/modules/web/webkit/tooling/networkmonitor/NetworkMonitorTopComponentTest.java
b/webcommon/web.webkit.tooling/test/unit/src/org/netbeans/modules/web/webkit/tooling/networkmonitor/NetworkMonitorTopComponentTest.java
deleted file mode 100644
index b52050b..0000000
---
a/webcommon/web.webkit.tooling/test/unit/src/org/netbeans/modules/web/webkit/tooling/networkmonitor/NetworkMonitorTopComponentTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.netbeans.modules.web.webkit.tooling.networkmonitor;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- *
- */
-public class NetworkMonitorTopComponentTest {
-
- public NetworkMonitorTopComponentTest() {
- }
-
-// Test case contain external data , it is delete for Apache code donation
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
