[jsoar] 3 new revisions pushed by voigtjr@gmail.com on 2013-04-16 14:51 GMT

[js...@googlecode.com]

3 new revisions:

Revision: 726929032f16
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Apr 16 07:01:21 2013
Log: Typo "decoded"
http://code.google.com/p/jsoar/source/detail?r=726929032f16

Revision: 16ca1a028416
Author: charles.newton <charles...@soartech.com>
Date: Tue Jan 29 21:18:25 2013
Log: More comprehensive TCL tests for CRLF parsing behavior....
http://code.google.com/p/jsoar/source/detail?r=16ca1a028416

Revision: bf6aef7d8a47
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Apr 16 07:46:24 2013
Log: Merge branch 'master' into maven...
http://code.google.com/p/jsoar/source/detail?r=bf6aef7d8a47

==============================================================================
Revision: 726929032f16
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Apr 16 07:01:21 2013
Log: Typo "decoded"

http://code.google.com/p/jsoar/source/detail?r=726929032f16

Modified:

/jsoar-legilimens/src/main/java/org/jsoar/legilimens/resources/BaseResource.java

=======================================
---
/jsoar-legilimens/src/main/java/org/jsoar/legilimens/resources/BaseResource.java
Thu Oct 22 19:45:59 2009
+++
/jsoar-legilimens/src/main/java/org/jsoar/legilimens/resources/BaseResource.java
Tue Apr 16 07:01:21 2013
@@ -107,7 +107,7 @@
* Retrieve the value of a path attribute with proper decoding.
*
* @param name the name of the attribute
- * @return the decded value, or {@code null} if not found
+ * @return the decoded value, or {@code null} if not found
*/
public String getPathAttribute(String name)
{

==============================================================================
Revision: 16ca1a028416
Author: charles.newton <charles...@soartech.com>
Date: Tue Jan 29 21:18:25 2013
Log: More comprehensive TCL tests for CRLF parsing behavior.
Conflicts:
jsoar-tcl/src/test/java/org/jsoar/tcl/TclLineContinuationTest.java

cherry pick 8f561f20f5a4f1500c4dd6bc8b8ae5178b725a7c plus a few other
tweaks from commits near that one

http://code.google.com/p/jsoar/source/detail?r=16ca1a028416

Added:
/jsoar-tcl/src/test/java/org/jsoar/tcl/TclLineContinuationTest.java

/jsoar-tcl/src/test/resources/org/jsoar/tcl/TclLineContinuationTest_textExecute.soar
Modified:
/jsoar-tcl/src/test/java/org/jsoar/tcl/TclTestBase.java

=======================================
--- /dev/null
+++ /jsoar-tcl/src/test/java/org/jsoar/tcl/TclLineContinuationTest.java Tue
Jan 29 21:18:25 2013
@@ -0,0 +1,60 @@
+package org.jsoar.tcl;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.junit.Test;
+
+import com.google.common.io.ByteStreams;
+
+/**
+ * Test for jtcl / jacl bug where the TCL line continuation operator
doesn't work with
+ * files that use Windows-style (CRLF) line breaks.
+ *
+ * @author charles.newton
+ */
+public class TclLineContinuationTest extends TclTestBase
+{
+
+ /**
+ * Test sourcing via a URL.
+ */
+ @Test
+ public void testSourceURL() throws Exception
+ {
+ sourceTestFile(getClass(), "textExecute.soar");
+ }
+
+ /**
+ * Test sourcing via a file.
+ */
+ @Test
+ public void testSourceFile() throws Exception
+ {
+ URL url = getSourceTestFile(getClass(), "textExecute.soar");
+ final InputStream in = new BufferedInputStream(url.openStream());
+ File tmp =
File.createTempFile("TclLineContinuationTest", "testSource");
+ tmp.deleteOnExit();
+ final FileOutputStream fos = new FileOutputStream(tmp);
+ ByteStreams.copy(in, fos);
+ fos.close();
+ ifc.source(tmp);
+ }
+
+ /**
+ * Test sourcing via a call to eval.
+ */
+ @Test
+ public void testSourceEval() throws Exception
+ {
+ URL url = getSourceTestFile(getClass(), "textExecute.soar");
+ final InputStream in = new BufferedInputStream(url.openStream());
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ByteStreams.copy(in, out);
+ ifc.eval(out.toString());
+ }
+}
=======================================
--- /dev/null
+++
/jsoar-tcl/src/test/resources/org/jsoar/tcl/TclLineContinuationTest_textExecute.soar
Tue Jan 29 21:18:25 2013
@@ -0,0 +1,6 @@
+proc dropSecond {a b} {
+ return $a
+}
+
+dropSecond "a" \
+"b c"
=======================================
--- /jsoar-tcl/src/test/java/org/jsoar/tcl/TclTestBase.java Sun Jan 27
15:38:00 2013
+++ /jsoar-tcl/src/test/java/org/jsoar/tcl/TclTestBase.java Tue Jan 29
21:18:25 2013
@@ -5,6 +5,8 @@
*/
package org.jsoar.tcl;

+import java.net.URL;
+
import org.jsoar.kernel.Agent;
import org.jsoar.kernel.SoarException;
import org.junit.After;
@@ -23,7 +25,12 @@

protected void sourceTestFile(Class<? extends TclTestBase> childClass,
String name) throws SoarException
{
- ifc.source(childClass.getResource("/" +
childClass.getName().replace('.', '/') + "_" + name));
+ ifc.source(getSourceTestFile(childClass, name));
+ }
+
+ protected URL getSourceTestFile(Class<? extends TclTestBase>
childClass, String name)
+ {
+ return childClass.getResource("/" +
childClass.getName().replace('.', '/') + "_" + name);
}

/**

==============================================================================
Revision: bf6aef7d8a47
Author: Jonathan Voigt <jon....@soartech.com>
Date: Tue Apr 16 07:46:24 2013
Log: Merge branch 'master' into maven

Conflicts:
jsoar-tcl/src/test/java/org/jsoar/tcl/TclLineContinuationTest.java
jsoar-tcl/src/test/java/org/jsoar/tcl/TclTestBase.java

http://code.google.com/p/jsoar/source/detail?r=bf6aef7d8a47