From 5cfe09efd2b2605aa023d69ebdb7e97d845caab4 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 28 Dec 2018 21:50:28 -0400
Subject: Re-organized the class machinery.

---
 stdlib/test/test/lux/host/jvm.jvm.lux | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'stdlib/test')

diff --git a/stdlib/test/test/lux/host/jvm.jvm.lux b/stdlib/test/test/lux/host/jvm.jvm.lux
index 701286455..309deb800 100644
--- a/stdlib/test/test/lux/host/jvm.jvm.lux
+++ b/stdlib/test/test/lux/host/jvm.jvm.lux
@@ -18,13 +18,13 @@
     ["." file (#+ File)]
     [binary (#+ Binary)]]
    [host
-    ["/" jvm
+    [jvm
      ["/." loader (#+ Library)]
      ["/." version]
      ["/." name]
      ["/." field]
+     ["/." class]
      [modifier
-      ["/.M" class]
       ["/.M" inner]]]]
    [math
     ["r" random]]]
@@ -49,22 +49,22 @@
   (let [package "my.package"
         name "MyClass"
         full-name (format package "." name)
-        class (/.class /version.v6_0 /classM.public
-                       (/name.internal "java.lang.Object")
-                       (/name.internal full-name)
-                       (list (/name.internal "java.io.Serializable")
-                             (/name.internal "java.lang.Runnable"))
-                       (row.row)
-                       (row.row)
-                       (row.row))
-        bytecode (binary.write /.format class)
+        class (/class.class /version.v6_0 /class.public
+                            (/name.internal "java.lang.Object")
+                            (/name.internal full-name)
+                            (list (/name.internal "java.io.Serializable")
+                                  (/name.internal "java.lang.Runnable"))
+                            (row.row)
+                            (row.row)
+                            (row.row))
+        bytecode (binary.write /class.format class)
         loader (/loader.memory (/loader.new-library []))]
     (exec
       ## TODO: Remove 'write-class' call.
       (io.run (..write-class name))
       ($_ seq
-          (test "Can read generated class."
-                (case (binary.read /.format bytecode)
+          (test "Can read a generated class."
+                (case (binary.read /class.format bytecode)
                   (#error.Success class)
                   true
                   
-- 
cgit v1.2.3