#5481 Fixed test for ipywidgets 7.

twosigma · Aug 23, 2017 · ed689d0 · ed689d0
1 parent a5cc650
commit ed689d0
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 46 deletions.
diff --git a/beakerx/js/yarn.lock b/beakerx/js/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@jupyter-widgets/base@^0.6.9":
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/@jupyter-widgets/base/-/base-0.6.9.tgz#640ffb504f48d57ed7b865771d611e67f67dccb6"
+"@jupyter-widgets/base@^0.6.12":
+  version "0.6.12"
+  resolved "https://registry.yarnpkg.com/@jupyter-widgets/base/-/base-0.6.12.tgz#123cbe505eb9c7b2ff9ad5e8d948d001b0d7f82d"
   dependencies:
     "@jupyter-widgets/schema" "^0.3.0-beta.7"
     "@jupyterlab/services" "^0.48.0"
@@ -17,14 +17,14 @@
     "@types/semver" "^5.3.30"
     backbone "1.2.3"
     jquery "^3.1.1"
+    lodash "^4.17.4"
     semver "^5.1.0"
-    underscore "^1.8.3"
 
-"@jupyter-widgets/controls@^0.6.8":
-  version "0.6.15"
-  resolved "https://registry.yarnpkg.com/@jupyter-widgets/controls/-/controls-0.6.15.tgz#8dd141cf31f6c8a5659d8fdfe8d51005f9459c30"
+"@jupyter-widgets/controls@^0.6.4":
+  version "0.6.18"
+  resolved "https://registry.yarnpkg.com/@jupyter-widgets/controls/-/controls-0.6.18.tgz#2a1e0e45059d75c2f67b745d0fff5ac788384b96"
   dependencies:
-    "@jupyter-widgets/base" "^0.6.9"
+    "@jupyter-widgets/base" "^0.6.12"
     "@jupyter-widgets/schema" "^0.3.0-beta.7"
     "@jupyterlab/services" "^0.48.0"
     "@phosphor/algorithm" "^1.1.0"
@@ -1156,13 +1156,7 @@ datatables.net-select@^1.2.2:
     datatables.net ">=1.10.9"
     jquery ">=1.7"
 
-datatables.net@>=1.10.9:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.1.1.tgz#6f1103ef08054642aecf85e7e25efd592822ee78"
-  dependencies:
-    jquery ">=1.7"
-
-datatables.net@^1.10.15:
+datatables.net@>=1.10.9, datatables.net@^1.10.15:
   version "1.10.15"
   resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.15.tgz#c789077bbfe385e75ff5a233fa5f23251a72df68"
   dependencies:
@@ -1984,7 +1978,7 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^4.0.0, lodash@^4.14.0, lodash@~4.17.4:
+lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -2998,11 +2992,7 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
-semver@~5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 

diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/widgets/Layout.java b/kernel/base/src/main/java/com/twosigma/beakerx/widgets/Layout.java
@@ -132,11 +132,4 @@ public String getViewNameValue() {
     return VIEW_NAME_VALUE;
   }
 
-  public String getModelModuleValue(){
-    return "@jupyter-widgets/base";
-  }
-
-  public String getViewModuleValue(){
-    return "@jupyter-widgets/base";
-  }
 }
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/widgets/ValueWidget.java b/kernel/base/src/main/java/com/twosigma/beakerx/widgets/ValueWidget.java
@@ -243,4 +243,11 @@ public Boolean getBoolean(Object input) {
     return ret;
   }
 
+  public String getModelModuleValue(){
+    return "@jupyter-widgets/controls";
+  }
+
+  public String getViewModuleValue(){
+    return "@jupyter-widgets/controls";
+  }
 }
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/widgets/Widget.java b/kernel/base/src/main/java/com/twosigma/beakerx/widgets/Widget.java
@@ -83,8 +83,8 @@ public static CommActions getByAction(final String input){
   public static final String VIEW_MODULE = "_view_module";
   public static final String VIEW_NAME = "_view_name";
 
-  public static final String MODEL_MODULE_VALUE = "@jupyter-widgets/controls";
-  public static final String VIEW_MODULE_VALUE = "@jupyter-widgets/controls";
+  public static final String MODEL_MODULE_VALUE = "@jupyter-widgets/base";
+  public static final String VIEW_MODULE_VALUE = "@jupyter-widgets/base";
 
   public static final String VALUE = "value";
   public static final String DISABLED = "disabled";

diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/widgets/integers/IntProgress.java b/kernel/base/src/main/java/com/twosigma/beakerx/widgets/integers/IntProgress.java
@@ -24,7 +24,7 @@
 public class IntProgress extends BoundedIntWidget {
 
   public static final String VIEW_NAME_VALUE = "ProgressView";
-  public static final String MODEL_NAME_VALUE = "ProgressModel";
+  public static final String MODEL_NAME_VALUE = "IntProgressModel";
   protected static final String ORIENTATION = "orientation";
 
   private String orientation = "horizontal";

diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/widgets/integers/IntWidget.java b/kernel/base/src/main/java/com/twosigma/beakerx/widgets/integers/IntWidget.java
@@ -43,4 +43,13 @@ public T getValueFromObject(Object input){
     return (T)getInteger(input);
   }
 
+
+  public String getModelModuleValue(){
+    return "@jupyter-widgets/controls";
+  }
+
+  public String getViewModuleValue(){
+    return "@jupyter-widgets/controls";
+  }
+
 }
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/widgets/selections/SelectionWidget.java b/kernel/base/src/main/java/com/twosigma/beakerx/widgets/selections/SelectionWidget.java
@@ -54,4 +54,12 @@ public void setSize(Integer size) {
     sendUpdate(SIZE, size);
   }
 
+  public String getModelModuleValue(){
+    return "@jupyter-widgets/controls";
+  }
+
+  public String getViewModuleValue(){
+    return "@jupyter-widgets/controls";
+  }
+
 }
diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/easyform/EasyFormTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/easyform/EasyFormTest.java
@@ -15,7 +15,6 @@
  */
 package com.twosigma.beakerx.easyform;
 
-import static com.twosigma.beakerx.widgets.TestWidgetUtils.getData;
 import static com.twosigma.beakerx.widgets.TestWidgetUtils.getState;
 import static com.twosigma.beakerx.widgets.TestWidgetUtils.getValueForProperty;
 import static com.twosigma.beakerx.widgets.TestWidgetUtils.verifyDisplayMsg;

diff --git a/...src/test/java/com/twosigma/beakerx/jvm/object/TabbedOutputContainerLayoutManagerTest.java b/...src/test/java/com/twosigma/beakerx/jvm/object/TabbedOutputContainerLayoutManagerTest.java
@@ -59,7 +59,7 @@ public void shouldSendChildModel() throws Exception {
   }
 
   private Message plotUpdateMsg() {
-    return groovyKernel.getPublishedMessages().get(groovyKernel.getPublishedMessages().size() - 3);
+    return groovyKernel.getPublishedMessages().get(4);
   }
 
 }
diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/widgets/DisplayWidgetTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/widgets/DisplayWidgetTest.java
@@ -59,7 +59,7 @@ public void shouldSendCommOpenWhenCreate() throws Exception {
   }
 
   private void verifyCommDisplayMsg(IntSlider widget) {
-    assertThat(groovyKernel.getPublishedMessages().size()).isEqualTo(2);
+    assertThat(groovyKernel.getPublishedMessages().size()).isEqualTo(1);
     Message message = groovyKernel.getPublishedMessages().get(0);
     assertThat(getData(message).get(METHOD)).isEqualTo(DISPLAY_DATA.getName());
     verifyDisplayMsg(message);

diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/widgets/TestWidgetUtils.java b/kernel/base/src/test/java/com/twosigma/beakerx/widgets/TestWidgetUtils.java
@@ -35,6 +35,7 @@ public class TestWidgetUtils {
   public static void verifyOpenCommMsg(List<Message> messages, String modelNameValue,
       String viewNameValue) {
     verifyInternalOpenCommMsgWitLayout(messages, modelNameValue, viewNameValue,
+
         Widget.MODEL_MODULE_VALUE,
         Widget.VIEW_MODULE_VALUE);
   }
@@ -52,8 +53,6 @@ public static void verifyInternalOpenCommMsg(Message message, String modelNameVa
       String viewNameValue) {
     verifyTypeMsg(message, COMM_OPEN);
     Map data = getState(message);
-    assertThat(data.get(Widget.MODEL_MODULE)).isEqualTo(BeakerxWidget.MODEL_MODULE_VALUE);
-    assertThat(data.get(Widget.VIEW_MODULE)).isEqualTo(BeakerxWidget.VIEW_MODULE_VALUE);
     assertThat(data.get(Widget.MODEL_NAME)).isEqualTo(modelNameValue);
     assertThat(data.get(Widget.VIEW_NAME)).isEqualTo(viewNameValue);
   }
@@ -73,8 +72,6 @@ public static void verifyInternalOpenCommMsgWitLayout(List<Message> messages,
     Map data = getState(widget);
     assertThat(data.get(Layout.LAYOUT))
         .isEqualTo(Layout.IPY_MODEL + layout.getContent().get(Comm.COMM_ID));
-    assertThat(data.get(Widget.MODEL_MODULE)).isEqualTo(modelModule);
-    assertThat(data.get(Widget.VIEW_MODULE)).isEqualTo(viewModule);
     assertThat(data.get(Widget.MODEL_NAME)).isEqualTo(modelNameValue);
     assertThat(data.get(Widget.VIEW_NAME)).isEqualTo(viewNameValue);
   }

diff --git a/kernel/build.gradle b/kernel/build.gradle
@@ -40,6 +40,7 @@ subprojects {
     }
   }
 
+
   test.finalizedBy jacocoTestReport
 
   test {

diff --git a/...test/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluatorProgressReportingTest.java b/...test/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluatorProgressReportingTest.java
@@ -75,20 +75,20 @@ public void progressReporting() throws Exception {
   }
 
   private void verifyProgressReporting(List<Message> messages) {
-    assertThat(messages.size()).isEqualTo(15);
+    assertThat(messages.size()).isEqualTo(14);
     Message layout = messages.get(0);
     Message intProgress = messages.get(1);
     verifyOpenCommMsg(asList(layout, intProgress), IntProgress.MODEL_NAME_VALUE, IntProgress.VIEW_NAME_VALUE);
 
     verifyDisplayMsg(messages.get(2));
 
-    verifyUpdate(messages.get(4), messages.get(5),0);
-    verifyUpdate(messages.get(6), messages.get(7),1);
-    verifyUpdate(messages.get(8), messages.get(9),2);
-    verifyUpdate(messages.get(10), messages.get(11),3);
-    verifyUpdate(messages.get(12), messages.get(13),4);
+    verifyUpdate(messages.get(3), messages.get(4),0);
+    verifyUpdate(messages.get(5), messages.get(6),1);
+    verifyUpdate(messages.get(7), messages.get(8),2);
+    verifyUpdate(messages.get(9), messages.get(10),3);
+    verifyUpdate(messages.get(11), messages.get(12),4);
 
-    Message closeMessage = messages.get(14);
+    Message closeMessage = messages.get(13);
     verifyTypeMsg(closeMessage, COMM_CLOSE);
   }
 

diff --git a/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/widgets/InteractiveTest.java b/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/widgets/InteractiveTest.java
@@ -85,7 +85,7 @@ public void valueChangeMsgCallback_createDisplayDataMessage() throws Exception {
     comm.handleMsg(initSyncDataMessage(comm.getCommId(), "TEST"));
     //then
     Message display = SearchMessages.getListMessagesByType(
-            groovyKernel.getPublishedMessages(), JupyterMessages.DISPLAY_DATA).get(2);
+            groovyKernel.getPublishedMessages(), JupyterMessages.DISPLAY_DATA).get(1);
     Map data = (Map) display.getContent().get(Comm.DATA);
     Assertions.assertThat(data).isNotEmpty();
     Assertions.assertThat(data.get(MessageCreator.TEXT_PLAIN)).isEqualTo("TEST");
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,7 @@ subprojects { @@
         }
       }
       test.finalizedBy jacocoTestReport
       test {
@@ Expand Down @@