Commit 1b04a521 authored by Aashna Sheth's avatar Aashna Sheth
Browse files

Reworded test names

parent b84bfed2
......@@ -18,7 +18,7 @@ public class GetPopulationTask extends RecursiveTask<Integer> {
double w, s, e, n;
MapCorners grid;
public GetPopulationTask(CensusGroup[] censusGroups, int lo, int hi, double w, double s, double e, double n, , MapCorners grid) {
public GetPopulationTask(CensusGroup[] censusGroups, int lo, int hi, double w, double s, double e, double n, MapCorners grid) {
throw new NotYetImplementedException();
}
......
......@@ -25,28 +25,28 @@ public class SimpleParallelTests extends QueryResponderTests {
*/
@Test
public void testFullMap_100_500() {
public void test_getPopulation_full100x500Map_correctPopulation() {
assertEquals(312471327, STUDENT_100_500.getPopulation(1, 1, 100, 500));
}
@Test
public void testLeftHalf_100_500() {
public void test_getPopulation_leftHalf100x500Map_correctPopulation() {
assertEquals(27820072, STUDENT_100_500.getPopulation(1, 1, 50, 500));
}
@Test
public void testRightHalf_100_500() {
public void test_getPopulation_rightHalf100x500Map_correctPopulation() {
assertEquals(284651255, STUDENT_100_500.getPopulation(51, 1, 100, 500));
}
@Test
public void testCenter_100_500() {
public void test_getPopulation_center100x500Map_correctPopulations() {
assertEquals(7084297, STUDENT_100_500.getPopulation(20, 200, 60, 300));
assertEquals(179539805, STUDENT_100_500.getPopulation(50, 100, 90, 250));
}
@Test
public void testCorners_100_500() {
public void test_getPopulation_corners100x500Map_correctPopulations() {
assertEquals(0, STUDENT_100_500.getPopulation(1, 1, 1, 1));
assertEquals(207111, STUDENT_100_500.getPopulation(100, 1, 100, 1));
assertEquals(0, STUDENT_100_500.getPopulation(1, 500, 1, 500));
......@@ -54,17 +54,17 @@ public class SimpleParallelTests extends QueryResponderTests {
}
@Test
public void testHawaii_100_500() {
public void test_getPopulation_hawaii100x500Map_correctPopulation() {
assertEquals(1360301, STUDENT_100_500.getPopulation(10, 1, 20, 40));
}
@Test
public void testCanada_100_500() {
public void test_getPopulation_canada100x500Map_correctPopulation() {
assertEquals(0, STUDENT_100_500.getPopulation(50, 250, 100, 450));
}
@Test
public void testTotalPopulation_100_500() {
public void test_totalPopulation_full100x500Map_correctPopulation() {
assertEquals(312471327, STUDENT_100_500.getTotalPopulation());
}
......@@ -73,22 +73,22 @@ public class SimpleParallelTests extends QueryResponderTests {
*/
@Test
public void testLeftHalf_20_40() {
public void test_getPopulation_leftHalf20x40Map_correctPopulation() {
assertEquals(27820072, STUDENT_20_40.getPopulation(1, 1, 10, 40));
}
@Test
public void testRightHalf_20_40() {
public void test_getPopulation_rightHalf20x40Map_correctPopulation() {
assertEquals(284651255, STUDENT_20_40.getPopulation(11, 1, 20, 40));
}
@Test
public void testCenter_20_40() {
public void test_getPopulation_center20x40Map_correctPopulation() {
assertEquals(62861861, STUDENT_20_40.getPopulation(5, 10, 15, 30));
}
@Test
public void testCorners_20_40() {
public void test_getPopulation_corners20x40Map_correctPopulations() {
assertEquals(0, STUDENT_20_40.getPopulation(1, 1, 1, 1));
assertEquals(3725789, STUDENT_20_40.getPopulation(20, 1, 20, 1));
assertEquals(0, STUDENT_20_40.getPopulation(1, 40, 1, 40));
......@@ -96,17 +96,17 @@ public class SimpleParallelTests extends QueryResponderTests {
}
@Test
public void testHawaii_20_40() {
public void test_getPopulation_hawaii20x40Map_correctPopulation() {
assertEquals(1360301, STUDENT_20_40.getPopulation(2, 1, 4, 3));
}
@Test
public void testCanada_20_40() {
public void test_getPopulation_canada20x40Map_correctPopulation() {
assertEquals(0, STUDENT_20_40.getPopulation(10, 20, 20, 35));
}
@Test
public void testTotalPopulation_20_40() {
public void test_totalPopulation_full20x40Map_correctPopulation() {
assertEquals(312471327, STUDENT_20_40.getTotalPopulation());
}
}
\ No newline at end of file
......@@ -25,28 +25,28 @@ public class SimpleSequentialTests extends QueryResponderTests {
*/
@Test
public void testFullMap_100_500() {
public void test_getPopulation_full100x500Map_correctPopulation() {
assertEquals(312471327, STUDENT_100_500.getPopulation(1, 1, 100, 500));
}
@Test
public void testLeftHalf_100_500() {
public void test_getPopulation_leftHalf100x500Map_correctPopulation() {
assertEquals(27820072, STUDENT_100_500.getPopulation(1, 1, 50, 500));
}
@Test
public void testRightHalf_100_500() {
public void test_getPopulation_rightHalf100x500Map_correctPopulation() {
assertEquals(284651255, STUDENT_100_500.getPopulation(51, 1, 100, 500));
}
@Test
public void testCenter_100_500() {
public void test_getPopulation_center100x500Map_correctPopulations() {
assertEquals(7084297, STUDENT_100_500.getPopulation(20, 200, 60, 300));
assertEquals(179539805, STUDENT_100_500.getPopulation(50, 100, 90, 250));
}
@Test
public void testCorners_100_500() {
public void test_getPopulation_corners100x500Map_correctPopulations() {
assertEquals(0, STUDENT_100_500.getPopulation(1, 1, 1, 1));
assertEquals(207111, STUDENT_100_500.getPopulation(100, 1, 100, 1));
assertEquals(0, STUDENT_100_500.getPopulation(1, 500, 1, 500));
......@@ -54,17 +54,17 @@ public class SimpleSequentialTests extends QueryResponderTests {
}
@Test
public void testHawaii_100_500() {
public void test_getPopulation_hawaii100x500Map_correctPopulation() {
assertEquals(1360301, STUDENT_100_500.getPopulation(10, 1, 20, 40));
}
@Test
public void testCanada_100_500() {
public void test_getPopulation_canada100x500Map_correctPopulation() {
assertEquals(0, STUDENT_100_500.getPopulation(50, 250, 100, 450));
}
@Test
public void testTotalPopulation_100_500() {
public void test_totalPopulation_full100x500Map_correctPopulation() {
assertEquals(312471327, STUDENT_100_500.getTotalPopulation());
}
......@@ -73,22 +73,22 @@ public class SimpleSequentialTests extends QueryResponderTests {
*/
@Test
public void testLeftHalf_20_40() {
public void test_getPopulation_leftHalf20x40Map_correctPopulation() {
assertEquals(27820072, STUDENT_20_40.getPopulation(1, 1, 10, 40));
}
@Test
public void testRightHalf_20_40() {
public void test_getPopulation_rightHalf20x40Map_correctPopulation() {
assertEquals(284651255, STUDENT_20_40.getPopulation(11, 1, 20, 40));
}
@Test
public void testCenter_20_40() {
public void test_getPopulation_center20x40Map_correctPopulation() {
assertEquals(62861861, STUDENT_20_40.getPopulation(5, 10, 15, 30));
}
@Test
public void testCorners_20_40() {
public void test_getPopulation_corners20x40Map_correctPopulations() {
assertEquals(0, STUDENT_20_40.getPopulation(1, 1, 1, 1));
assertEquals(3725789, STUDENT_20_40.getPopulation(20, 1, 20, 1));
assertEquals(0, STUDENT_20_40.getPopulation(1, 40, 1, 40));
......@@ -96,17 +96,17 @@ public class SimpleSequentialTests extends QueryResponderTests {
}
@Test
public void testHawaii_20_40() {
public void test_getPopulation_hawaii20x40Map_correctPopulation() {
assertEquals(1360301, STUDENT_20_40.getPopulation(2, 1, 4, 3));
}
@Test
public void testCanada_20_40() {
public void test_getPopulation_canada20x40Map_correctPopulation() {
assertEquals(0, STUDENT_20_40.getPopulation(10, 20, 20, 35));
}
@Test
public void testTotalPopulation_20_40() {
public void test_totalPopulation_full20x40Map_correctPopulation() {
assertEquals(312471327, STUDENT_20_40.getTotalPopulation());
}
}
\ No newline at end of file
......@@ -24,28 +24,28 @@ public class ComplexParallelTests extends QueryResponderTests {
*/
@Test
public void testFullMap_100_500() {
public void test_getPopulation_full100x500Map_correctPopulation() {
assertEquals(312471327, STUDENT_100_500.getPopulation(1, 1, 100, 500));
}
@Test
public void testLeftHalf_100_500() {
public void test_getPopulation_leftHalf100x500Map_correctPopulation() {
assertEquals(27820072, STUDENT_100_500.getPopulation(1, 1, 50, 500));
}
@Test
public void testRightHalf_100_500() {
public void test_getPopulation_rightHalf100x500Map_correctPopulation() {
assertEquals(284651255, STUDENT_100_500.getPopulation(51, 1, 100, 500));
}
@Test
public void testCenter_100_500() {
public void test_getPopulation_center100x500Map_correctPopulations() {
assertEquals(7084297, STUDENT_100_500.getPopulation(20, 200, 60, 300));
assertEquals(179539805, STUDENT_100_500.getPopulation(50, 100, 90, 250));
}
@Test
public void testCorners_100_500() {
public void test_getPopulation_corners100x500Map_correctPopulations() {
assertEquals(0, STUDENT_100_500.getPopulation(1, 1, 1, 1));
assertEquals(207111, STUDENT_100_500.getPopulation(100, 1, 100, 1));
assertEquals(0, STUDENT_100_500.getPopulation(1, 500, 1, 500));
......@@ -53,18 +53,18 @@ public class ComplexParallelTests extends QueryResponderTests {
}
@Test
public void testHawaii_100_500() {
public void test_getPopulation_hawaii100x500Map_correctPopulation() {
assertEquals(1360301, STUDENT_100_500.getPopulation(10, 1, 20, 40));
}
@Test
public void testCanada_100_500() {
public void test_getPopulation_canada100x500Map_correctPopulation() {
assertEquals(0, STUDENT_100_500.getPopulation(50, 250, 100, 450));
}
@Test
public void testTotalPopulation_100_500() {
public void test_totalPopulation_full100x500Map_correctPopulation() {
assertEquals(312471327, STUDENT_100_500.getTotalPopulation());
}
......@@ -73,22 +73,22 @@ public class ComplexParallelTests extends QueryResponderTests {
*/
@Test
public void testLeftHalf_20_40() {
public void test_getPopulation_leftHalf20x40Map_correctPopulation() {
assertEquals(27820072, STUDENT_20_40.getPopulation(1, 1, 10, 40));
}
@Test
public void testRightHalf_20_40() {
public void test_getPopulation_rightHalf20x40Map_correctPopulation() {
assertEquals(284651255, STUDENT_20_40.getPopulation(11, 1, 20, 40));
}
@Test
public void testCenter_20_40() {
public void test_getPopulation_center20x40Map_correctPopulation() {
assertEquals(62861861, STUDENT_20_40.getPopulation(5, 10, 15, 30));
}
@Test
public void testCorners_20_40() {
public void test_getPopulation_corners20x40Map_correctPopulations() {
assertEquals(0, STUDENT_20_40.getPopulation(1, 1, 1, 1));
assertEquals(3725789, STUDENT_20_40.getPopulation(20, 1, 20, 1));
assertEquals(0, STUDENT_20_40.getPopulation(1, 40, 1, 40));
......@@ -96,17 +96,17 @@ public class ComplexParallelTests extends QueryResponderTests {
}
@Test
public void testHawaii_20_40() {
public void test_getPopulation_hawaii20x40Map_correctPopulation() {
assertEquals(1360301, STUDENT_20_40.getPopulation(2, 1, 4, 3));
}
@Test
public void testCanada_20_40() {
public void test_getPopulation_canada20x40Map_correctPopulation() {
assertEquals(0, STUDENT_20_40.getPopulation(10, 20, 20, 35));
}
@Test
public void testTotalPopulation_20_40() {
public void test_totalPopulation_full20x40Map_correctPopulation() {
assertEquals(312471327, STUDENT_20_40.getTotalPopulation());
}
}
\ No newline at end of file
......@@ -24,28 +24,28 @@ public class ComplexSequentialTests extends QueryResponderTests {
*/
@Test
public void testFullMap_100_500() {
public void test_getPopulation_full100x500Map_correctPopulation() {
assertEquals(312471327, STUDENT_100_500.getPopulation(1, 1, 100, 500));
}
@Test
public void testLeftHalf_100_500() {
public void test_getPopulation_leftHalf100x500Map_correctPopulation() {
assertEquals(27820072, STUDENT_100_500.getPopulation(1, 1, 50, 500));
}
@Test
public void testRightHalf_100_500() {
public void test_getPopulation_rightHalf100x500Map_correctPopulation() {
assertEquals(284651255, STUDENT_100_500.getPopulation(51, 1, 100, 500));
}
@Test
public void testCenter_100_500() {
public void test_getPopulation_center100x500Map_correctPopulations() {
assertEquals(7084297, STUDENT_100_500.getPopulation(20, 200, 60, 300));
assertEquals(179539805, STUDENT_100_500.getPopulation(50, 100, 90, 250));
}
@Test
public void testCorners_100_500() {
public void test_getPopulation_corners100x500Map_correctPopulations() {
assertEquals(0, STUDENT_100_500.getPopulation(1, 1, 1, 1));
assertEquals(207111, STUDENT_100_500.getPopulation(100, 1, 100, 1));
assertEquals(0, STUDENT_100_500.getPopulation(1, 500, 1, 500));
......@@ -53,18 +53,18 @@ public class ComplexSequentialTests extends QueryResponderTests {
}
@Test
public void testHawaii_100_500() {
public void test_getPopulation_hawaii100x500Map_correctPopulation() {
assertEquals(1360301, STUDENT_100_500.getPopulation(10, 1, 20, 40));
}
@Test
public void testCanada_100_500() {
public void test_getPopulation_canada100x500Map_correctPopulation() {
assertEquals(0, STUDENT_100_500.getPopulation(50, 250, 100, 450));
}
@Test
public void testTotalPopulation_100_500() {
public void test_totalPopulation_full100x500Map_correctPopulation() {
assertEquals(312471327, STUDENT_100_500.getTotalPopulation());
}
......@@ -73,22 +73,22 @@ public class ComplexSequentialTests extends QueryResponderTests {
*/
@Test
public void testLeftHalf_20_40() {
public void test_getPopulation_leftHalf20x40Map_correctPopulation() {
assertEquals(27820072, STUDENT_20_40.getPopulation(1, 1, 10, 40));
}
@Test
public void testRightHalf_20_40() {
public void test_getPopulation_rightHalf20x40Map_correctPopulation() {
assertEquals(284651255, STUDENT_20_40.getPopulation(11, 1, 20, 40));
}
@Test
public void testCenter_20_40() {
public void test_getPopulation_center20x40Map_correctPopulation() {
assertEquals(62861861, STUDENT_20_40.getPopulation(5, 10, 15, 30));
}
@Test
public void testCorners_20_40() {
public void test_getPopulation_corners20x40Map_correctPopulations() {
assertEquals(0, STUDENT_20_40.getPopulation(1, 1, 1, 1));
assertEquals(3725789, STUDENT_20_40.getPopulation(20, 1, 20, 1));
assertEquals(0, STUDENT_20_40.getPopulation(1, 40, 1, 40));
......@@ -96,17 +96,17 @@ public class ComplexSequentialTests extends QueryResponderTests {
}
@Test
public void testHawaii_20_40() {
public void test_getPopulation_hawaii20x40Map_correctPopulation() {
assertEquals(1360301, STUDENT_20_40.getPopulation(2, 1, 4, 3));
}
@Test
public void testCanada_20_40() {
public void test_getPopulation_canada20x40Map_correctPopulation() {
assertEquals(0, STUDENT_20_40.getPopulation(10, 20, 20, 35));
}
@Test
public void testTotalPopulation_20_40() {
public void test_totalPopulation_full20x40Map_correctPopulation() {
assertEquals(312471327, STUDENT_20_40.getTotalPopulation());
}
}
\ No newline at end of file
......@@ -25,28 +25,28 @@ public class ComplexLockBasedTests extends QueryResponderTests {
*/
@Test
public void testFullMap_100_500() {
public void test_getPopulation_full100x500Map_correctPopulation() {
assertEquals(312471327, STUDENT_100_500.getPopulation(1, 1, 100, 500));
}
@Test
public void testLeftHalf_100_500() {
public void test_getPopulation_leftHalf100x500Map_correctPopulation() {
assertEquals(27820072, STUDENT_100_500.getPopulation(1, 1, 50, 500));
}
@Test
public void testRightHalf_100_500() {
public void test_getPopulation_rightHalf100x500Map_correctPopulation() {
assertEquals(284651255, STUDENT_100_500.getPopulation(51, 1, 100, 500));
}
@Test
public void testCenter_100_500() {
public void test_getPopulation_center100x500Map_correctPopulations() {
assertEquals(7084297, STUDENT_100_500.getPopulation(20, 200, 60, 300));
assertEquals(179539805, STUDENT_100_500.getPopulation(50, 100, 90, 250));
}
@Test
public void testCorners_100_500() {
public void test_getPopulation_corners100x500Map_correctPopulations() {
assertEquals(0, STUDENT_100_500.getPopulation(1, 1, 1, 1));
assertEquals(207111, STUDENT_100_500.getPopulation(100, 1, 100, 1));
assertEquals(0, STUDENT_100_500.getPopulation(1, 500, 1, 500));
......@@ -54,18 +54,18 @@ public class ComplexLockBasedTests extends QueryResponderTests {
}
@Test
public void testHawaii_100_500() {
public void test_getPopulation_hawaii100x500Map_correctPopulation() {
assertEquals(1360301, STUDENT_100_500.getPopulation(10, 1, 20, 40));
}
@Test
public void testCanada_100_500() {
public void test_getPopulation_canada100x500Map_correctPopulation() {
assertEquals(0, STUDENT_100_500.getPopulation(50, 250, 100, 450));
}
@Test
public void testTotalPopulation_100_500() {
public void test_totalPopulation_full100x500Map_correctPopulation() {
assertEquals(312471327, STUDENT_100_500.getTotalPopulation());
}
......@@ -74,22 +74,22 @@ public class ComplexLockBasedTests extends QueryResponderTests {
*/
@Test
public void testLeftHalf_20_40() {
public void test_getPopulation_leftHalf20x40Map_correctPopulation() {
assertEquals(27820072, STUDENT_20_40.getPopulation(1, 1, 10, 40));
}
@Test
public void testRightHalf_20_40() {
public void test_getPopulation_rightHalf20x40Map_correctPopulation() {
assertEquals(284651255, STUDENT_20_40.getPopulation(11, 1, 20, 40));
}
@Test
public void testCenter_20_40() {
public void test_getPopulation_center20x40Map_correctPopulation() {
assertEquals(62861861, STUDENT_20_40.getPopulation(5, 10, 15, 30));
}
@Test
public void testCorners_20_40() {
public void test_getPopulation_corners20x40Map_correctPopulations() {
assertEquals(0, STUDENT_20_40.getPopulation(1, 1, 1, 1));
assertEquals(3725789, STUDENT_20_40.getPopulation(20, 1, 20, 1));
assertEquals(0, STUDENT_20_40.getPopulation(1, 40, 1, 40));
......@@ -97,17 +97,17 @@ public class ComplexLockBasedTests extends QueryResponderTests {
}
@Test
public void testHawaii_20_40() {
public void test_getPopulation_hawaii20x40Map_correctPopulation() {
assertEquals(1360301, STUDENT_20_40.getPopulation(2, 1, 4, 3));
}
@Test
public void testCanada_20_40() {
public void test_getPopulation_canada20x40Map_correctPopulation() {
assertEquals(0, STUDENT_20_40.getPopulation(10, 20, 20, 35));
}
@Test
public void testTotalPopulation_20_40() {
public void test_totalPopulation_full20x40Map_correctPopulation() {
assertEquals(312471327, STUDENT_20_40.getTotalPopulation());
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment