package groovy.io;

import groovy.lang.Binding;
import groovy.lang.GroovyShell;
import junit.framework.TestCase;

import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;

public class PlatformLineWriterTest extends TestCase {

    public void testPlatformLineWriter() throws IOException, ClassNotFoundException {
        String LS = System.getProperty("line.separator");
        Binding binding = new Binding();
        binding.setVariable("first", "Tom");
        binding.setVariable("last", "Adams");
        StringWriter stringWriter = new StringWriter();
        Writer platformWriter = new PlatformLineWriter(stringWriter);
        GroovyShell shell = new GroovyShell(binding);
        platformWriter.write(shell.evaluate("\"$first\\n$last\\n\"").toString());
        assertEquals("Tom" + LS + "Adams" + LS, stringWriter.toString());
        stringWriter = new StringWriter();
        platformWriter = new PlatformLineWriter(stringWriter);
        platformWriter.write(shell.evaluate("\"$first\\r\\n$last\\r\\n\"").toString());
        assertEquals("Tom" + LS + "Adams" + LS, stringWriter.toString());
    }
}

package groovy.io;

import groovy.text.SimpleTemplateEngine;
import groovy.text.Template;
import junit.framework.TestCase;

import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.HashMap;
import java.util.Map;

public class PlatformLineWriterTest extends TestCase {

    public void testPlatformLineWriter() throws IOException, ClassNotFoundException {
        String LS = System.getProperty("line.separator");
        Map binding = new HashMap();
        binding.put("first", "Tom");
        binding.put("last", "Adams");
        Template template = new SimpleTemplateEngine().createTemplate("<%= first %>\n<% println last %>");
        StringWriter stringWriter = new StringWriter();
        Writer platformWriter = new PlatformLineWriter(stringWriter);
        template.make(binding).writeTo(platformWriter);
        assertEquals("Tom" + LS + "Adams" + LS, stringWriter.toString());
    }
}

--- 
+++ 
@@ -1,26 +1,28 @@
 package groovy.io;
 
-import groovy.text.SimpleTemplateEngine;
-import groovy.text.Template;
+import groovy.lang.Binding;
+import groovy.lang.GroovyShell;
 import junit.framework.TestCase;
 
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
 
 public class PlatformLineWriterTest extends TestCase {
 
     public void testPlatformLineWriter() throws IOException, ClassNotFoundException {
         String LS = System.getProperty("line.separator");
-        Map binding = new HashMap();
-        binding.put("first", "Tom");
-        binding.put("last", "Adams");
-        Template template = new SimpleTemplateEngine().createTemplate("<%= first %>\n<% println last %>");
+        Binding binding = new Binding();
+        binding.setVariable("first", "Tom");
+        binding.setVariable("last", "Adams");
         StringWriter stringWriter = new StringWriter();
         Writer platformWriter = new PlatformLineWriter(stringWriter);
-        template.make(binding).writeTo(platformWriter);
+        GroovyShell shell = new GroovyShell(binding);
+        platformWriter.write(shell.evaluate("\"$first\\n$last\\n\"").toString());
+        assertEquals("Tom" + LS + "Adams" + LS, stringWriter.toString());
+        stringWriter = new StringWriter();
+        platformWriter = new PlatformLineWriter(stringWriter);
+        platformWriter.write(shell.evaluate("\"$first\\r\\n$last\\r\\n\"").toString());
         assertEquals("Tom" + LS + "Adams" + LS, stringWriter.toString());
     }
 }
Remove dependency on templating module
