Skip to content
Snippets Groups Projects
Commit 03683463 authored by tjc's avatar tjc
Browse files

fix formats

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@10274 ee4ac58c-ac51-4696-9907-e4b3aa274f04
parent e4affaf4
No related branches found
No related tags found
No related merge requests found
...@@ -25,23 +25,23 @@ import org.junit.Test; ...@@ -25,23 +25,23 @@ import org.junit.Test;
public class CircularGenomeControllerTest public class CircularGenomeControllerTest
{ {
/** /**
* Test that EMBOSS_ROOT is set * Test that EMBOSS_ROOT is set
*/ */
@Test @Test
public void testEmbossRoot() public void testEmbossRoot()
{ {
assertNotNull("EMBOSS_ROOT not set", System.getProperty("EMBOSS_ROOT")); assertNotNull("EMBOSS_ROOT not set", System.getProperty("EMBOSS_ROOT"));
} }
/** /**
* Test that restrict can be found * Test that restrict can be found
*/ */
@Test @Test
public void testEmbossInstalled() public void testEmbossInstalled()
{ {
String restrictPath = System.getProperty("EMBOSS_ROOT") + "/bin/restrict"; String restrictPath = System.getProperty("EMBOSS_ROOT") + "/bin/restrict";
File restrict = new File(restrictPath); File restrict = new File(restrictPath);
assertTrue("restrict not found at: " + restrictPath, restrict.exists()); assertTrue("restrict not found at: " + restrictPath, restrict.exists());
} }
} }
\ No newline at end of file
...@@ -35,27 +35,27 @@ import uk.ac.sanger.artemis.circular.digest.EmbossTableParser; ...@@ -35,27 +35,27 @@ import uk.ac.sanger.artemis.circular.digest.EmbossTableParser;
public class EmbossTableParserTest public class EmbossTableParserTest
{ {
/** /**
* Test that restrict output is parsed * Test that restrict output is parsed
*/ */
@Test @Test
public void testParser() throws IOException public void testParser() throws IOException
{ {
final InputStream inputStream = final InputStream inputStream = EmbossTableParserTest.class
EmbossTableParserTest.class.getResourceAsStream("/data/foo.restrict"); .getResourceAsStream("/data/foo.restrict");
InputStreamReader reader = new InputStreamReader(inputStream); InputStreamReader reader = new InputStreamReader(inputStream);
EmbossTableParser etp = new EmbossTableParser(); EmbossTableParser etp = new EmbossTableParser();
List<CutSite> cutSites = etp.parse(new BufferedReader(reader)); List<CutSite> cutSites = etp.parse(new BufferedReader(reader));
CutSite firstCutSite = cutSites.get(0); CutSite firstCutSite = cutSites.get(0);
assertEquals("Number of cut sites", cutSites.size(), 4); assertEquals("Number of cut sites", cutSites.size(), 4);
assertEquals("Enzyme name", firstCutSite.getEnzymeName(), "HindIII"); assertEquals("Enzyme name", firstCutSite.getEnzymeName(), "HindIII");
assertEquals("3prime", firstCutSite.getThreePrime(), 85); assertEquals("3prime", firstCutSite.getThreePrime(), 85);
assertEquals("5prime", firstCutSite.getFivePrime(), 81); assertEquals("5prime", firstCutSite.getFivePrime(), 81);
assertEquals("3prime-rev", firstCutSite.getThreePrimeRev(), 0); assertEquals("3prime-rev", firstCutSite.getThreePrimeRev(), 0);
assertEquals("5prime-rev", firstCutSite.getFivePrimeRev(), 0); assertEquals("5prime-rev", firstCutSite.getFivePrimeRev(), 0);
assertTrue("Cut site strand", firstCutSite.isForward()); assertTrue("Cut site strand", firstCutSite.isForward());
} }
} }
...@@ -30,32 +30,32 @@ import uk.ac.sanger.artemis.circular.digest.CutSite; ...@@ -30,32 +30,32 @@ import uk.ac.sanger.artemis.circular.digest.CutSite;
public class UtilsTest public class UtilsTest
{ {
/** /**
* Test that restrict output is parsed * Test that restrict output is parsed
*/ */
@Ignore("Use EmbossTableParserTest") @Ignore("Use EmbossTableParserTest")
@Test @Test
public void testFindCutSitesFromEmbossReport() public void testFindCutSitesFromEmbossReport()
{ {
final InputStream inputStream = final InputStream inputStream = UtilsTest.class
UtilsTest.class.getResourceAsStream("/data/foo.restrict"); .getResourceAsStream("/data/foo.restrict");
InputStreamReader reader = new InputStreamReader(inputStream); InputStreamReader reader = new InputStreamReader(inputStream);
ReportDetails report = Utils.findCutSitesFromEmbossReport(reader); ReportDetails report = Utils.findCutSitesFromEmbossReport(reader);
assertNotNull("ReportDetails null",report); assertNotNull("ReportDetails null", report);
assertEquals("Sequence length",report.length, 41243); assertEquals("Sequence length", report.length, 41243);
List<CutSite> cutSites = report.cutSites; List<CutSite> cutSites = report.cutSites;
CutSite firstCutSite = cutSites.get(0); CutSite firstCutSite = cutSites.get(0);
assertEquals("Number of cut sites", cutSites.size(), 4); assertEquals("Number of cut sites", cutSites.size(), 4);
assertEquals("Enzyme name", firstCutSite.getEnzymeName(), "HindIII"); assertEquals("Enzyme name", firstCutSite.getEnzymeName(), "HindIII");
assertEquals("3prime", firstCutSite.getThreePrime(), 85); assertEquals("3prime", firstCutSite.getThreePrime(), 85);
assertEquals("5prime", firstCutSite.getFivePrime(), 81); assertEquals("5prime", firstCutSite.getFivePrime(), 81);
assertEquals("3prime-rev", firstCutSite.getThreePrimeRev(), 0); assertEquals("3prime-rev", firstCutSite.getThreePrimeRev(), 0);
assertEquals("5prime-rev", firstCutSite.getFivePrimeRev(), 0); assertEquals("5prime-rev", firstCutSite.getFivePrimeRev(), 0);
assertTrue("Cut site strand", firstCutSite.isForward()); assertTrue("Cut site strand", firstCutSite.isForward());
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment