From 2e285e964a1ae67facb9fdd43aaa96e3f6b17327 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Wed, 15 Jun 2016 09:20:04 +0100 Subject: [PATCH] JAL-2101 unit test updated to match config file --- resources/fts/uniprot_data_columns.txt | 2 +- test/jalview/fts/core/FTSRestClientTest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/fts/uniprot_data_columns.txt b/resources/fts/uniprot_data_columns.txt index fccf3bb..f506648 100644 --- a/resources/fts/uniprot_data_columns.txt +++ b/resources/fts/uniprot_data_columns.txt @@ -110,7 +110,7 @@ Caution;comment(CAUTION);String;g6;50;1000;95;false;false Miscellaneous [CC];comment(GENERAL);String;g6;50;1000;95;false;false Keywords;keywords|keyword;String;g6;50;1000;95;false;true Protein existence;existence;String;g6;50;1000;95;false;true -ALL;Search All;String;g7;50;1000;95;false;true; +ALL;Search All;String;g7;50;1000;95;false;true Subunit structure [CC];comment(SUBUNIT);String;g9;50;1000;95;false;false Interacts with;interactor;String;g9;50;1000;95;false;false Developmental stage;comment(DEVELOPMENTAL STAGE);String;g10;50;1000;95;false;false diff --git a/test/jalview/fts/core/FTSRestClientTest.java b/test/jalview/fts/core/FTSRestClientTest.java index 5ceb5cd..eae5575 100644 --- a/test/jalview/fts/core/FTSRestClientTest.java +++ b/test/jalview/fts/core/FTSRestClientTest.java @@ -95,7 +95,7 @@ public class FTSRestClientTest Collection searchalbeFields = ftsRestClient .getSearchableDataColumns(); Assert.assertNotNull(searchalbeFields); - Assert.assertEquals(searchalbeFields.size(), 30); + Assert.assertEquals(searchalbeFields.size(), 22); } @Test(groups = { "Functional" }) @@ -237,11 +237,12 @@ public class FTSRestClientTest .getSearchableDataColumns(); for (FTSDataColumnI foundCol : searchableCols) { + System.out.println(foundCol.toString()); uniqueSet.add(foundCol); uniqueSet.add(foundCol); } Assert.assertTrue(!uniqueSet.isEmpty()); - Assert.assertEquals(uniqueSet.size(), 30); + Assert.assertEquals(uniqueSet.size(), 22); } @Test(groups = { "Functional" }) -- 1.7.10.2