Merge remote-tracking branch 'origin/develop' into fb_searchPageCleanup

Author: labkey-tchad

data/api/rlabkey-api-query.xml

@@ -158,7 +158,7 @@
         <response>
             <![CDATA[
                 Text Field Integer Field Double Field DateTime Field Boolean Field
-                some text here 99 987.654 2010-02-14 FALSE
+                some text here 99999999999 987.654 2010-02-14 FALSE
                 More plane values -34 98123.450 1999-01-01 FALSE
                 null NULL NA and na 123 44.330 2002-02-20 FALSE
                 how its done 98 12.345 2010-03-01 FALSE
@@ -258,7 +258,7 @@
         </url>
         <response>
             <![CDATA[
-                HTTP request was unsuccessful. Status code = 400, Error message = Could not convert value 'string' (String) for Integer field 'IntFld'
+                HTTP request was unsuccessful. Status code = 400, Error message = Could not convert value 'string' (String) for Long field 'IntFld'
             ]]>
         </response>
     </test>

data/lists/rlabkey.lists/AllTypes.tsv

@@ -1,5 +1,5 @@
 DisplayFld	TextFld	IntFld	DoubleFld	DateTimeFld	BooleanFld	LongTextFld	AttachmentFld	RequiredText	RequiredInt	Category
-Row 1	some text here	99	987.654	2/14/2010	FALSE	Could be some very long text		I have to fill this out	42	PLAIN
+Row 1	some text here	99999999999	987.654	2/14/2010	FALSE	Could be some very long text		I have to fill this out	42	PLAIN
 Row 2 Empty Vals					FALSE			Cannot be empty	55	
 Row 3 (plain)	More plane values	-34	98123.45	1/1/1999	FALSE	The quick brown fox jumped over the fence.  The quick brown fox jumped over the fence.  The quick brown fox jumped over the fence.  The quick brown fox jumped over the fence.  The quick brown fox jumped over the fence.  The quick brown fox jumped over the fence.  The quick brown fox jumped over the fence.  The quick brown fox jumped over the fence.  The quick brown fox jumped over the fence.  The quick brown fox jumped over the fence.  		no attachment	88	PLAIN
 row 4 (the n word)	null NULL NA and na	123	44.33	2/20/2002	FALSE			lots of words for empty	456	EMPTY

data/lists/rlabkey.lists/lists.xml

@@ -66,7 +66,7 @@
         <columnTitle>Text Field</columnTitle>
       </column>
       <column columnName="IntFld">
-        <datatype>integer</datatype>
+        <datatype>bigint</datatype>
         <columnTitle>Integer Field</columnTitle>
       </column>
       <column columnName="DoubleFld">

src/org/labkey/test/tests/RlabkeyTest.java

@@ -20,6 +20,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.labkey.api.util.FileUtil;
 import org.labkey.remoteapi.Connection;
 import org.labkey.remoteapi.reports.SaveCategoriesCommand;
 import org.labkey.test.BaseWebDriverTest;
@@ -239,7 +240,7 @@ public void testRlabkeyWebDavApi() throws Exception
         WebDavUploadHelper webDav = new WebDavUploadHelper(getProjectName());
 
         // Setup dir to simulate local R environment
-        File downloadDir = new File(TestFileUtils.getDefaultFileRoot(getProjectName()), "webdav_download");
+        File downloadDir = FileUtil.appendName(TestFileUtils.getDefaultFileRoot(getProjectName()), "webdav_download");
         webDav.mkDir(downloadDir.getName());
         scriptReplacements.put("downloadDir", downloadDir.getAbsolutePath().replaceAll("\\\\", "/"));
 
@@ -253,7 +254,7 @@ public void testRlabkeyWebDavApi() throws Exception
         webDav.mkDir("remote/writeChecks/deleteMe_empty");
         webDav.putRandomAlphanumeric("remote/writeChecks/deleteMe/file.txt");
         webDav.putRandomAlphanumeric("remote/writeChecks/deleteMe.txt");
-        File remoteDir = new File(downloadDir.getParentFile(), "remote");
+        File remoteDir = FileUtil.appendName(downloadDir.getParentFile(), "remote");
         scriptReplacements.put("remoteDir", remoteDir.getAbsolutePath().replaceAll("\\\\", "/"));
 
         doRLabkeyTest(RLABKEY_API_WEBDAV, scriptReplacements);