Commit Graph
158 Commits
Author SHA1 Message Date
Björn Grüning ae0c3524b8 Merge branch 'dev' into bam_unsorted 2018-01-15 12:57:56 +01:00
John Chilton 60e0b3af62 Merge pull request #5273 from mvdbeek/sort_collection_from_file
Allow sorting collection elements based on file
2018-01-08 09:03:30 -05:00
mvdbeek 264b8680f3 Allow sorting collection elements based on file
Given a collection with element_identifiers:

```yml
element_1
element_2
```

we can arbitrarily re-order collection elements using a dataset
that specifies the new order, e.g

```
element_2
element_1
```

I think this nicely complements numeric and alphanumeric sorts that are
already possible with this tool.
2018-01-08 08:49:26 +01:00
John Chilton dc67206b21 Merge remote-tracking branch 'jmchilton/dev' into neo_datatype 2017-12-12 10:23:41 -05:00
Bjoern Gruening 2569851498 use unsorted sam file for tests 2017-12-10 15:23:26 +01:00
Bjoern Gruening 017dad025d add new test file 2017-12-10 15:23:26 +01:00
Nicola Soranzo 4a19bf62e3 Add missing newline at end of some test files
It gets added anyway when the file is uploaded to Galaxy due to the
default "Use POSIX standard" (to_posix_lines) option. Many tests which
simply copy them with cat and compare them would fail a strict diff test.
2017-11-28 17:13:18 +00:00
John Chilton cc3c3a9b92 Implement outline of Jupyter testing. 2017-10-02 09:50:37 -04:00
Dannon Baker d887cb17f0 Merge join_header into dev. 2017-09-06 20:35:33 -04:00
John Chilton 06ca789f92 Configuration tests for the last few upload enhancements. 2017-08-12 07:13:05 -04:00
pjvan_thof 99703469c0 Added test file 2017-07-07 18:29:05 +03:00
lecorguille f8bc407617 join with header: add a use case with a fill value 2017-06-26 15:12:21 +02:00
lecorguille 712a7045e5 join with header: add a regression test 2017-06-26 15:12:15 +02:00
lecorguille 5cf405902b join with header: add test 2017-06-26 15:11:51 +02:00
lecorguille 13ab2fd1a4 join with header: add test-data output files 2017-06-26 15:11:39 +02:00
peterjc c87e0eedb7 Cope with GFF3 as well as legacy GFF.
In GFF3 have key=value rather than space separated
as in legacy GFF and GTF format. Closes #3068.
2017-06-26 11:16:06 +01:00
Zipho Mashologu 791a746934 added tests 2017-06-13 16:09:00 +02:00
John Chilton 49abfced09 Implement collection operation for filtering lists from a file. 2017-04-17 17:08:25 -04:00
John Chilton 2288a88ab7 Fix relabel_from_file collection operation error handling if duplicate identifiers. 2017-04-17 13:12:57 -04:00
John Chilton 09bcdd9185 Various improvements to relabel from file collection operation.
- Better error handling (check for bad characters when creating collections).
- Implement a strict mode parameter to do even more validation.
- Rework tabular vs txt mode to be explicit user choice.
- Mirror fix in release_17.01 for datasets not having a history,
2017-04-13 23:15:56 -04:00
mvdbeek d21c14f009 Add possibility to rename collection items from a tabular file 2017-04-13 23:11:49 -04:00
John Chilton 9b6a9dc0c7 Start work on a relabelling collection operation.
I think it needs to be touched up but the basic operation seems to work so far. I think what remains to be done is:

 - Validate uniqueness of identifiers and provide nice messages if they are not unique.
 - Validate that at least the required number of lines are present in the file and provide a nice message if not.
 - Add strict mode to ensure exactly the correct number of lines is added.
 - Find where validation of identifiers happens in the API and apply same validation here - try not to let unsafe identifiers be created.
 - Consider more advanced modes - selecting a column, apply a regex replace, pick two columns for nested lists, etc.... None of this may need to be needed in the first iteration.
 - Consider another mode where a collection is labelled against an existing collection - should that be a separate tool of the same tool.
2017-04-13 23:11:49 -04:00
jvolkening 105557ba35 added functional test for <is_valid_xml> 2017-02-01 21:17:07 -06:00
John Chilton a87feb11ff Merge pull request #3145 from mvdbeek/fastqgz
Support for gzipped fastq formats
2017-01-11 21:18:22 -05:00
Anthony Bretaudeau 99a037d5b9 add fastq(*).bz2 datatypes and converters 2016-11-24 15:37:51 +01:00
mvdbeek 592f15c7b5 Add sam-to-bam conversion test tool 2016-11-16 22:01:47 +01:00
mvdbeek 10f1bb5459 Create a BaseFastq class and add test tools
Having a BaseFastq class allows Fastq and FastqGz classes to inherit from
BaseFastq. FastqGz is therfor not a Fastq datatype and goes through the
converter.

Also add 2 tools to demonstrate that compressed fastq will be converted to
uncompressed fastq if the tool specifies `format="fastq"`, while
`format="fastq.gz"` leaves files compressed.

The tool test can be run with:
```
planemo test --galaxy_root .  test/functional/tools/compressed_fastq_no_conversion.xml
planemo test --galaxy_root .  test/functional/tools/compressed_fastq_conversion.xml
```

Note that fastq conversion appears to required a galaxy user session, and
planemo testing fails. Interactive testing with `planemo serve` is not affected
and works fine.
2016-11-11 16:13:18 +01:00
zipho deaa904eb9 reduced the size of the neostore zip file 2016-07-25 11:43:34 +02:00
zipho 6ce1844bf7 added the sample neostore datatype (zipped) and disabled upload feature 2016-07-14 11:50:37 +02:00
Nicola Soranzo bb5dc6e20b Merge branch 'release_16.04' into dev 2016-06-08 16:09:39 +01:00
Daniel Blankenberg 42739c88c8 Add test for failing handling of BIOM1 metadata. 2016-06-07 12:02:09 -04:00
John Chilton 1ba74094a3 Improve composite output tool test.
- Rename expected output Log from input Log. This relieves a concern I had that the tests were just working because the inputs and outputs match.
 - Add another "unregistered" output file to the output directory and add a test for it. This verifies that such files are infact tested.
 - Add a nested "unregistered" output file to the output directory and add a test for it. This verifies that nested files are tested.
2016-05-16 11:51:03 -04:00
Dannon Baker 39eb262219 More fixes to 3.bam to make it valid stripped out secondary HD header and duplicated sequences chr10-16 2016-02-02 13:54:24 -05:00
Dannon Baker ba9ad97c40 Fix 3.bam @PG header to use : instead of = as a key:value separator. See commentary in https://github.com/galaxyproject/galaxy/pull/1638 for more details. 2016-02-02 09:30:30 -05:00
John Chilton 61fda5f23d Add missing file from previous commit. 2015-09-23 15:10:06 +01:00
John Chilton 2b02677e85 Workaround for metadata_bam.xml failure. 2015-09-19 10:27:09 +01:00
anton 41343e4b41 Added test for bcf index creation. 2015-04-28 13:45:33 -04:00
John Chilton 3fc5325d52 Remove test data files only used by tool tests.
These files are being moved to https://github.com/galaxyproject/galaxy-test-data.

Files used by framework functional tests remain. This drops the size of the test-data directory from 73M down to less than 1.3M.
2015-02-09 21:43:57 -05:00
John Chilton 3688e02475 Add framework test tool that has both data and data_collection param - with test case.
Tool test is mildly useful to verify this works for single execution - but more useful as basis for future changesets testing mixed collection and subcollection mapping tool executions.
2014-05-07 15:39:03 -05:00
Dave Bouvier 424efdcf9a Moved API tests to live under test/ rather than test/functional/. Removed test for DNAse flanked genes. Added test for UCSC table browser. 2014-04-30 15:35:57 -04:00
John Chilton 3ac17e09f1 Rework test framework testing and tools.
-framework will still cause just a small set of non-default, non-user facing tools to be tested and exerise various aspects of the tool and test frameworks, but now an argument can be passed in -with_framework_test_tools to allow these tools to be used as part of the normal test framework (i.e. when not using -framework). This serves two purposes - to ensure the feature coverage of existing tests remains high as the tests are migrated out of the distribution and to allow a set of tests to be available for functional (e.g. API tests) that users don't need to see.
2014-04-28 11:48:51 -05:00
Dave Bouvier da74f1ea78 Fix library security functional tests. 2014-04-25 15:29:56 -04:00
Dave Bouvier ac68f98bbd Fix certain failing functional tests. 2014-04-16 16:13:11 -04:00
Dave Bouvier 83af05b1f2 Migrate 46 tools from the distribution to the tool shed: gatk, gops, regional variation. 2014-04-01 11:04:32 -04:00
Dave Bouvier 448d9f55eb Migrate 43 tools from the distribution to the tool shed. 2014-01-27 09:53:14 -05:00
Dave Bouvier 9402faf4fc Remove files from test-data that are not referenced in any tool test definition or functional test script. 2014-01-08 14:15:53 -05:00
Dave Bouvier bb25625d31 Restore files that were deleted due to a tool migration, but are still used in test/functiona/test_get_data.py. 2013-11-13 10:46:38 -05:00
Ross Lazarus c860c25f77 Remove unused test-data/rtestouts
Remove references in converters to g2.bx.psu.edu
Note leaving rgenetics converters and datatypes - ped still used in genomic variation tools.
2013-10-14 21:43:32 +11:00
Dave Bouvier b0efe4ddea Migrate tools from the distribution to the tool shed, including but not limited to samtools and fastx_toolkit tools. 2013-09-26 10:05:00 -04:00
Jeremy Goecks ea8d337316 Add parameter to filtering tool to optionally skip header lines. Add test for new parameter usage as well. 2013-01-29 10:37:16 -05:00