Skip to content

Commit ce670e1

Browse files
committed
Make Python script compatible with GraalPy expectations
1 parent 580f19f commit ce670e1

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

Diff for: applications/cafe-scripted/scripts/python/barista.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
from org.springframework.integration.samples.cafe import Drink
21
import time
2+
import java
3+
4+
Drink = java.type("org.springframework.integration.samples.cafe.Drink")
35

46
def prepareDrink(orderItem):
5-
print("python: preparing %s for order %s" % (orderItem,orderItem.order.number))
7+
print("python: preparing %s for order %s" % (orderItem,orderItem.getOrder().getNumber()))
68
time.sleep(eval(timeToPrepare))
79
return Drink(orderItem.getOrder().getNumber(), orderItem.getDrinkType(), orderItem.isIced(),
810
orderItem.getShots())

Diff for: applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java

+7-13
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,17 @@
1616
import java.util.HashMap;
1717
import java.util.Map;
1818

19-
import org.junit.Ignore;
20-
import org.junit.Test;
19+
import org.junit.jupiter.api.Assertions;
20+
import org.junit.jupiter.api.Test;
2121

2222
import org.springframework.core.io.FileSystemResource;
2323
import org.springframework.integration.scripting.ScriptExecutor;
2424
import org.springframework.integration.scripting.jsr223.ScriptExecutorFactory;
2525
import org.springframework.scripting.support.ResourceScriptSource;
2626

27-
import static org.junit.Assert.assertNotNull;
28-
import static org.junit.Assert.assertTrue;
29-
3027
/**
3128
* @author David Turanski
3229
* @author Artem Bilan
33-
*
3430
*/
3531
public class ScriptTests {
3632

@@ -46,13 +42,11 @@ public void testRuby() {
4642

4743
Object obj = executor.executeScript(
4844
new ResourceScriptSource(new FileSystemResource("scripts/ruby/barista.rb")), variables);
49-
assertNotNull(obj);
50-
assertTrue(obj instanceof Drink);
51-
45+
Assertions.assertNotNull(obj);
46+
Assertions.assertInstanceOf(Drink.class, obj);
5247
}
5348

5449
@Test
55-
@Ignore
5650
public void testPython() {
5751
ScriptExecutor executor = ScriptExecutorFactory.getScriptExecutor("python");
5852
Order order = new Order(0);
@@ -63,8 +57,8 @@ public void testPython() {
6357

6458
Object obj = executor.executeScript(new ResourceScriptSource(
6559
new FileSystemResource("scripts/python/barista.py")), variables);
66-
assertNotNull(obj);
67-
assertTrue(obj instanceof Drink);
68-
60+
Assertions.assertNotNull(obj);
61+
Assertions.assertInstanceOf(Drink.class, obj);
6962
}
63+
7064
}

0 commit comments

Comments
 (0)