Skip to content

Commit cbfba6a

Browse files
ankurjunejaankurjuneja
committed
delete combined guide set after creation
1 parent 3ec4e1a commit cbfba6a

1 file changed

Lines changed: 37 additions & 30 deletions

File tree

‎test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java‎

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ protected String getProjectName()
8282
@BeforeClass
8383
public static void initProject()
8484
{
85-
TargetedMSQCGuideSetTest init = getCurrentTest();
86-
87-
init.setupFolder(FolderType.QC);
88-
init.importData(SProCoP_FILE);
89-
90-
init.createGuideSet(gs1);
91-
init.createGuideSet(gs2);
92-
init.createGuideSet(gs3);
93-
init.createGuideSet(gs4);
94-
init.createGuideSet(gs5);
85+
// TargetedMSQCGuideSetTest init = getCurrentTest();
86+
//
87+
// init.setupFolder(FolderType.QC);
88+
// init.importData(SProCoP_FILE);
89+
//
90+
// init.createGuideSet(gs1);
91+
// init.createGuideSet(gs2);
92+
// init.createGuideSet(gs3);
93+
// init.createGuideSet(gs4);
94+
// init.createGuideSet(gs5);
9595
}
9696

9797
@Before
@@ -105,7 +105,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException
105105
{
106106
// Use the API-based approach for deletion so that we don't trigger AJAX requests navigating to the delete page
107107
// that may run in the background and cause SQL Server deadlock exceptions
108-
new APIContainerHelper(this).deleteProject(getProjectName(), afterTest);
108+
// new APIContainerHelper(this).deleteProject(getProjectName(), afterTest);
109109
}
110110

111111
@Test
@@ -198,6 +198,14 @@ private void testCombinedPlotsGuideSetCreation()
198198
clickTab("Guide Sets");
199199
DataRegionTable table = new DataRegionTable.DataRegionFinder(getDriver()).waitFor();
200200
assertEquals("Guide set was not created from combined plots", 6, table.getDataRowCount());
201+
202+
table.checkCheckbox(5);
203+
table.clickHeaderButton("Delete");
204+
clickButton("Confirm Delete");
205+
206+
table = new DataRegionTable.DataRegionFinder(getDriver()).waitFor();
207+
assertEquals("Guide set was not deleted", 5, table.getDataRowCount());
208+
201209
}
202210

203211
public void testGuideSetPlotDisplay()
@@ -212,13 +220,13 @@ public void testGuideSetPlotDisplay()
212220
List<Pair<String, Integer>> shapeCounts = new ArrayList<>();
213221
shapeCounts.add(Pair.of(SvgShapes.CIRCLE.getPathPrefix(), 289));
214222
shapeCounts.add(Pair.of(SvgShapes.TRIANGLE.getPathPrefix(), 40));
215-
verifyGuideSetRelatedElementsForPlots(qcPlotsWebPart, 5, shapeCounts, 47);
223+
verifyGuideSetRelatedElementsForPlots(qcPlotsWebPart, 4, shapeCounts, 47);
216224

217225
// check box for group x-axis values by date and verify
218226
qcPlotsWebPart.setGroupXAxisValuesByDate(true);
219-
verifyGuideSetRelatedElementsForPlots(qcPlotsWebPart, 5, shapeCounts, 20);
227+
verifyGuideSetRelatedElementsForPlots(qcPlotsWebPart, 4, shapeCounts, 20);
220228
qcPlotsWebPart.setShowAllPeptidesInSinglePlot(true, 1);
221-
assertEquals("Unexpected number of training range rects visible", 5, qcPlotsWebPart.getGuideSetTrainingRectCount());
229+
assertEquals("Unexpected number of training range rects visible", 4, qcPlotsWebPart.getGuideSetTrainingRectCount());
222230
qcPlotsWebPart.setShowAllPeptidesInSinglePlot(false);
223231
qcPlotsWebPart.setGroupXAxisValuesByDate(false);
224232

@@ -266,8 +274,7 @@ public void testParetoPlot()
266274
QCPlotsWebPart.MetricType.FWHM,
267275
QCPlotsWebPart.MetricType.FWB,
268276
QCPlotsWebPart.MetricType.TIC_AREA,
269-
QCPlotsWebPart.MetricType.ISOTOPE_DOTP
270-
);
277+
QCPlotsWebPart.MetricType.ISOTOPE_DOTP);
271278
verifyNavigationToPanoramaDashboard(guideSetId, 0, QCPlotsWebPart.MetricType.TOTAL_PEAK, true);
272279

273280
clickAndWait(Locator.linkWithText("Pareto Plot")); //go to Pareto Plot tab
@@ -357,7 +364,7 @@ public void testEmptyParetoPlot()
357364
ParetoPlotsWebPart paretoPlotsWebPart = paretoPage.getParetoPlotsWebPart();
358365

359366
paretoPlotsWebPart.verifyEmpty();
360-
}
367+
}
361368

362369
public void testSmallMoleculePareto() throws IOException, CommandException
363370
{
@@ -380,10 +387,10 @@ public void testSmallMoleculePareto() throws IOException, CommandException
380387
ParetoPlotsWebPart paretoPlotsWebPart = paretoPage.getParetoPlotsWebPart();
381388

382389
verifyTicksOnPlots(paretoPlotsWebPart, 1, QCPlotsWebPart.QCPlotType.MetricValue,
383-
QCPlotsWebPart.MetricType.FWB,
384-
QCPlotsWebPart.MetricType.FWHM,
385-
QCPlotsWebPart.MetricType.RETENTION,
386-
QCPlotsWebPart.MetricType.TRANSITION_AREA);
390+
QCPlotsWebPart.MetricType.FWB,
391+
QCPlotsWebPart.MetricType.FWHM,
392+
QCPlotsWebPart.MetricType.RETENTION,
393+
QCPlotsWebPart.MetricType.TRANSITION_AREA);
387394

388395
clickExportPDFIcon("chart-render-div", 0);
389396
clickExportPNGIcon("chart-render-div", 0);
@@ -400,17 +407,17 @@ public void testReplicateAnnotations() throws IOException, CommandException
400407
selectQuery("targetedms", "Replicate");
401408
//confirm table columns are present and of correct type representing replicate annotations:
402409
GetQueryDetailsCommand queryDetailsCommand = new GetQueryDetailsCommand("targetedms", "Replicate");
403-
GetQueryDetailsResponse queryDetailsResponse = queryDetailsCommand.execute(createDefaultConnection(), getProjectName() + "/" + folderName);
410+
GetQueryDetailsResponse queryDetailsResponse = queryDetailsCommand.execute(createDefaultConnection(),getProjectName() + "/" + folderName);
404411
List<GetQueryDetailsResponse.Column> columns = queryDetailsResponse.getColumns();
405412

406413
int groupingIndex = 11;
407-
assertEquals("", "Day", columns.get(groupingIndex).getName());
408-
assertEquals("", "Day", columns.get(groupingIndex).getCaption());
414+
assertEquals("","Day", columns.get(groupingIndex).getName());
415+
assertEquals("","Day", columns.get(groupingIndex).getCaption());
409416
assertEquals("", "Text (String)", columns.get(groupingIndex).getType());
410417

411418
int ignoreIndex = 12;
412-
assertEquals("", "SampleIdentifier", columns.get(ignoreIndex).getName());
413-
assertEquals("", "SampleIdentifier", columns.get(ignoreIndex).getCaption());
419+
assertEquals("","SampleIdentifier", columns.get(ignoreIndex).getName());
420+
assertEquals("","SampleIdentifier", columns.get(ignoreIndex).getCaption());
414421
assertEquals("", "Text (String)", columns.get(ignoreIndex).getType());
415422

416423
//confirm data in grid view
@@ -468,7 +475,7 @@ private void validateGuideSetStats(GuideSet gs) throws IOException, CommandExcep
468475
Rowset rowset = response.getRowset();
469476
assertEquals("Unexpected number of filtered rows", 1, rowset.getSize());
470477
Row row = rowset.iterator().next();
471-
assertEquals("Unexpected guide set stats record count", stats.getNumRecords(), ((Number) row.getValue("NumRecords")).intValue());
478+
assertEquals("Unexpected guide set stats record count", stats.getNumRecords(), ((Number)row.getValue("NumRecords")).intValue());
472479

473480
if (stats.getMean() != null)
474481
{
@@ -480,7 +487,7 @@ private void validateGuideSetStats(GuideSet gs) throws IOException, CommandExcep
480487
if (stats.getStdDev() != null)
481488
{
482489
double delta = Math.abs(stats.getStdDev() * 0.001);
483-
double actual = ((Number) row.getValue("StandardDev")).doubleValue();
490+
double actual = ((Number)row.getValue("StandardDev")).doubleValue();
484491
assertEquals("Unexpected guide set stats std dev for " + stats.getMetricName(), stats.getStdDev(), actual, delta);
485492
}
486493
}
@@ -620,7 +627,7 @@ private void addRowIdForCreatedGuideSet(GuideSet guideSet, String subfolder)
620627
guideSet.setRowId(guideSetWebPart.getRowId(guideSet));
621628
}
622629

623-
private void verifyTicksOnPlots(ParetoPlotsWebPart paretoPlotsWebPart, int guideSetNum, QCPlotsWebPart.QCPlotType plotType, QCPlotsWebPart.MetricType... metrics)
630+
private void verifyTicksOnPlots(ParetoPlotsWebPart paretoPlotsWebPart, int guideSetNum, QCPlotsWebPart.QCPlotType plotType, QCPlotsWebPart.MetricType ... metrics)
624631
{
625632
paretoPlotsWebPart.waitForTickLoad(guideSetNum, plotType);
626633

@@ -664,7 +671,7 @@ private void verifyNavigationToPanoramaDashboard(int guideSetNum, QCPlotsWebPart
664671
assertEquals("startDate in the URL does not equal 'Start Date' on the page", parseUrlDate(getUrlParam("startDate", true)), parseFormDate(qcPlotsWebPart.getCurrentStartDate()));
665672

666673
//compare url End Date with input form End Date
667-
if (checkEndDate)
674+
if(checkEndDate)
668675
assertEquals("endDate in the URL does not equal 'End Date' on the page", parseUrlDate(getUrlParam("endDate", true)), parseFormDate(qcPlotsWebPart.getCurrentEndDate()));
669676
}
670677

0 commit comments

Comments
 (0)