diff --git a/genotyping/src/org/labkey/genotyping/sequences/AlleleFastaLoader.java b/genotyping/src/org/labkey/genotyping/sequences/AlleleFastaLoader.java deleted file mode 100644 index cca9b965..00000000 --- a/genotyping/src/org/labkey/genotyping/sequences/AlleleFastaLoader.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2010 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.labkey.genotyping.sequences; - -import org.labkey.api.reader.FastaLoader; - -import java.io.File; - -/** - * User: adam - * Date: Aug 13, 2010 - * Time: 9:44:05 AM - */ -public class AlleleFastaLoader extends FastaLoader -{ - protected AlleleFastaLoader(File fastaFile) - { - super(fastaFile, new FastaIteratorElementFactory<>() - { - @Override - public Allele createNext(String header, byte[] body) - { - return new Allele(header, body); - } - }); - } - - @Override - public FastaIterator iterator() - { - return new AlleleIterator(); - } - - public class AlleleIterator extends FastaIterator - { - private AlleleIterator() - { - } - } -} diff --git a/genotyping/test/src/org/labkey/test/tests/GenotypingTest.java b/genotyping/test/src/org/labkey/test/tests/GenotypingTest.java index 32d6c074..01950213 100644 --- a/genotyping/test/src/org/labkey/test/tests/GenotypingTest.java +++ b/genotyping/test/src/org/labkey/test/tests/GenotypingTest.java @@ -19,6 +19,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.labkey.api.util.FileUtil; import org.labkey.test.BaseWebDriverTest; import org.labkey.test.Locator; import org.labkey.test.categories.CustomModules; @@ -118,7 +119,7 @@ private void receiveDataFromGalaxyServer() String analysisFolder = "analysis_" + getRunNumber(); for (String file: filesToCopy) { - copyFile(new File(getPipelineLoc(), file), new File(getPipelineLoc(), analysisFolder + "/" + file)); + copyFile(FileUtil.appendName(getPipelineLoc(), file), FileUtil.appendName(FileUtil.appendName(getPipelineLoc(), analysisFolder), file)); } refresh(); waitForPipelineJobsToComplete(++pipelineJobCount, "Import genotyping analysis", false); diff --git a/genotyping/test/src/org/labkey/test/tests/IlluminaTest.java b/genotyping/test/src/org/labkey/test/tests/IlluminaTest.java index 9a56aedd..51e25704 100644 --- a/genotyping/test/src/org/labkey/test/tests/IlluminaTest.java +++ b/genotyping/test/src/org/labkey/test/tests/IlluminaTest.java @@ -19,6 +19,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.labkey.api.util.FileUtil; import org.labkey.serverapi.reader.Readers; import org.labkey.test.BaseWebDriverTest; import org.labkey.test.Locator; @@ -90,7 +91,7 @@ public void testSteps() throws Exception //https://docs.google.com/a/labkey.com/file/d/0B45Fm0-0-NLtdmpDR1hKaW5jSWc/edit private void verifyCleanIlluminaSampleSheets() { - importFolderFromZip(new File(getPipelineLoc(), "genoCleanSamples.folder.zip"), true, 2); + importFolderFromZip(FileUtil.appendName(getPipelineLoc(), "genoCleanSamples.folder.zip"), true, 2); goToProjectHome(); click(Locator.linkWithText("Samples")); waitForText("SIVkcol2");