Skip to content

Commit 762b91c

Browse files
committed
Fix test for future rust changes. Fixes #106
1 parent 20fc68b commit 762b91c

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

java_runtime/tests/classes/java/util/jar/test_jar_file.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,35 @@ async fn test_entries() -> Result<()> {
4040

4141
let entries = jvm.invoke_virtual(&jar, "entries", "()Ljava/util/Enumeration;", ()).await?;
4242

43-
assert!(jvm.invoke_virtual(&entries, "hasMoreElements", "()Z", ()).await?);
43+
let has_more_elements: bool = jvm.invoke_virtual(&entries, "hasMoreElements", "()Z", ()).await?;
44+
45+
assert!(has_more_elements);
4446
let next_element: ClassInstanceRef<JarEntry> = jvm.invoke_virtual(&entries, "nextElement", "()Ljava/lang/Object;", ()).await?;
4547
let name = jvm.get_field(&next_element, "name", "Ljava/lang/String;").await?;
4648
assert_eq!(JavaLangString::to_rust_string(&jvm, &name).await?, "META-INF/");
4749

48-
assert!(jvm.invoke_virtual(&entries, "hasMoreElements", "()Z", ()).await?);
50+
let has_more_elements: bool = jvm.invoke_virtual(&entries, "hasMoreElements", "()Z", ()).await?;
51+
assert!(has_more_elements);
4952
let next_element: ClassInstanceRef<JarEntry> = jvm.invoke_virtual(&entries, "nextElement", "()Ljava/lang/Object;", ()).await?;
5053
let name = jvm.get_field(&next_element, "name", "Ljava/lang/String;").await?;
5154
assert_eq!(JavaLangString::to_rust_string(&jvm, &name).await?, "META-INF/MANIFEST.MF");
5255

53-
assert!(jvm.invoke_virtual(&entries, "hasMoreElements", "()Z", ()).await?);
56+
let has_more_elements: bool = jvm.invoke_virtual(&entries, "hasMoreElements", "()Z", ()).await?;
57+
assert!(has_more_elements);
58+
5459
let next_element: ClassInstanceRef<JarEntry> = jvm.invoke_virtual(&entries, "nextElement", "()Ljava/lang/Object;", ()).await?;
5560
let name = jvm.get_field(&next_element, "name", "Ljava/lang/String;").await?;
5661
assert_eq!(JavaLangString::to_rust_string(&jvm, &name).await?, "JarTest.class");
5762

58-
assert!(jvm.invoke_virtual(&entries, "hasMoreElements", "()Z", ()).await?);
63+
let has_more_elements: bool = jvm.invoke_virtual(&entries, "hasMoreElements", "()Z", ()).await?;
64+
assert!(has_more_elements);
65+
5966
let next_element: ClassInstanceRef<JarEntry> = jvm.invoke_virtual(&entries, "nextElement", "()Ljava/lang/Object;", ()).await?;
6067
let name = jvm.get_field(&next_element, "name", "Ljava/lang/String;").await?;
6168
assert_eq!(JavaLangString::to_rust_string(&jvm, &name).await?, "test.txt");
6269

63-
assert!(!jvm.invoke_virtual(&entries, "hasMoreElements", "()Z", ()).await?);
70+
let has_more_elements: bool = jvm.invoke_virtual(&entries, "hasMoreElements", "()Z", ()).await?;
71+
assert!(!has_more_elements);
6472

6573
Ok(())
6674
}

0 commit comments

Comments
 (0)