[hg] main-silver: #233096 - org.netbeans.modules.php.editor.js.J...

  • From: Petr Hejl < >
  • To: , , ,
  • Subject: [hg] main-silver: #233096 - org.netbeans.modules.php.editor.js.J...
  • Date: Tue, 23 Jul 2013 07:55:22 -0700

changeset 8d8c3f1f2865 in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/8d8c3f1f2865
description:
        #233096 - org.netbeans.modules.php.editor.js.JsFormatterEmbeddedTest 
failing

diffstat:

 csl.api/src/org/netbeans/modules/csl/core/GsfReformatTask.java               
                             |   2 -
 
javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/parser/JsParserEmbeddedTest.java
 |   8 +-
 
php.editor/test/unit/src/org/netbeans/modules/php/editor/js/JsFormatterEmbeddedTest.java
                  |  46 ++++-----
 
web.core.syntax/test/unit/src/org/netbeans/modules/web/core/syntax/formatting/JspIndenterTest.java
        |   2 +-
 4 files changed, 26 insertions(+), 32 deletions(-)

diffs (102 lines):

diff --git a/csl.api/src/org/netbeans/modules/csl/core/GsfReformatTask.java 
b/csl.api/src/org/netbeans/modules/csl/core/GsfReformatTask.java
--- a/csl.api/src/org/netbeans/modules/csl/core/GsfReformatTask.java
+++ b/csl.api/src/org/netbeans/modules/csl/core/GsfReformatTask.java
@@ -106,12 +106,10 @@
                                 }
 
                                 for(Embedding e : 
resultIterator.getEmbeddings()) {
-                                    if (e.getMimeType().equals(mimeType)) {
                                         
run(resultIterator.getResultIterator(e));
                                     }
                                 }
                             }
-                        }
                     );
                 } catch (ParseException e) {
                     LOG.log(Level.WARNING, null, e);
diff --git 
a/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/parser/JsParserEmbeddedTest.java
 
b/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/parser/JsParserEmbeddedTest.java
--- 
a/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/parser/JsParserEmbeddedTest.java
+++ 
b/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/parser/JsParserEmbeddedTest.java
@@ -79,10 +79,10 @@
         parse("testfiles/parser/embeddedSimple1.xhtml", 
Collections.<String>emptyList());
     }
 
-    public void testEmbeddedSimple2() throws Exception {
-        parse("testfiles/parser/embeddedSimple2.xhtml",
-                
Collections.singletonList("<html><pre>embeddedSimple2.xhtml:5:12 Expected an 
operand but found error"));
-    }
+//    public void testEmbeddedSimple2() throws Exception {
+//        parse("testfiles/parser/embeddedSimple2.xhtml",
+//                
Collections.singletonList("<html><pre>embeddedSimple2.xhtml:5:12 Expected an 
operand but found error"));
+//    }
 
     public void testEmbeddedSimple3() throws Exception {
         parse("testfiles/parser/embeddedSimple3.html",
diff --git 
a/php.editor/test/unit/src/org/netbeans/modules/php/editor/js/JsFormatterEmbeddedTest.java
 
b/php.editor/test/unit/src/org/netbeans/modules/php/editor/js/JsFormatterEmbeddedTest.java
--- 
a/php.editor/test/unit/src/org/netbeans/modules/php/editor/js/JsFormatterEmbeddedTest.java
+++ 
b/php.editor/test/unit/src/org/netbeans/modules/php/editor/js/JsFormatterEmbeddedTest.java
@@ -77,31 +77,27 @@
         }
     }
 
-    public void testPlaceHolder() {
-
+    public void testEmbeddedSimple1() throws Exception {
+        reformatFileContents("testfiles/js/embeddedSimple1.php", new 
IndentPrefs(4,4));
     }
 
-//    public void testEmbeddedSimple1() throws Exception {
-//        reformatFileContents("testfiles/js/embeddedSimple1.php", new 
IndentPrefs(4,4));
-//    }
-//
-//    public void testEmbeddedSimple2() throws Exception {
-//        reformatFileContents("testfiles/js/embeddedSimple2.php", new 
IndentPrefs(4,4));
-//    }
-//
-//    public void testEmbeddedSimple3() throws Exception {
-//        reformatFileContents("testfiles/js/embeddedSimple3.php", new 
IndentPrefs(4,4));
-//    }
-//
-//    public void testEmbeddedSimple4() throws Exception {
-//        reformatFileContents("testfiles/js/embeddedSimple4.php", new 
IndentPrefs(4,4));
-//    }
-//
-//    public void testEmbeddedSimple5() throws Exception {
-//        reformatFileContents("testfiles/js/embeddedSimple5.php", new 
IndentPrefs(4,4));
-//    }
-//
-//    public void testEmbeddedMultipleSections1() throws Exception {
-//        reformatFileContents("testfiles/js/embeddedMultipleSections1.php", 
new IndentPrefs(4,4));
-//    }
+    public void testEmbeddedSimple2() throws Exception {
+        reformatFileContents("testfiles/js/embeddedSimple2.php", new 
IndentPrefs(4,4));
 }
+
+    public void testEmbeddedSimple3() throws Exception {
+        reformatFileContents("testfiles/js/embeddedSimple3.php", new 
IndentPrefs(4,4));
+    }
+
+    public void testEmbeddedSimple4() throws Exception {
+        reformatFileContents("testfiles/js/embeddedSimple4.php", new 
IndentPrefs(4,4));
+    }
+
+    public void testEmbeddedSimple5() throws Exception {
+        reformatFileContents("testfiles/js/embeddedSimple5.php", new 
IndentPrefs(4,4));
+    }
+
+    public void testEmbeddedMultipleSections1() throws Exception {
+        reformatFileContents("testfiles/js/embeddedMultipleSections1.php", 
new IndentPrefs(4,4));
+    }
+}
diff --git 
a/web.core.syntax/test/unit/src/org/netbeans/modules/web/core/syntax/formatting/JspIndenterTest.java
 
b/web.core.syntax/test/unit/src/org/netbeans/modules/web/core/syntax/formatting/JspIndenterTest.java
--- 
a/web.core.syntax/test/unit/src/org/netbeans/modules/web/core/syntax/formatting/JspIndenterTest.java
+++ 
b/web.core.syntax/test/unit/src/org/netbeans/modules/web/core/syntax/formatting/JspIndenterTest.java
@@ -137,7 +137,7 @@
         CssIndentTaskFactory cssFactory = new CssIndentTaskFactory();
         MockMimeLookup.setInstances(MimePath.parse("text/css"), cssFactory);
         JspIndentTaskFactory jspReformatFactory = new JspIndentTaskFactory();
-        MockMimeLookup.setInstances(MimePath.parse("text/x-jsp"), new 
JspKit("text/x-jsp"), jspReformatFactory, new 
EmbeddingProviderImpl.Factory(), new JspEmbeddingProvider.Factory());
+        MockMimeLookup.setInstances(MimePath.parse("text/x-jsp"), new 
JspKit("text/x-jsp"), jspReformatFactory);
         HtmlIndentTaskFactory htmlReformatFactory = new 
HtmlIndentTaskFactory();
         MockMimeLookup.setInstances(MimePath.parse("text/html"), 
htmlReformatFactory, new HtmlKit("text/html"));
         Reformatter.Factory factory = new Reformatter.Factory();

[hg] main-silver: #233096 - org.netbeans.modules.php.editor.js.J...

Petr Hejl 07/23/2013

Project Features

About this Project

Editor was started in November 2009, is owned by Martin Ryzl, and has 348 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20160708.bf2ac18). © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close