def _test_merge(self, aggregated_data, incremental_data, expected_data, max_builds=jsonresults.JSON_RESULTS_MAX_BUILDS):
aggregated_results = self._make_test_json(aggregated_data)
incremental_results = self._make_test_json(incremental_data)
merged_results = JsonResults.merge(self._builder, aggregated_results, incremental_results, max_builds, sort_keys=True)
if expected_data:
expected_results = self._make_test_json(expected_data)
self.assertEqual(merged_results, expected_results)
else:
self.assertFalse(merged_results)
def _test_merge(self, aggregated_data, incremental_data, expected_data, max_builds=jsonresults.JSON_RESULTS_MAX_BUILDS):
aggregated_results = self._make_test_json(aggregated_data)
incremental_results = self._make_test_json(incremental_data)
merged_results = JsonResults.merge(self._builder, aggregated_results, incremental_results, max_builds, sort_keys=True)
if expected_data:
expected_results = self._make_test_json(expected_data)
self.assertEquals(merged_results, expected_results)
else:
self.assertFalse(merged_results)
def _test_merge(self, aggregated_data, incremental_data, expected_data):
aggregated_results = self._make_test_json(aggregated_data)
incremental_results = self._make_test_json(incremental_data)
merged_results = JsonResults.merge(self._builder,
aggregated_results,
incremental_results,
sort_keys=True)
if expected_data:
expected_results = self._make_test_json(expected_data)
self.assertEquals(merged_results, expected_results)
else:
self.assertFalse(merged_results)
