From a18cc57bb617efd44b701363bd96172fc5e4c3a8 Mon Sep 17 00:00:00 2001 From: Timothy Sanders Date: Tue, 10 Oct 2023 09:30:35 -0400 Subject: [PATCH] Remove redundant test cases --- .../eclipse/pass/loader/nihms/TransformAndLoadSmokeIT.java | 6 +++--- .../src/test/resources/data/inprocess_NihmsData.csv | 2 -- .../src/test/resources/data/noncompliant_NihmsData.csv | 5 +---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pass-nihms-loader/nihms-data-transform-load/src/test/java/org/eclipse/pass/loader/nihms/TransformAndLoadSmokeIT.java b/pass-nihms-loader/nihms-data-transform-load/src/test/java/org/eclipse/pass/loader/nihms/TransformAndLoadSmokeIT.java index 93db823a..9c371e5c 100644 --- a/pass-nihms-loader/nihms-data-transform-load/src/test/java/org/eclipse/pass/loader/nihms/TransformAndLoadSmokeIT.java +++ b/pass-nihms-loader/nihms-data-transform-load/src/test/java/org/eclipse/pass/loader/nihms/TransformAndLoadSmokeIT.java @@ -65,15 +65,15 @@ public void smokeTestLoadAndTransform(WireMockRuntimeInfo wmRuntimeInfo) throws //make sure RepositoryCopies are all in before moving on so we can be sure the counts are done. repoCopySelector.setFilter(RSQL.notEquals("id", "-1")); List repositoryCopies = passClient.selectObjects(repoCopySelector).getObjects(); - assertEquals(26, repositoryCopies.size()); + assertEquals(23, repositoryCopies.size()); publicationSelector.setFilter(RSQL.notEquals("id", "-1")); List publications = passClient.selectObjects(publicationSelector).getObjects(); - assertEquals(37, publications.size()); + assertEquals(32, publications.size()); submissionSelector.setFilter(RSQL.notEquals("id", "-1")); List submissions = passClient.selectObjects(submissionSelector).getObjects(); - assertEquals(37, submissions.size()); + assertEquals(32, submissions.size()); //reset file names: File downloadDir = new File(path); diff --git a/pass-nihms-loader/nihms-data-transform-load/src/test/resources/data/inprocess_NihmsData.csv b/pass-nihms-loader/nihms-data-transform-load/src/test/resources/data/inprocess_NihmsData.csv index bb5561dc..1f81e00f 100644 --- a/pass-nihms-loader/nihms-data-transform-load/src/test/resources/data/inprocess_NihmsData.csv +++ b/pass-nihms-loader/nihms-data-transform-load/src/test/resources/data/inprocess_NihmsData.csv @@ -10,11 +10,9 @@ PMID,PMCID,NIHMSID,Grant Number,PI Name,Publication Date,NIHMS file deposited,NI 78787878,,787878,P20 HHHHHH,"COFFEE, K",6/13/2017,5/30/2017,5/30/2017,7/10/2017,,Article O,not used,not used,not used,no,not used 89898989,,898989,N01 IIIIII,"BLUEMKE, DAVID A",11/7/2017,6/16/2017,6/26/2017,8/9/2017,,Article P,not used,not used,not used,no,not used 89898989,,898989,UL1 JJJJJJ,"AQUA, E",11/7/2017,6/16/2017,6/26/2017,8/9/2017,,Article P,not used,not used,not used,no,not used -90909090,,909090,P30 KKKKKK,"CLAY, F",1/1/2018,2/1/2018,2/1/2018,,,Article Q,not used,not used,not used,no,not used 98989898,,989898,U01 LLLLLL,"MINT, A",7/24/2017,1/26/2018,1/26/2018,,,Article R,not used,not used,not used,no,not used 87878787,,878787,T32 MMMMMM,"GRAY, I",8/1/2017,8/13/2017,,,,Article S,not used,not used,not used,no,not used 87878787,,878787,T32 NNNNNN,"IVORY, H",8/1/2017,8/13/2017,,,,Article S,not used,not used,not used,no,not used 76767676,,767676,R01 OOOOOO,"MAROON, P",12/1/2017,12/20/2017,12/20/2017,1/9/2018,,Article T,not used,not used,not used,no,not used 65656565,,656565,R01 PPPPPP,"SAGE, X",9/22/2017,9/18/2017,,10/2/2017,,Article U,not used,not used,not used,no,not used 65656565,,656565,R01 QQQQQQ,"SAGE, X",9/22/2017,9/18/2017,,10/2/2017,,Article U,not used,not used,not used,no,not used -54545454,,545454,T32 RRRRRR,"SAGE, X",9/22/2017,9/18/2017,,10/2/2017,,Article U,not used,not used,not used,no,not used diff --git a/pass-nihms-loader/nihms-data-transform-load/src/test/resources/data/noncompliant_NihmsData.csv b/pass-nihms-loader/nihms-data-transform-load/src/test/resources/data/noncompliant_NihmsData.csv index 4ea40371..e4df1255 100644 --- a/pass-nihms-loader/nihms-data-transform-load/src/test/resources/data/noncompliant_NihmsData.csv +++ b/pass-nihms-loader/nihms-data-transform-load/src/test/resources/data/noncompliant_NihmsData.csv @@ -1,17 +1,14 @@ PMID,PMCID,NIHMSID,Grant Number,PI Name,Publication Date,NIHMS file deposited,NIHMS initial approval,NIHMS tagging complete,NIHMS final approval,Article Title,First Author Name,Journal Title,Journal Publisher,Method A Journal,NIHMS Person 13131313,,131313,T32 KKKKKK,"CHOCOLATE, A",7/1/2017,2/23/2016,3/9/2016,3/21/2016,,Article PQ,not used,not used,not used,no,not used 24242424,,,T32 LLLLLL,"CRIMSON, B",6/1/2017,,,,,Article OP,not used,not used,not used,no,not used -35353535,,,K23 MMMMMM,"NAVY, E",10/1/2017,,,,,Article NO,not used,not used,not used,no,not used 46464646,,,T32 NNNNNN,"IVORY, H",2/1/2018,,,,,Article MN,not used,not used,not used,no,not used 57575757,,,TL1 OOOOOO,"MINT, D",12/1/2017,,,,,Article LM,not used,not used,not used,no,not used -68686868,,686868,T32 PPPPPP,"RED, F",3/1/2017,8/15/2017,,,,Article KL,not used,not used,not used,no,not used 79797979,,,R01 QQQQQQ,"SAGE, X",4/1/2017,,,,,Article JK,not used,not used,not used,no,not used 79797979,,,R01 RRRRRR,"TEAL, K",3/1/2017,,,,,Article V,not used,not used,not used,no,not used 79797979,,,K24 SSSSSS,"TEAL, K",3/1/2017,,,,,Article V,not used,not used,not used,no,not used 80808080,,,N01 TTTTTT,"SLATE, M",4/1/2017,,,,,Article EF,not used,not used,not used,no,not used 97979797,,,P50 UUUUUU,"SANDY, F",4/15/2017,,,,,Article FG,not used,not used,not used,no,not used -86868686,,,P30 VVVVVV,"TAN, R",3/1/2017,,,,,Article GH,not used,not used,not used,no,not used -75757575,,,R01 WWWWWW,"GOLDEN, Q",2/1/2017,,,,,Article HI,not used,not used,not used,no,not used +86868686,,,P30 VVVVVV,"TAN, R",3/1/2017,,,,,Article GH,not used,not used,not used,no,not usedd 64646464,,646464,T32 XXXXXX,"LIME, N",5/1/2017,9/15/2017,,,,Article IJ,not used,not used,not used,no,not used 53535353,,,R01 YYYYYY,"CYAN, S",12/1/2017,,,,,Article AB,not used,not used,not used,no,not used 42424242,,424242,P30 ZZZZZZ,"OLIVE, K",5/1/2017,1/30/2017,2/9/2017,3/7/2017,,Article CD,not used,not used,not used,no,not used