diff --git a/doc/contents/GroovyAddJarToClasspathMagicCommands.ipynb b/doc/contents/GroovyAddJarToClasspathMagicCommands.ipynb index 95b36da186..61522507fc 100644 --- a/doc/contents/GroovyAddJarToClasspathMagicCommands.ipynb +++ b/doc/contents/GroovyAddJarToClasspathMagicCommands.ipynb @@ -17,7 +17,7 @@ "metadata": {}, "outputs": [], "source": [ - "import com.beakerx.BeakerxObject" + "import com.example.Demo" ] }, { @@ -30,10 +30,39 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "collapsed": true + }, "outputs": [], "source": [ - "%classpath add jar demoResources/beakerxTestLibrary.jar" + "%classpath add jar demoResources/demo.jar" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Source code of Demo class\n", + "\n", + "```java\n", + "package com.example;\n", + "\n", + "public class Demo {\n", + " public static final String OBJECT_TEST_123 = \"Demo_test_123\";\n", + " public static final String STATIC_TEST_123 = \"Demo_static_test_123\";\n", + "\n", + " public Demo() {\n", + " }\n", + "\n", + " public static String staticTest() {\n", + " return \"Demo_static_test_123\";\n", + " }\n", + "\n", + " public String getObjectTest() {\n", + " return \"Demo_test_123\";\n", + " }\n", + "}\n", + "```" ] }, { @@ -49,7 +78,7 @@ "metadata": {}, "outputs": [], "source": [ - "import com.beakerx.BeakerxObject" + "import com.example.Demo" ] }, { @@ -58,10 +87,9 @@ "metadata": {}, "outputs": [], "source": [ - "%classpath add jar demoResources/beakerxTestLibrary.jar\n", - "import com.beakerx.BeakerxObject\n", - "BeakerxObject beakerxObject = new BeakerxObject();\n", - "println beakerxObject.getObjectTest()" + "import com.example.Demo\n", + "Demo demo = new Demo();\n", + "println demo.getObjectTest()" ] }, { @@ -77,16 +105,16 @@ "metadata": {}, "outputs": [], "source": [ - "%classpath add jar demoResources/beakerxTestLibrary.jar\n", + "%classpath add jar demoResources/demo.jar\n", "%classpath add jar demoResources/BeakerXClasspathTest.jar\n", "\n", - "println com.beakerx.BeakerxObject.staticTest();\n", + "println com.example.Demo.staticTest();\n", "\n", "import com.twosigma.beakerx.jvm.object.OutputCell\n", - "import com.beakerx.BeakerxObject\n", + "import com.example.Demo\n", "\n", - "BeakerxObject beakerxObject = new BeakerxObject();\n", - "println beakerxObject.getObjectTest()\n", + "Demo demo = new Demo();\n", + "println demo.getObjectTest()\n", "\n", "import com.beaker.BeakerXClasspathTest\n", "BeakerXClasspathTest t = new BeakerXClasspathTest();\n", @@ -178,7 +206,7 @@ "metadata": {}, "outputs": [], "source": [ - "%classpath add jar demoResources/beakerxTestLibrary.jar\n", + "%classpath add jar demoResources/demo.jar\n", "%classpath\n", "5+5" ] @@ -192,7 +220,7 @@ "outputs": [], "source": [ "%classpath\n", - "%classpath add jar demoResources/beakerxTestLibrary.jar" + "%classpath add jar demoResources/demo.jar" ] }, { @@ -201,7 +229,7 @@ "metadata": {}, "outputs": [], "source": [ - "%classpath add jar demoResources/beakerxTestLibrary.jar\n", + "%classpath add jar demoResources/demo.jar\n", "%classpath" ] }, diff --git a/doc/contents/GroovyAutocomplete.ipynb b/doc/contents/GroovyAutocomplete.ipynb index 4fc0acf672..e15998b25d 100644 --- a/doc/contents/GroovyAutocomplete.ipynb +++ b/doc/contents/GroovyAutocomplete.ipynb @@ -27,9 +27,7 @@ { "cell_type": "code", "execution_count": 1, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { diff --git a/doc/contents/demoResources/beakerxTestLibrary.jar b/doc/contents/demoResources/beakerxTestLibrary.jar deleted file mode 100644 index f8099507b0..0000000000 Binary files a/doc/contents/demoResources/beakerxTestLibrary.jar and /dev/null differ diff --git a/doc/contents/demoResources/demo.jar b/doc/contents/demoResources/demo.jar new file mode 100644 index 0000000000..348008b678 Binary files /dev/null and b/doc/contents/demoResources/demo.jar differ diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/jupyter/handler/ExecuteRequestHandlerMagicCommandTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/jupyter/handler/ExecuteRequestHandlerMagicCommandTest.java index 68bbda5e99..e08ec13572 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/jupyter/handler/ExecuteRequestHandlerMagicCommandTest.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/jupyter/handler/ExecuteRequestHandlerMagicCommandTest.java @@ -31,7 +31,7 @@ public class ExecuteRequestHandlerMagicCommandTest { public static final String DEMO_FILES_DEMO_RESOURCES_BEAKER_XCLASSPATH_TEST_JAR = "../../doc/contents/demoResources/BeakerXClasspathTest.jar"; - public static final String DEMO_FILES_DEMO_RESOURCES_BEAKERX_TEST_LIBRARY_JAR = "../../doc/contents/demoResources/beakerxTestLibrary.jar"; + public static final String DEMO_FILES_DEMO_RESOURCES_BEAKERX_TEST_LIBRARY_JAR = "../../doc/contents/demoResources/demo.jar"; private KernelTest kernel; private EvaluatorTest evaluator; private ExecuteRequestHandler executeRequestHandler; @@ -53,9 +53,9 @@ public void handleMagicClasspathAddJarAndExecuteTheCode() throws Exception { //given String code = "" + "%classpath add jar " + DEMO_FILES_DEMO_RESOURCES_BEAKER_XCLASSPATH_TEST_JAR + "\n" + - "import com.beakerx.BeakerxObject;\n" + - "BeakerxObject beakerxObject = new BeakerxObject();\n" + - "beakerxObject.getObjectTest()\n"; + "import com.example.Demo;\n" + + "Demo demo = new Demo();\n" + + "demo.getObjectTest()\n"; Message magicMessage = JupyterHandlerTest.createExecuteRequestMessage(new Code(code)); //when @@ -67,8 +67,6 @@ public void handleMagicClasspathAddJarAndExecuteTheCode() throws Exception { @Test public void handleMagicClasspathAddJar() throws Exception { - System.out.println("SIEMA " + System.getProperty("user.dir")); - //when String code = "" + "%classpath add jar " + DEMO_FILES_DEMO_RESOURCES_BEAKER_XCLASSPATH_TEST_JAR; diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/kernel/commands/MagicCommandResultOrderTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/kernel/commands/MagicCommandResultOrderTest.java index 940f55df44..77e946a1e9 100644 --- a/kernel/base/src/test/java/com/twosigma/beakerx/kernel/commands/MagicCommandResultOrderTest.java +++ b/kernel/base/src/test/java/com/twosigma/beakerx/kernel/commands/MagicCommandResultOrderTest.java @@ -29,7 +29,7 @@ public class MagicCommandResultOrderTest { - public static final String DOC_CONTENTS_DEMO_RESOURCES_BEAKERX_TEST_LIBRARY_JAR = "../../doc/contents/demoResources/beakerxTestLibrary.jar"; + public static final String DOC_CONTENTS_DEMO_RESOURCES_BEAKERX_TEST_LIBRARY_JAR = "../../doc/contents/demoResources/demo.jar"; private MagicCommand sut; private KernelTest kernel; diff --git a/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluatorMagicCommandsTest.java b/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluatorMagicCommandsTest.java index bc6e89ccfb..14cf454f8b 100644 --- a/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluatorMagicCommandsTest.java +++ b/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluatorMagicCommandsTest.java @@ -43,18 +43,18 @@ public static void setUpClass() throws Exception { public void addJarToClasspath() throws Exception { //given String code = "" + - "import com.beakerx.BeakerxObject;\n" + - "BeakerxObject beakerxObject = new BeakerxObject();\n" + - "beakerxObject.getObjectTest()\n"; + "import com.example.Demo;\n" + + "Demo demo = new Demo();\n" + + "demo.getObjectTest()\n"; SimpleEvaluationObject seo = runCode(code); assertThat(seo.getStatus()).isEqualTo(ERROR); //when - PathToJar path = new PathToJar(SRC_TEST_RESOURCES + "beakerxTestLibrary.jar"); + PathToJar path = new PathToJar(SRC_TEST_RESOURCES + "demo.jar"); groovyEvaluator.addJarToClasspath(path); //then SimpleEvaluationObject seo2 = runCode(code); assertThat(seo2.getStatus()).isEqualTo(FINISHED); - assertThat(seo2.getPayload()).isEqualTo("BeakerxObject_test_123"); + assertThat(seo2.getPayload()).isEqualTo("Demo_test_123"); } private SimpleEvaluationObject runCode(String code) throws InterruptedException { diff --git a/kernel/groovy/src/test/resources/beakerxTestLibrary.jar b/kernel/groovy/src/test/resources/beakerxTestLibrary.jar deleted file mode 100644 index f8099507b0..0000000000 Binary files a/kernel/groovy/src/test/resources/beakerxTestLibrary.jar and /dev/null differ diff --git a/kernel/groovy/src/test/resources/demo.jar b/kernel/groovy/src/test/resources/demo.jar new file mode 100644 index 0000000000..348008b678 Binary files /dev/null and b/kernel/groovy/src/test/resources/demo.jar differ