Return-Path: X-Original-To: apmail-climate-commits-archive@minotaur.apache.org Delivered-To: apmail-climate-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 19B9217DCE for ; Thu, 5 Mar 2015 17:15:57 +0000 (UTC) Received: (qmail 26724 invoked by uid 500); 5 Mar 2015 17:15:57 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 26651 invoked by uid 500); 5 Mar 2015 17:15:57 -0000 Mailing-List: contact commits-help@climate.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@climate.apache.org Delivered-To: mailing list commits@climate.apache.org Received: (qmail 26525 invoked by uid 99); 5 Mar 2015 17:15:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2015 17:15:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7B88E0A3F; Thu, 5 Mar 2015 17:15:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: joyce@apache.org To: commits@climate.apache.org Date: Thu, 05 Mar 2015 17:15:58 -0000 Message-Id: In-Reply-To: <8dbb753dbbd84d2e89030dfa9435dd50@git.apache.org> References: <8dbb753dbbd84d2e89030dfa9435dd50@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/9] climate git commit: CLIMATE-594 - Add tests for Dataset attribute changes CLIMATE-594 - Add tests for Dataset attribute changes - Add attribute test for Dataset 'name' since this was missing. - Add test for new Dataset 'origin' attribute. Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/b02d74c6 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/b02d74c6 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/b02d74c6 Branch: refs/heads/master Commit: b02d74c6a07e6225502ee1acc80d5dd1dad9d431 Parents: d4f2b50 Author: Michael Joyce Authored: Fri Feb 27 10:46:27 2015 -0800 Committer: Michael Joyce Committed: Fri Feb 27 10:46:27 2015 -0800 ---------------------------------------------------------------------- ocw/tests/test_dataset.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/b02d74c6/ocw/tests/test_dataset.py ---------------------------------------------------------------------- diff --git a/ocw/tests/test_dataset.py b/ocw/tests/test_dataset.py index 94d7740..3edbe83 100644 --- a/ocw/tests/test_dataset.py +++ b/ocw/tests/test_dataset.py @@ -30,8 +30,11 @@ class TestDatasetAttributes(unittest.TestCase): flat_array = np.array(range(300)) self.value = flat_array.reshape(12, 5, 5) self.variable = 'prec' + self.name = 'foo' + self.origin = {'path': '/a/fake/file/path'} self.test_dataset = Dataset(self.lat, self.lon, self.time, - self.value, self.variable) + self.value, self.variable, + self.name, self.origin) def test_lats(self): self.assertItemsEqual(self.test_dataset.lats, self.lat) @@ -48,6 +51,12 @@ class TestDatasetAttributes(unittest.TestCase): def test_variable(self): self.assertEqual(self.test_dataset.variable, self.variable) + def test_name(self): + self.assertEqual(self.test_dataset.name, self.name) + + def test_origin(self): + self.assertEqual(self.test_dataset.origin, self.origin) + class TestInvalidDatasetInit(unittest.TestCase): def setUp(self): self.lat = np.array([10, 12, 14, 16, 18])