@@ -673,65 +673,6 @@ public void testGetDiannReportFilePath() throws IOException
673673 assertEquals (tsvFile2 , reportTsvFile );
674674 }
675675
676- @ Test
677- public void testGetDiannLibrarySources () throws IOException
678- {
679- Path testDataDir = getDiannTestFilesPath ();
680- Path libPath = testDataDir .resolve ("test_diann_library.blib" );
681- ISpectrumLibrary isl = createLibrary (libPath );
682- SpecLibReader libReader = SpecLibReader .getReader (isl );
683- assertNotNull (libReader );
684- List <LibSourceFile > libSources = getLibSources (libReader , isl , libPath , "no_name_document" );
685- assertNotNull (libSources );
686-
687- // Files read from the .blib's SpectrumSourceFiles table
688- List <String > spectrumSources = List .of (
689- "D0_rep1_DIA.mzML" ,
690- "D0_rep2_DIA.mzML" ,
691- "D2_rep2_DIA.mzML" ,
692- "D4_rep2_DIA.mzML" ,
693- "D6_rep1_DIA.mzML" ,
694- "D8_rep1_DIA.mzML" ,
695- "D8_rep2_DIA.mzML" ,
696- "D10_rep2_DIA.mzML" ,
697- "D11_rep2_DIA.mzML" ,
698- "D2_rep1_DIA.mzML" ,
699- "D6_rep2_DIA.mzML" ,
700- "D10_rep1_DIA.mzML" ,
701- "D11_rep1_DIA.mzML" ,
702- "D12_rep1_DIA.mzML" ,
703- "D4_rep1_DIA.mzML" ,
704- "D12_rep2_DIA.mzML" ,
705- "D14_rep1_DIA.mzML" ,
706- "D14_rep2_DIA.mzML"
707- );
708-
709- assertEquals (spectrumSources .size () + 1 , libSources .size ()); // Add one for the report TSV placeholder
710-
711- String idFile = "report-lib.parquet.skyline-for-test.speclib" ;
712- for (int i = 0 ; i < spectrumSources .size (); i ++)
713- {
714- LibSourceFile libSource = libSources .get (i );
715- assertTrue (libSource .hasSpectrumSourceFile ());
716- assertEquals (spectrumSources .get (i ), libSource .getSpectrumSourceFile ());
717- assertTrue (libSource .hasIdFile ());
718- assertEquals (idFile , libSource .getIdFile ());
719- }
720-
721- // Placeholder for the DIA-NN report file
722- LibSourceFile libSource = libSources .get (spectrumSources .size ());
723- assertFalse (libSource .hasSpectrumSourceFile ());
724- assertTrue (libSource .hasIdFile ());
725- assertTrue (LibSourceFile .DIANN_REPORT_TSV_PLACEHOLDER .equals (libSource .getIdFile ()));
726-
727- Set <String > idFilesInSources = libSources .stream ().map (LibSourceFile ::getIdFile ).collect (Collectors .toSet ());
728- assertEquals (Set .of (idFile , LibSourceFile .DIANN_REPORT_TSV_PLACEHOLDER ), idFilesInSources );
729-
730- Path expectedReportFilePath = testDataDir .resolve ("report-lib-for-test.tsv" ); // Files with the longest matching prefix and expected column headers
731- Path reportFilePath = new SpecLibValidator ().getDiannReportFilePath (testDataDir .resolve ("report-lib.parquet.skyline-for-test.speclib" ));
732- assertEquals ("Unexpected DIA-NN TSV report file path" , expectedReportFilePath , reportFilePath );
733- }
734-
735676 private static Path getDiannTestFilesPath () throws IOException
736677 {
737678 return JunitUtil .getSampleData (ModuleLoader .getInstance ().getModule (PanoramaPublicModule .class ),
0 commit comments