Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/api/rlabkey-api-query.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/lists/rlabkey.lists/AllTypes.tsv
Original file line number Diff line number Diff line change
@@ -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
Comment thread
cnathe marked this conversation as resolved.
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
Expand Down
2 changes: 1 addition & 1 deletion data/lists/rlabkey.lists/lists.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<columnTitle>Text Field</columnTitle>
</column>
<column columnName="IntFld">
<datatype>integer</datatype>
<datatype>bigint</datatype>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To get the Rlabkey test passing now with this change, I needed to update line 261 of rlabkey-api-query.xml to:
HTTP request was unsuccessful. Status code = 400, Error message = Could not convert value 'string' (String) for Long field 'IntFld'

<columnTitle>Integer Field</columnTitle>
</column>
<column columnName="DoubleFld">
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/test/tests/RlabkeyTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -238,7 +239,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("\\\\", "/"));

Expand All @@ -252,7 +253,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);
Expand Down