Update DIA unit test data tables

Author: leeskelvin

Diff for: tests/assocDiaSrc_test.ecsv

@@ -30,17 +30,17 @@ class DiaSourceTest(lsst.utils.tests.TestCase):
     and a plot is generated without falling over."""
 
     def setUp(self):
-        testFile = "tests/assocDiaSrc_test.ecsv"
+        testFile = "tests/data/assocDiaSrc_test.ecsv"
         self.data = Table.read(testFile)
 
     def test_metrics(self):
         """Test that metrics have the expected values from the test data."""
         NumDiaSources = diaAtool.NumGoodDiaSourcesMetrics()
         NumDiaSources.finalize()
         DiaSourceCount = NumDiaSources(self.data)
-        self.assertEqual(DiaSourceCount["numAllDiaSources"].quantity.value, 558)
-        self.assertEqual(DiaSourceCount["numGoodDiaSources"].quantity.value, 547)
-        self.assertEqual(DiaSourceCount["ratioGoodToAllDiaSources"].quantity.value, 547 / 558)
+        self.assertEqual(DiaSourceCount["numAllDiaSources"].quantity.value, 2994)
+        self.assertEqual(DiaSourceCount["numGoodDiaSources"].quantity.value, 2938)
+        self.assertEqual(DiaSourceCount["ratioGoodToAllDiaSources"].quantity.value, 2938 / 2994)
 
 
 if __name__ == "__main__":

Diff for: tests/data/assocDiaSrc_test.ecsv

@@ -31,25 +31,25 @@ class DiaSourceTableTractTest(lsst.utils.tests.TestCase):
     and a plot is generated without falling over."""
 
     def setUp(self):
-        testFile = "tests/diaSourceTable_tract_test.ecsv"
+        testFile = "tests/data/diaSourceTable_tract_test.ecsv"
         self.data = Table.read(testFile)
 
     def test_metrics(self):
         """Test that metrics have the expected values from the test data."""
         NumDiaSources = diaAtool.NumDiaSourcesMetric()
         NumDiaSources.finalize()
         goodDiaSourceCount = NumDiaSources(self.data)
-        self.assertEqual(goodDiaSourceCount["numDiaSources"].quantity.value, 344)
+        self.assertEqual(goodDiaSourceCount["numDiaSources"].quantity.value, 2938)
 
         NumStreakDiaSources = diaAtool.NumStreakDiaSourcesMetric()
         NumStreakDiaSources.finalize()
         streakDiaSourceCount = NumStreakDiaSources(self.data)
-        self.assertEqual(streakDiaSourceCount["numStreakDiaSources"].quantity.value, 3)
+        self.assertEqual(streakDiaSourceCount["numStreakDiaSources"].quantity.value, 8)
 
         NumStreakCenterDiaSources = diaAtool.NumStreakCenterDiaSourcesMetric()
         NumStreakCenterDiaSources.finalize()
         streakCenterDiaSourceCount = NumStreakCenterDiaSources(self.data)
-        self.assertEqual(streakCenterDiaSourceCount["numStreakCenterDiaSources"].quantity.value, 1)
+        self.assertEqual(streakCenterDiaSourceCount["numStreakCenterDiaSources"].quantity.value, 7)
 
     def test_plot(self):
         """Test that a plot is created from the test data."""