put tests into the right package

kripken · Jul 15, 2014 · b339dc6 · b339dc6
1 parent 1041f93
commit b339dc6
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -19,6 +19,14 @@ SRC = zipfile.js \
       jvm.js \
       main.js
 
+TESTS_SRC = $(shell ls tests/*.java)
+TESTS_BIN = $(TESTS_SRC:.java=.class)
+
+tests: $(TESTS_BIN)
+
+%.class: %.java
+	javac -classpath java/cldc1.1.1.jar $<
+
 j2me.js: $(SRC)
 	cat $^ > $@
 

diff --git a/classes.js b/classes.js
@@ -54,7 +54,7 @@ Classes.prototype.loadClassFile = function(fileName) {
     var classes = classInfo.classes;
     for (var i=0; i<classes.length; i++) {
         if (!this.classes[classes[i]]) {
-            this.loadClassFile(path.dirname(fileName) + path.sep + classes[i] + ".class");
+            this.loadClassFile(fileName.replace(/[^/]*\.class$/, "") + "/" + classes[i] + ".class");
         }
     }
     return classInfo;

diff --git a/classfile/classfile.js b/classfile/classfile.js
@@ -136,7 +136,7 @@ var getClassImage = function(classBytes) {
                 break;
             case TAGS.CONSTANT_Double:
             case TAGS.CONSTANT_Long:
-                var bytes = new Buffer(8);
+                var bytes = new Uint8Array(8);
                 for (var b=0; b<8; b++) {
                     bytes[b] = reader.read8();
                 }

diff --git a/classinfo.js b/classinfo.js
@@ -41,7 +41,7 @@ var ClassInfo = function(classBytes) {
         self.methods.push(method);
     });
 
-    this.classes = [];
+    var classes = this.classes = [];
     classImage.attributes.forEach(function(a) {
         if (a.info.type === ATTRIBUTE_TYPES.InnerClasses) {
             a.info.classes.forEach(function(c) {

diff --git a/main.js b/main.js
@@ -13,11 +13,11 @@ function load(file, cb) {
   xhr.send(null);
 }
 
-function runTest(path, name, cb) {
+function runTest(name, cb) {
   var jvm = new JVM();
   load("java/cldc1.1.1.jar", function (data) {
     jvm.addPath("java/cldc1.1.1.jar", data);
-    load(path + name, function (data) {
+    load(name, function (data) {
       jvm.addPath(name, data);
       jvm.loadClassFile(name);
       jvm.start();
@@ -26,4 +26,4 @@ function runTest(path, name, cb) {
   });
 }
 
-runTest("tests/", "TestPrintln.class");
+runTest("tests/TestPrintln.class")
diff --git a/tests/TestPrintln.class b/tests/TestPrintln.class
diff --git a/tests/TestPrintln.java b/tests/TestPrintln.java
@@ -1,3 +1,5 @@
+package tests;
+
 public class TestPrintln {
     public static void main(String[] args) {
 	System.out.println("OK");