Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

make zeppelin-web test pass

Browse source
This commit is contained in:
Lee moon soo 2016-11-20 15:41:52 -08:00
parent 1d6fd3ec65
commit 3e43df4b22
6 changed files with 19 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java
View file

@ -162,7 +162,7 @@ public class AngularObjectRegistry {
Map<String, AngularObject> r = getRegistryForKey(noteId, paragraphId);
AngularObject o = r.remove(name);
if (listener != null && emit) {
listener.onRemove(interpreterId, name, noteId, paragraphId);;
listener.onRemove(interpreterId, name, noteId, paragraphId);
}
return o;
}

2
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java
View file

@ -210,7 +210,7 @@ public class RemoteInterpreterEventPoller extends Thread {
String settingId = id.substring(0, indexOfColon);
listener.onMetaInfosReceived(settingId, metaInfos);
}
logger.debug("Event from remoteproceess {}", event.getType());
logger.debug("Event from remote process {}", event.getType());
} catch (Exception e) {
logger.error("Can't handle event " + event, e);
}

7
zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
View file

@ -1760,15 +1760,16 @@ public class NotebookServer extends WebSocketServlet implements
continue;
}
List<String> ids = notebook.getInterpreterFactory().getInterpreters(note.getId());
for (String id : ids) {
if (id.equals(interpreterGroupId)) {
List<String> settingIds = notebook.getInterpreterFactory().getInterpreters(note.getId());
for (String id : settingIds) {
if (interpreterGroupId.contains(id)) {
broadcast(
note.getId(),
new Message(OP.ANGULAR_OBJECT_REMOVE)
.put("name", name)
.put("noteId", noteId)
.put("paragraphId", paragraphId));
break;
}
}
}

5
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file

@ -990,8 +990,9 @@
/** broadcast update to result controller **/
if (data.paragraph.result && data.paragraph.result.msg) {
for (var i in data.paragraph.result.msg) {
var newResult = data.paragraph.result.msg[i];
var oldResult = $scope.paragraph.result.msg[i];
var newResult = data.paragraph.result.msg ? data.paragraph.result.msg[i] : {};
var oldResult = ($scope.paragraph.result && $scope.paragraph.result.msg) ?
$scope.paragraph.result.msg[i] : {};
var newConfig = data.paragraph.config.result ? data.paragraph.config.result[i] : {};
var oldConfig = $scope.paragraph.config.result ? $scope.paragraph.config.result[i] : {};
if (!angular.equals(newResult, oldResult) ||

36
zeppelin-web/test/spec/controllers/paragraph.js
View file

@ -35,11 +35,7 @@ describe('Controller: ParagraphCtrl', function() {
'moveUp', 'moveDown', 'insertNew', 'removeParagraph', 'toggleEditor', 'closeEditor', 'openEditor',
'closeTable', 'openTable', 'showTitle', 'hideTitle', 'setTitle', 'showLineNumbers', 'hideLineNumbers',
'changeColWidth', 'columnWidthClass', 'toggleGraphOption', 'toggleOutput', 'loadForm',
'aceChanged', 'aceLoaded', 'getEditorValue', 'getProgress', 'getExecutionTime', 'isResultOutdated',
'getResultType', 'setGraphMode', 'isGraphMode', 'onGraphOptionChange',
'removeGraphOptionKeys', 'removeGraphOptionValues', 'removeGraphOptionGroups', 'setGraphOptionValueAggr',
'removeScatterOptionXaxis', 'removeScatterOptionYaxis', 'removeScatterOptionGroup',
'removeScatterOptionSize'];
'aceChanged', 'aceLoaded', 'getEditorValue', 'getProgress', 'getExecutionTime', 'isResultOutdated'];
functions.forEach(function(fn) {
it('check for scope functions to be defined : ' + fn, function() {
@ -58,34 +54,4 @@ describe('Controller: ParagraphCtrl', function() {
it('should set default value of "paragraphFocused" as false', function() {
expect(scope.paragraphFocused).toEqual(false);
});
it('should call loadTableData() and getGraphMode() should return "table" when the result type is "TABLE"',
function() {
scope.getResultType = jasmine.createSpy('getResultType spy').andCallFake(function() {
return 'TABLE';
});
spyOn(scope, 'setGraphMode');
scope.init(paragraphMock);
expect(scope.setGraphMode).toHaveBeenCalled();
expect(scope.getGraphMode()).toEqual('table');
});
it('should call renderHtml() when the result type is "HTML"', function() {
scope.getResultType = jasmine.createSpy('getResultType spy').andCallFake(function() {
return 'HTML';
});
spyOn(scope, 'renderHtml');
scope.init(paragraphMock);
expect(scope.renderHtml).toHaveBeenCalled();
});
it('should call renderAngular() when the result type is "ANGULAR"', function() {
scope.getResultType = jasmine.createSpy('getResultType spy').andCallFake(function() {
return 'ANGULAR';
});
spyOn(scope, 'renderAngular');
scope.init(paragraphMock);
expect(scope.renderAngular).toHaveBeenCalled();
});
});

9
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
View file

@ -693,6 +693,15 @@ public class InterpreterFactory implements InterpreterGroupFactory {
return interpreterSetting;
}
/**
*
* @param id interpreterGroup id. Combination of interpreterSettingId + noteId/userId/shared
* depends on interpreter mode
* @param option
* @return
* @throws InterpreterException
* @throws NullArgumentException
*/
@Override
public InterpreterGroup createInterpreterGroup(String id, InterpreterOption option)
throws InterpreterException, NullArgumentException {