X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java
index 11e7ed1..90ab589 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java
@@ -3,72 +3,101 @@
  *
  */
 package net.sourceforge.phpeclipse.phpeditor.php.test;
-
 import java.util.Map;
-
 import junit.framework.TestCase;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.corext.codemanipulation.StubUtility;
 import net.sourceforge.phpdt.internal.corext.util.Strings;
 import net.sourceforge.phpdt.internal.formatter.CodeFormatter;
 import net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage;
-import net.sourceforge.phpeclipse.PHPCore;
-
 import org.eclipse.jface.text.IDocument;
-
 /**
  * Testcase for the PHP CodeFormatter
+ * 
  * @author Stefan Langer
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.3 $
  */
 public class PHPFormatterTest extends TestCase {
   private CodeFormatter fFormatter;
   private IDocument fDocument;
   private String fInitialIndentation;
-
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see junit.framework.TestCase#setUp()
    */
   protected void setUp() throws Exception {
-    Map options = PHPCore.getOptions();
+    Map options = JavaCore.getOptions();
     fFormatter = new CodeFormatter(options);
     fDocument = new DummyDocument();
   }
-
+  public void testFormatter0() {
+    System.out.println("----- testFormatter0 -----");
+    String text = "<?php\nheader(\"Location: http://www.phpeclipse.de/eclipse/space/eclipse/faq/longlinetester\"); exit; ?>";
+    fDocument.set(text);
+    String lineDelimiter = StubUtility.getLineDelimiterFor(fDocument);
+    int indent = 0;
+    if (fInitialIndentation != null) {
+      indent = Strings.computeIndent(fInitialIndentation,
+          CodeFormatterPreferencePage.getTabSize());
+    }
+    String formatedString = fFormatter
+        .format(text, indent, null, lineDelimiter);
+    String testResult = "<?php " 
+        + lineDelimiter + "header(\"Location: http://www.phpeclipse.de/eclipse/space/eclipse/faq/longlinetester\");" + lineDelimiter
+        + "exit;" + lineDelimiter + "?>";
+    junit.framework.Assert.assertEquals(formatedString, testResult);
+  }
   public void testFormatter1() {
     System.out.println("----- testFormatter1 -----");
-
     String text = "<?php\n" + "function test()\n" + "{echo 'Test!';}\n" + "?>";
     fDocument.set(text);
-
     String lineDelimiter = StubUtility.getLineDelimiterFor(fDocument);
-
     int indent = 0;
     if (fInitialIndentation != null) {
-      indent = Strings.computeIndent(fInitialIndentation, CodeFormatterPreferencePage.getTabSize());
+      indent = Strings.computeIndent(fInitialIndentation,
+          CodeFormatterPreferencePage.getTabSize());
     }
-    String formatedString = fFormatter.format(text, indent, null, lineDelimiter);
-
-    String testResult = "<?php function test() {" + lineDelimiter + "\techo 'Test!';" + lineDelimiter + "}" + lineDelimiter + "?>";
-
+    String formatedString = fFormatter
+        .format(text, indent, null, lineDelimiter);
+    String testResult = "<?php "+ lineDelimiter + "function test() {" + lineDelimiter
+        + "\techo 'Test!';" + lineDelimiter + "}" + lineDelimiter + "?>";
     junit.framework.Assert.assertEquals(formatedString, testResult);
   }
-
   public void testFormatter2() {
     //  bug 741752
     System.out.println("----- testFormatter2 -----");
-    String text = "<?php\n" + "if ( ${ $feldname }== $modellvar) $i=0;\n" + "?>";
+    String text = "<?php\n" + "if ( ${ $feldname }== $modellvar) $i=0;\n"
+        + "?>";
+    fDocument.set(text);
+    String lineDelimiter = StubUtility.getLineDelimiterFor(fDocument);
+    int indent = 0;
+    if (fInitialIndentation != null) {
+      indent = Strings.computeIndent(fInitialIndentation,
+          CodeFormatterPreferencePage.getTabSize());
+    }
+    String formatedString = fFormatter
+        .format(text, indent, null, lineDelimiter);
+    String testResult = "<?php " + lineDelimiter + "if (${ $feldname } == $modellvar)"
+        + lineDelimiter + "\t$i = 0;" + lineDelimiter + "?>";
+    junit.framework.Assert.assertEquals(formatedString, testResult);
+  }
+  public void testFormatter3() {
+    System.out.println("----- testFormatter1 -----");
+    String text = "<?php\n \r\n \r\n" + "function test()\n"
+        + "{echo 'Test!';}\n" + "?>";
     fDocument.set(text);
-
     String lineDelimiter = StubUtility.getLineDelimiterFor(fDocument);
-
     int indent = 0;
     if (fInitialIndentation != null) {
-      indent = Strings.computeIndent(fInitialIndentation, CodeFormatterPreferencePage.getTabSize());
+      indent = Strings.computeIndent(fInitialIndentation,
+          CodeFormatterPreferencePage.getTabSize());
     }
-    String formatedString = fFormatter.format(text, indent, null, lineDelimiter);
-
-    String testResult = "<?php " + "if (${ $feldname } == $modellvar)" + lineDelimiter + "\t$i = 0;" + lineDelimiter + "?>";
-
+    String formatedString = fFormatter
+        .format(text, indent, null, lineDelimiter);
+    String testResult = "<?php " + lineDelimiter + " " + lineDelimiter + " "
+        + lineDelimiter + "function test() {" + lineDelimiter
+        + "\techo 'Test!';" + lineDelimiter + "}" + lineDelimiter + "?>";
     junit.framework.Assert.assertEquals(formatedString, testResult);
   }
 }