From 6babd7c2387996384a49042ed4290095c13d5ed9 Mon Sep 17 00:00:00 2001 From: hansonr Date: Thu, 9 May 2019 21:53:36 -0500 Subject: [PATCH] insignificant test file changes --- src/jalview/ext/ensembl/EnsemblSeqProxy.java | 8 ++++++-- test/jalview/datamodel/AlignmentTest.java | 19 ++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/jalview/ext/ensembl/EnsemblSeqProxy.java b/src/jalview/ext/ensembl/EnsemblSeqProxy.java index 2e20665..49e6341 100644 --- a/src/jalview/ext/ensembl/EnsemblSeqProxy.java +++ b/src/jalview/ext/ensembl/EnsemblSeqProxy.java @@ -423,7 +423,9 @@ public abstract class EnsemblSeqProxy extends EnsemblRestClient List seqs = parseSequenceJson(ids); if (seqs == null) - return alignment; + { + return alignment; + } if (seqs.isEmpty()) { @@ -490,7 +492,9 @@ public abstract class EnsemblSeqProxy extends EnsemblRestClient Platform.timeCheck("ENS seqproxy", Platform.TIME_MARK); Map val = (Map) getJSON(null, ids, -1, MODE_MAP, null); if (val == null) - return null; + { + return null; + } Object s = val.get("desc"); String desc = s == null ? null : s.toString(); s = val.get("id"); diff --git a/test/jalview/datamodel/AlignmentTest.java b/test/jalview/datamodel/AlignmentTest.java index 14e74e4..cdcc219 100644 --- a/test/jalview/datamodel/AlignmentTest.java +++ b/test/jalview/datamodel/AlignmentTest.java @@ -243,7 +243,24 @@ public class AlignmentTest return false; } - if (alignment.findIndex(dbr.getMap().getTo()) == -1) + + SequenceI x = dbr.getMap().getTo(); +// System.out.println(alignment.toString()); +// System.out.println(dbr); +// System.out.println("map " + dbr.getMap()); +// System.out.println("to " + dbr.getMap().getTo()); +// if (x.toString().indexOf("ENSP00000395337") >= 0) +// { +// // The TO name here is "ENSP00000395337" +// // But the name in the table is "LDAH_HUMAN" +// System.out.println(x.getSequenceAsString()); +// SequenceI y = alignment.getSequenceAt(0); +// System.out.println(y.getSequenceAsString()); +// System.out.println(x.getSequenceAsString() +// .equals(y.getSequenceAsString())); +// +// } + if (alignment.findIndex(x) == -1) { if (raiseAssert) { -- 1.7.10.2