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 8AD9411CBC for ; Tue, 26 Aug 2014 21:20:00 +0000 (UTC) Received: (qmail 94915 invoked by uid 500); 26 Aug 2014 21:20:00 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 94883 invoked by uid 500); 26 Aug 2014 21:20:00 -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 94871 invoked by uid 99); 26 Aug 2014 21:20:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Aug 2014 21:20:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F20019CEFCC; Tue, 26 Aug 2014 21:19:59 +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: Tue, 26 Aug 2014 21:19:59 -0000 Message-Id: <55debc54a5094713affe441a8507d66e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: CLIMATE-355 - Remove outdated evaluation run test Repository: climate Updated Branches: refs/heads/master ab51ff651 -> fb37845c2 CLIMATE-355 - Remove outdated evaluation run test Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/38f7ba8d Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/38f7ba8d Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/38f7ba8d Branch: refs/heads/master Commit: 38f7ba8dc3a18b08c95152ab2f6a2b44ddb7f623 Parents: ab51ff6 Author: Michael Joyce Authored: Tue Aug 26 12:30:00 2014 -0700 Committer: Michael Joyce Committed: Tue Aug 26 12:30:00 2014 -0700 ---------------------------------------------------------------------- .../test/spec/controllers/parameterselect.js | 102 ------------------- 1 file changed, 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/38f7ba8d/ocw-ui/frontend-new/test/spec/controllers/parameterselect.js ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend-new/test/spec/controllers/parameterselect.js b/ocw-ui/frontend-new/test/spec/controllers/parameterselect.js index e67b8df..aa4cbd8 100644 --- a/ocw-ui/frontend-new/test/spec/controllers/parameterselect.js +++ b/ocw-ui/frontend-new/test/spec/controllers/parameterselect.js @@ -133,106 +133,4 @@ describe('Controller: ParameterSelectCtrl', function () { expect(scope.displayParams.end).toBe('2030-01-01 00:00:00'); }); */ - - /* - * TODO: The backend call for this expects completely different data formats. - * Additionally, there are many more URLs to mock now. Something has definitely - * changed with how httpBackend functions or the way the code base is setup. - */ - /* - it('should properly set the results of running an evaluation', function() { - inject(function($rootScope, $controller, $httpBackend) { - var scope = $rootScope.$new(); - var ctrl = $controller("ParameterSelectCtrl", {$scope: scope}); - - // Seed rootScope with a known URL for test queries and holder for eval results - $rootScope.baseURL = "http://localhost:9876"; - $rootScope.evalResults = {}; - - // Seed the displayParams so the query is properly formatted - scope.displayParams.lonMin = -180; - scope.displayParams.lonMax = 180; - scope.displayParams.latMin = -90; - scope.displayParams.latMax = 90; - scope.displayParams.start = "1980-01-01"; - scope.displayParams.end = "2030-01-01"; - - // The expected URL string that the frontend generates given this example set - var urlString = "http://localhost:9876/rcmes/run/?" + - "callback=JSON_CALLBACK&" + - "endTime=2030-01-01%2000%3A00%3A00&" + - "filelist=%2Fusr%2Flocal%2Frcmes%2FmodelsForUI%2Fprec.HRM3.ncep.monavg.nc&" + - "latMax=90&" + - "latMin=-90&" + - "lonMax=180&" + - "lonMin=-180&" + - "metricOption=bias&" + - "modelLatVarName=lat&" + - "modelLonVarName=lon&" + - "modelTimeVarName=time&" + - "modelVarName=prec&" + - "obsDatasetId=3&" + - "obsParameterId=36&" + - "regridOption=model&" + - "startTime=1980-01-01%2000%3A00%3A00&" + - "timeRegridOption=monthly"; - - // Example dataset configuration for the test. - scope.datasets = [ - { - "isObs" : 1, - "id" : "3", - "name" : "Tropical Rainfall Measuring Mission Dataset", - "param" : "36", - "paramName" : "TRMM v.6 Monthly Precipitation", - "latlonVals" : {"latMin" : -90, "latMax" : 90, "lonMin" : -180, "lonMax" : 180}, - "lat" : "N/A", - "lon" : "N/A", - "timeVals" : {"start" : "1998-01-01 00:00:00", - "end" : "2010-01-01 00:00:00"}, - "time" : "N/A", - "shouldDisplay" : true, - "regrid" : false - },{ - "isObs" : 0, - "id" : "/usr/local/rcmes/modelsForUI/prec.HRM3.ncep.monavg.nc", - "name" : "prec.HRM3.ncep.monavg.nc", - "param" : "prec", - "paramName" : "prec", - "lat" : "lat", - "lon" : "lon", - "latlonVals" : {"latMin" : "15.25", - "latMax" : "75.25", - "lonMin" : "-159.75", - "lonMax" : "-29.75"}, - "time" : "time", - "timeVals" : {"start":"1980-01-01 00:00:00", - "end" : "2004-12-01 00:00:00"}, - "shouldDisplay" : true, - "regrid" : false - } - ]; - - $httpBackend.expectGET('http://localhost:8082/processing/metrics/').respond( - 200, {'data': {'metrics': ['foo', 'bar']}} - ) - $httpBackend.expectPOST('http://localhost:9876/processing/run_evaluation/').respond(200) - $httpBackend.expectGET('views/main.html').respond(200) - $httpBackend.expectJSONP(urlString).respond(200, - {'comparisonPath': '/fake/path1', - 'modelPath': '/fake/path2', - 'obsPath': '/fake/path3'}); - - console.log('here') - scope.runEvaluation(); - console.log('here1') - $httpBackend.flush(); - console.log('here2') - - expect($rootScope.evalResults.comparisonPath).toBe('path1'); - expect($rootScope.evalResults.modelPath).toBe('path2'); - expect($rootScope.evalResults.obsPath).toBe('path3'); - }); - }); - */ });