Fixed unit tests and build scripts

Author: sylvainhalle

Source/Core/srctest/ca/uqac/lif/spreadsheet/SpreadsheetTest.java

@@ -158,8 +158,8 @@ public void testRead2()
 				0, 1, true,
 				2, 3.5, null), out);
 		assertEquals(ComposedPart.compose(new PositionRange(new Position(0, 0), new Position(0, 0)), NthInput.FIRST), mapping.get(Cell.get(0, 0)));
-		assertEquals(ComposedPart.compose(new PositionRange(new Position(0, 7), new Position(0, 9)), NthInput.FIRST), mapping.get(Cell.get(2, 0)));
+		assertEquals(ComposedPart.compose(new PositionRange(new Position(0, 4), new Position(0, 6)), NthInput.FIRST), mapping.get(Cell.get(2, 0)));
 		assertEquals(ComposedPart.compose(new PositionRange(new Position(3, 2), new Position(3, 2)), NthInput.FIRST), mapping.get(Cell.get(0, 2)));
-		assertEquals(ComposedPart.compose(new PositionRange(new Position(3, 9), new Position(3, 12)), NthInput.FIRST), mapping.get(Cell.get(2, 2)));
+		assertEquals(ComposedPart.compose(new PositionRange(new Position(3, 8), new Position(3, 11)), NthInput.FIRST), mapping.get(Cell.get(2, 2)));
 	}
 }

Source/Core/srctest/ca/uqac/lif/spreadsheet/functions/ApplyFormulaTest.java

@@ -98,7 +98,7 @@ public void test1()
 			assertEquals(1, nn.getOutputLinks(0).size());
 			PartNode child_1 = (PartNode) nn.getOutputLinks(0).get(0).getNode();
 			Part child_part = child_1.getPart();
-			assertEquals(ComposedPart.compose(Cell.get(0, 0), NthOutput.FIRST), child_part);
+			assertEquals(ComposedPart.compose(Cell.get(0, 0), NthInput.FIRST), child_part);
 		}
 	}
 
@@ -140,7 +140,7 @@ public void test2()
 			assertEquals(1, nn.getOutputLinks(0).size());
 			PartNode child_1 = (PartNode) nn.getOutputLinks(0).get(0).getNode();			
 			Part child_part1 = child_1.getPart();
-			assertEquals(ComposedPart.compose(Cell.get(0, 0), NthOutput.FIRST), child_part1);
+			assertEquals(ComposedPart.compose(Cell.get(0, 0), NthInput.FIRST), child_part1);
 		}
 	}
 
@@ -179,10 +179,10 @@ public void test3()
 			PartNode child_1 = (PartNode) nn.getOutputLinks(0).get(0).getNode();
 			assertEquals(1, nn.getOutputLinks(1).size());
 			Part child_part1 = child_1.getPart();
-			assertEquals(ComposedPart.compose(Cell.get(0, 0), NthOutput.FIRST), child_part1);
+			assertEquals(ComposedPart.compose(Cell.get(0, 0), NthInput.FIRST), child_part1);
 			PartNode child_2 = (PartNode) nn.getOutputLinks(1).get(0).getNode();
 			Part child_part2 = child_2.getPart();
-			assertEquals(ComposedPart.compose(Cell.get(1, 0), NthOutput.FIRST), child_part2);
+			assertEquals(ComposedPart.compose(Cell.get(1, 0), NthInput.FIRST), child_part2);
 		}
 	}
 
@@ -223,7 +223,7 @@ public void test4()
 			PartNode child_1 = (PartNode) nn.getOutputLinks(0).get(0).getNode();
 			assertEquals(1, nn.getOutputLinks(1).size());
 			Part child_part1 = child_1.getPart();
-			assertEquals(ComposedPart.compose(Cell.get(0, 0), NthOutput.FIRST), child_part1);
+			assertEquals(ComposedPart.compose(Cell.get(0, 0), NthInput.FIRST), child_part1);
 			PartNode child_2 = (PartNode) nn.getOutputLinks(1).get(0).getNode();
 			Part child_part2 = child_2.getPart();
 			assertEquals(ComposedPart.compose(Cell.get(0, 0), NthInput.SECOND), child_part2);
@@ -253,7 +253,7 @@ public void test5()
 			assertEquals(1, nn.getOutputLinks(0).size());
 			PartNode child_1 = (PartNode) nn.getOutputLinks(0).get(0).getNode();
 			Part child_part1 = child_1.getPart();
-			assertEquals(ComposedPart.compose(Cell.get(1, 0), NthOutput.FIRST), child_part1);
+			assertEquals(ComposedPart.compose(Cell.get(1, 0), NthInput.FIRST), child_part1);
 		}
 		{
 			// 0:1 is explained by the value of 0:0, which in turn is explained
@@ -274,7 +274,7 @@ public void test5()
 			assertEquals(1, nn2.getOutputLinks(0).size());
 			PartNode child_3 = (PartNode) nn2.getOutputLinks(0).get(0).getNode();
 			Part child_part3 = child_3.getPart();
-			assertEquals(ComposedPart.compose(Cell.get(1, 0), NthOutput.FIRST), child_part3);
+			assertEquals(ComposedPart.compose(Cell.get(1, 0), NthInput.FIRST), child_part3);
 		}
 	}
 }

Source/Examples/config.xml

@@ -91,4 +91,4 @@
       <bundle>false</bundle>
     </dependency>
   </dependencies>
-</build>
+</build>