Skip to content

Use MultiSet instead of Bag #1267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-adam wants to merge 1 commit into
base: develop
Choose a base branch
from
+5 −5
Open

Use MultiSet instead of Bag #1267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions test/src/org/labkey/test/tests/targetedms/TargetedMSQCTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package org.labkey.test.tests.targetedms;

import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.bag.HashBag;
import org.apache.commons.collections4.MultiSet;
import org.apache.commons.collections4.multiset.HashMultiSet;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
Expand Down Expand Up @@ -1192,7 +1192,7 @@ public void testQCPlotYAxisZoom()
qcPlotsWebPart = qcDashboard.getQcPlotsWebPart();

plots = qcPlotsWebPart.getPlots();
firstPlot = plots.get(0);
firstPlot = plots.getFirst();

assertFalse("Zoom should not persist after page reload", qcPlotsWebPart.isZoomActive(firstPlot));
}
Expand All @@ -1217,15 +1217,15 @@ private void createAndInsertAnnotations()
private void checkForCorrectAnnotations(String plotType, QCPlotsWebPart qcPlotsWebPart)
{
List<QCPlot> qcPlots = qcPlotsWebPart.getPlots();
Bag<QCHelper.Annotation> expectedAnnotations = new HashBag<>();
MultiSet<QCHelper.Annotation> expectedAnnotations = new HashMultiSet<>();
expectedAnnotations.add(instrumentChange);
expectedAnnotations.add(reagentChange);
expectedAnnotations.add(technicianChange);
expectedAnnotations.add(candyChange);
for (QCPlot plot : qcPlots)
{
log("verifying for qc plot - " + plot.getPlot().getText());
Bag<QCHelper.Annotation> plotAnnotations = new HashBag<>(plot.getAnnotations());
MultiSet<QCHelper.Annotation> plotAnnotations = new HashMultiSet<>(plot.getAnnotations());
assertEquals("Wrong annotations in " + plotType + ":" + plot.getPrecursor(), expectedAnnotations, plotAnnotations);
}
}
Expand Down
Loading