diff --git a/applications/cafe-scripted/scripts/python/barista.py b/applications/cafe-scripted/scripts/python/barista.py index fef0b2f3..63c6e5d5 100644 --- a/applications/cafe-scripted/scripts/python/barista.py +++ b/applications/cafe-scripted/scripts/python/barista.py @@ -1,8 +1,10 @@ -from org.springframework.integration.samples.cafe import Drink import time +import java + +Drink = java.type("org.springframework.integration.samples.cafe.Drink") def prepareDrink(orderItem): - print("python: preparing %s for order %s" % (orderItem,orderItem.order.number)) + print("python: preparing %s for order %s" % (orderItem,orderItem.getOrder().getNumber())) time.sleep(eval(timeToPrepare)) return Drink(orderItem.getOrder().getNumber(), orderItem.getDrinkType(), orderItem.isIced(), orderItem.getShots()) diff --git a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java index e3551bb7..6498e522 100644 --- a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java +++ b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java @@ -16,21 +16,17 @@ package org.springframework.integration.samples.cafe; import java.util.HashMap; import java.util.Map; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.core.io.FileSystemResource; import org.springframework.integration.scripting.ScriptExecutor; import org.springframework.integration.scripting.jsr223.ScriptExecutorFactory; import org.springframework.scripting.support.ResourceScriptSource; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - /** * @author David Turanski * @author Artem Bilan - * */ public class ScriptTests { @@ -46,13 +42,11 @@ public class ScriptTests { Object obj = executor.executeScript( new ResourceScriptSource(new FileSystemResource("scripts/ruby/barista.rb")), variables); - assertNotNull(obj); - assertTrue(obj instanceof Drink); - + Assertions.assertNotNull(obj); + Assertions.assertInstanceOf(Drink.class, obj); } @Test - @Ignore public void testPython() { ScriptExecutor executor = ScriptExecutorFactory.getScriptExecutor("python"); Order order = new Order(0); @@ -63,8 +57,8 @@ public class ScriptTests { Object obj = executor.executeScript(new ResourceScriptSource( new FileSystemResource("scripts/python/barista.py")), variables); - assertNotNull(obj); - assertTrue(obj instanceof Drink); - + Assertions.assertNotNull(obj); + Assertions.assertInstanceOf(Drink.class, obj); } + }