final tests using getLength() and others

luke czapla · luke czapla · commit 7f27f94442d2 · 2017-07-26T01:29:08.000-04:00
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/basepairs/BasePairParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/basepairs/BasePairParameters.java
@@ -202,7 +202,7 @@ public BasePairParameters analyze() {
      * Returns the total number of base pairs that were found, after the call to analyze()
      * @return An integer value, number of base pairs
      */
-    public Integer getLength() {
+    public int getLength() {
         if (structure == null || pairParameters == null) throw new IllegalArgumentException();
         return pairingParameters.length;
     }
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/basepairs/TestBasePairParameters.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/basepairs/TestBasePairParameters.java
@@ -27,7 +27,7 @@ public void testBasePair() throws IOException, StructureException {
         bp.analyze();
         String sequence = bp.getPairSequence();
 
-        assertEquals(bp.getPairingParameters().length, 147);
+        assertEquals(147, bp.getLength());
         // below all this set of comparator data was from an external program, 3DNA.
         // next three in degrees: buckle, propeller, opening
         assertEquals(bp.getBuckle(0), -3.796, 0.1);
@@ -49,7 +49,7 @@ public void testBasePair() throws IOException, StructureException {
 
         structure = StructureIO.getStructure("3PHP");
         bp = new TertiaryBasePairParameters(structure, true, false).analyze();
-        assertEquals(9, bp.getPairingParameters().length);
+        assertEquals(9, bp.getLength());
 
         double[][] pairs = bp.getPairingParameters();
         double[][] steps = bp.getStepParameters();
@@ -75,7 +75,7 @@ public void testBasePair() throws IOException, StructureException {
         structure = StructureIO.getStructure("1P71");
 
         bp = new MismatchedBasePairParameters(structure, false, false, false).analyze();
-        assertEquals(17, bp.getPairingParameters().length);
+        assertEquals(17, bp.getLength());
 
         pairs = bp.getPairingParameters();
         steps = bp.getStepParameters();

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public BasePairParameters analyze() {`
`202`	`202`	`* Returns the total number of base pairs that were found, after the call to analyze()`
`203`	`203`	`* @return An integer value, number of base pairs`
`204`	`204`	`*/`
`205`		`- public Integer getLength() {`
	`205`	`+ public int getLength() {`
`206`	`206`	`if (structure == null \|\| pairParameters == null) throw new IllegalArgumentException();`
`207`	`207`	`return pairingParameters.length;`
`208`	`208`	`}`