a97f8a0fffb31a2b3521e573a03f454fb60275d3 markd Tue May 30 21:30:12 2023 -0700 Add mechnaism to fix problem with mapping prot-prot via prot-na alignment by explictly specifying the type of alignments diff --git src/utils/pslMap/tests/makefile src/utils/pslMap/tests/makefile index 32d405f..d2cc8fb 100644 --- src/utils/pslMap/tests/makefile +++ src/utils/pslMap/tests/makefile @@ -1,30 +1,30 @@ kentSrc = ../../.. include ${kentSrc}/inc/common.mk #pslMap = valgrind --tool=memcheck --num-callers=25 pslMap pslMap = ${DESTBINDIR}/pslMap pslSwap = ${DESTBINDIR}/pslSwap blastToPsl = ${DESTBINDIR}/blastToPsl pslCheck = ${DESTBINDIR}/pslCheck chainSwap = ${DESTBINDIR}/chainSwap all: test: gapBoth mrnaMrnaMap mrnaMrnaXMap mrnaMapOver mrnaMapOverSwap \ mrnaMapOverChain mrnaMapOverChainSwap testMapFileWithInQName \ - kgProt negQChain testSpGencode + kgProt negQChain testSpGencode testTypeErr # basic tests of protein -> mrna -> genome mapping kgProt: mkdirs ${blastToPsl} input/kgProtMRna.blast output/kgProtMRna.psl ${pslMap} output/kgProtMRna.psl input/kgMRna.psl output/$@.psl ${pslCheck} -verbose=0 output/$@.psl diff -u expected/$@.psl output/$@.psl # this generated a gap in both query and target gapBoth: mkdirs ${blastToPsl} input/gapBothProtMRna.blast output/gapBothProtMRna.psl ${pslMap} output/gapBothProtMRna.psl input/gapBothMRna.psl output/$@.psl ${pslCheck} -verbose=0 output/$@.psl diff -u expected/$@.psl output/$@.psl @@ -87,25 +87,30 @@ ${pslCheck} -verbose=0 output/$@.psl diff -u expected/$@.psl output/$@.psl diff -u expected/$@.mapinfo output/$@.mapinfo # -mapFileWithInQName testMapFileWithInQName: mkdirs ${pslMap} -mapFileWithInQName -mapInfo=output/$@.mapinfo input/gencode.src.psl input/gencode.blocks.qName-psl output/$@.psl ${pslCheck} -verbose=0 output/$@.psl diff -u expected/$@.psl output/$@.psl diff -u expected/$@.mapinfo output/$@.mapinfo # swissprot canonical features that were mapped to isoform with protein # isoforms aligned to gencode RNAs. Mapping these resulted in overlapping # blocks. This tests block adjustments. testSpGencode: mkdirs - ${pslMap} -mapInfo=output/$@.mapinfo input/spAnnotIso.psl input/spGencode.psl output/$@.psl + ${pslMap} -inType=prot_prot -mapInfo=output/$@.mapinfo input/spAnnotIso.psl input/spGencode.psl output/$@.psl ${pslCheck} -verbose=0 output/$@.psl diff -u expected/$@.psl output/$@.psl diff -u expected/$@.mapinfo output/$@.mapinfo +# implied types not supported +testTypeErr: mkdirs + if ${pslMap} -mapInfo=output/$@.mapinfo input/spAnnotIso.psl input/spGencode.psl output/$@.psl 2> output/$@.err ; then echo "Error: should have failed" >&2; false ; else true ; fi + diff expected/$@.err output/$@.err + clean:: rm -rf output mkdirs: @${MKDIR} output