divine 0.0.2 → 0.0.3

data/test/binaryTree_test/js_test/js_test.js

@@ -8,7 +8,7 @@ var ca = binaryTree_ser.serialize();
 serialize(ca);
 var read = deserialize();
 var binaryTree_deser = new BinaryTree();
-binaryTree_deser.deserialize(new BabelDataReader(read));
+binaryTree_deser.deserialize(new DivineDataReader(read));
 compareBinaryTree(binaryTree_ser, binaryTree_deser);
 
 

data/test/binaryTree_test/ruby_test/ruby_test.rb

@@ -49,10 +49,10 @@ class TestBabelTestBasic < MiniTest::Unit::TestCase
   end
 
   def compareBinaryTree(bt1, bt2)
-    assert bt1.root_node.length == bt2.root_node.length
-    assert bt1.root_node[0].i32 == bt2.root_node[0].i32
-    assert bt1.root_node[0].next_node.length == bt2.root_node[0].next_node.length
-    assert bt1.root_node[0].next_node[0].next_node[0].i32 == bt2.root_node[0].next_node[0].next_node[0].i32
+    assert_equal bt1.root_node.length, bt2.root_node.length
+    assert_equal bt1.root_node[0].i32, bt2.root_node[0].i32
+    assert_equal bt1.root_node[0].next_node.length, bt2.root_node[0].next_node.length
+    assert_equal bt1.root_node[0].next_node[0].next_node[0].i32, bt2.root_node[0].next_node[0].next_node[0].i32
   end
 
   def serialize(data)

data/test/complex_test/js_test/js_test.js

@@ -11,14 +11,15 @@ serialize(ca);
 var read = deserialize();
 
 var com_deser = new Complex();
-com_deser.deserialize(new BabelDataReader(read));
+com_deser.deserialize(new DivineDataReader(read));
 compare(com_ser, com_deser);
 
 function buildObject(){
   var ipList_1 = new IPList();
-  ipList_1.list1 = ["10.2.2.1","127.0.0.1","129.36.58.15"];
+  ipList_1.list1 = ["10.2.2.1","127.0.0.1","129.36.58.15"]
   ipList_1.list2 = ["2001:db8::ff00:1:8329","ff:ac:12::5f","1::"]
 
+
   var ipList_2 = new IPList();
   ipList_2.list1 = ["100.20.20.10","17.10.10.1","12.36.68.105"];
   ipList_2.list2 = ["ff:fabf:faf:f15f:f1ff:f2f:1f:f2", "2001:db8::ff00:1:8329","::1"]

data/test/ipv6_test/java_test/JavaTest.java

@@ -30,14 +30,12 @@ public class JavaTest {
 		obj.list1   = new ArrayList<String>(){{
 			add("255.102.0.25");
 			add("ff:fabf:faf:f15f:f1ff:f2f:1f:f2");
+			add("2001:db8::ff00:1:8329");
+			add("f::");
+			add("::1");
+			add("");
 		}};
 		
-		// Should Success
-//	    obj.ip = "2001:db8::ff00:1:8329";
-//	    obj.ip = "F::";
-//	    obj.ip = "::1";
-//	    obj.ip = "";
-		    
 	    // Should Fail or raise error
 //	    obj.ip = "2001:0db8:0000:0000:0000:ff00:0042:8329";
 //	    obj.ip = "2001:db8:::ff00:42:8329";

data/test/ipv6_test/js_test/js_test.js

@@ -11,7 +11,7 @@ serialize(ca);
 var read = deserialize();
 
 var obj_deser = new IPV6();
-obj_deser.deserialize(new BabelDataReader(read));
+obj_deser.deserialize(new DivineDataReader(read));
 compare_list(obj_ser.list1, obj_deser.list1);
 
 function buildObject(){

data/test/signed_float_test/ruby_test/ruby_test.rb

@@ -0,0 +1,36 @@
+require_relative 'test_signed_float.rb'
+require 'minitest/autorun'
+
+class TestBabelTestBasic < MiniTest::Unit::TestCase
+
+  def test_signedFloat
+    puts "Test Signed Int"
+    obj_ser = BabelTest::SignedFloat.new
+    obj_ser.list1  = [-1093.0802e+4]
+    
+    ser = obj_ser.serialize
+    serialize(ser)
+    res = deserialize()
+
+    obj_deser = BabelTest::SignedFloat.new
+    obj_deser.deserialize res
+    compare(obj_ser, obj_deser)
+    
+  end
+
+  def compare(obj_ser, obj_deser)
+    puts "Ser = #{obj_ser.list1}, Deser = #{obj_deser.list1}"
+    assert_equal obj_ser.list1, obj_deser.list1
+  end
+
+  def serialize(data)
+    File.open("test/signed_float_test/ruby_test/bin.babel.rb", "w+b") do |f|
+      f.write(data)
+    end
+  end
+
+  def deserialize()
+    mem_buf = File.new('test/signed_float_test/ruby_test/bin.babel.rb').binmode
+  end
+
+end

data/test/signed_float_test/signed_float_test.rb

@@ -0,0 +1,14 @@
+
+require 'divine'
+
+struct 'SignedFloat' do
+  list :list1, :float32
+end
+
+if ARGV[0] == "ruby"
+  Divine::CodeGenerator.new.generate(:ruby, file: 'test_signed_float.rb', module: 'BabelTest', parent_class: "Object", target_dir: "test/signed_float_test/ruby_test")
+elsif ARGV[0] == "js"
+  Divine::CodeGenerator.new.generate(:javascript, file: 'test_signed_float.js', target_dir: "test/signed_float_test/js_test")
+elsif ARGV[0] == "java"
+  Divine::CodeGenerator.new.generate(:java, file: 'test_signed_float.java', target_dir: "test/signed_float_test/java_test")
+end

data/test/signed_int_test/java_test/JavaTest.java

@@ -0,0 +1,83 @@
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import org.junit.*;
+
+public class JavaTest {
+
+	@Test
+	public void testSignedInt() throws IOException {
+        System.out.println("Test Signed Int32");
+		SignedInt ser = buildObj();
+		
+		serialize(ser);
+		byte[] res = deserialize();
+
+		SignedInt deser = new SignedInt();
+		deser.deserialize(new ByteArrayInputStream(res));
+
+		compare(ser, deser);
+	}
+
+	public SignedInt buildObj() {
+		SignedInt obj = new SignedInt();
+		obj.list1   = new ArrayList<Integer>(){{
+			add(-1);
+			add(-2);
+			add(-3);
+			add(Integer.MAX_VALUE);
+			add(Integer.MIN_VALUE);
+		}};
+		
+		obj.list2   = new ArrayList<Long>(){{
+			add(-1L);
+			add(-2L);
+			add(-3L);
+			add( (long)Math.pow(2, 54-1)-1 );
+			add( (long)(Math.pow(2, (54-1)) - Math.pow(2, 54)) );
+     			//add(Long.MAX_VALUE);
+			//add(Long.MIN_VALUE);
+		}};
+
+		return obj;
+	}
+
+	public void compare(SignedInt obj1, SignedInt obj2) {
+		for (int i = 0; i < obj1.list2.size(); i++){
+	        //System.out.println("Ser = " + obj1.list2.get(i) + ", Deser = " + obj2.list2.get(i));
+			org.junit.Assert.assertEquals(obj1.list2.get(i), obj2.list2.get(i));
+		}
+		for (int i = 0; i < obj1.list1.size(); i++){
+	        //System.out.println("Ser = " + obj1.list1.get(i) + ", Deser = " + obj2.list1.get(i));
+			org.junit.Assert.assertEquals(obj1.list1.get(i), obj2.list1.get(i));
+		}
+	}
+
+	public void serialize(BabelBase obj) throws IOException {
+		byte[] data = obj.serialize();
+		File file = new File("test/signed_int_test/java_test/bin.babel");
+		try {
+		    new FileOutputStream(file).write(data);
+		} catch (Exception e) {
+		    e.printStackTrace();
+		}
+	}
+
+	public byte[] deserialize() throws IOException{
+		File file = new File("test/signed_int_test/java_test/bin.babel");
+		byte[] data = new byte[(int) file.length()];
+		try {
+		    new FileInputStream(file).read(data);
+		} catch (Exception e) {
+		    e.printStackTrace();
+		}
+		return data;
+	}
+
+}

data/test/signed_int_test/js_test/js_test.js

@@ -0,0 +1,55 @@
+eval(require('fs').readFileSync('test/signed_int_test/js_test/test_signed_int.js', 'utf8'));
+var fs = require('fs');
+var assert = require('assert');
+
+console.log("Test Signed Int");
+
+var obj_ser = buildObject();
+
+var ca = obj_ser.serialize();
+serialize(ca);
+var read = deserialize();
+
+var obj_deser = new SignedInt();
+obj_deser.deserialize(new DivineDataReader(read));
+//compare_list(obj_ser.list1, obj_deser.list1);
+compare_list(obj_ser.list2, obj_deser.list2);
+
+function buildObject(){
+  var obj  = new SignedInt();
+  obj.list1   = [-1, -2, -3, Math.pow(2, 31)-1, Math.pow(2, 32-1) - Math.pow(2, 32)];
+  obj.list2   = [-1, -2, -3, Math.pow(2, 54-1)-1, Math.pow(2, (54-1)) - Math.pow(2, 54)];
+  return obj;
+}
+
+function compare_list(lst_1, lst_2){
+  assert.equal(lst_1.length, lst_2.length)
+  for (var i = 0; i < lst_1.length; i++){
+    //console.log("Ser = " + lst_1[i] + ", Deser = " + lst_2[i]);
+    assert.equal(lst_1[i], lst_2[i]);
+  }
+}
+
+function serialize(obj){
+  var bBuffer = new Buffer(obj);
+  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer, function (err) {
+    if (err) {
+      return console.log(err);
+    }
+  });
+}
+
+function deserialize(){
+  var data = fs.readFileSync(__dirname +  '/bin.babel.js');
+  data = toArray(data);
+  return data;
+  
+}
+
+function toArray(buffer) {
+    var view = new Uint8Array(buffer.length);
+    for (var i = 0; i < buffer.length; ++i) {
+        view[i] = buffer[i];
+    }
+    return view;
+}

data/test/signed_int_test/ruby_test/ruby_test.rb

@@ -0,0 +1,37 @@
+require_relative 'test_signed_int.rb'
+require 'minitest/autorun'
+
+class TestBabelTestBasic < MiniTest::Unit::TestCase
+
+  def test_signedInt
+    puts "Test Signed Int"
+    obj_ser = BabelTest::SignedInt.new
+    obj_ser.list1  = [-1, -2, -3, 2** (32-1)-1, 2** (32-1) - 2** 32]
+    obj_ser.list2  = [-1, -2, -3, 2** (54-1)-1, 2** (54-1) - 2** 54]
+    
+    ser = obj_ser.serialize
+    serialize(ser)
+    res = deserialize()
+
+    obj_deser = BabelTest::SignedInt.new
+    obj_deser.deserialize res
+    compare(obj_ser, obj_deser)
+    
+  end
+
+  def compare(obj_ser, obj_deser)
+    #puts "Ser = #{obj_ser.list1}, Deser = #{obj_deser.list1}"
+    assert_equal obj_ser.list1, obj_deser.list1
+  end
+
+  def serialize(data)
+    File.open("test/signed_int_test/ruby_test/bin.babel.rb", "w+b") do |f|
+      f.write(data)
+    end
+  end
+
+  def deserialize()
+    mem_buf = File.new('test/signed_int_test/ruby_test/bin.babel.rb').binmode
+  end
+
+end

data/test/signed_int_test/signed_int_test.rb

@@ -0,0 +1,15 @@
+
+require 'divine'
+
+struct 'SignedInt' do
+  list :list1, :sint32
+  list :list2, :sint64
+end
+
+if ARGV[0] == "ruby"
+  Divine::CodeGenerator.new.generate(:ruby, file: 'test_signed_int.rb', module: 'BabelTest', parent_class: "Object", target_dir: "test/signed_int_test/ruby_test")
+elsif ARGV[0] == "js"
+  Divine::CodeGenerator.new.generate(:javascript, file: 'test_signed_int.js', target_dir: "test/signed_int_test/js_test")
+elsif ARGV[0] == "java"
+  Divine::CodeGenerator.new.generate(:java, file: 'test_signed_int.java', target_dir: "test/signed_int_test/java_test")
+end

data/test/unify_test/unify_test.rb

@@ -1,17 +1,28 @@
+require 'minitest/autorun'
 
-require 'divine'
+class TestUnify < MiniTest::Unit::TestCase
 
-struct 'UnifySer' do
-  #int8  :i8
-  #int32 :i32
-  #int16 :i16
-  string :str
-  #ip_number :ip
-  #binary :guid
-  map :map1, :int8, :int32
-end
+  def test_unify
+    puts "Unify Test: Compare the produced binary files"
+    paths = [
+             	"test/binaryTree_test/",
+             	"test/complex_test/",
+        	"test/ipv6_test/",
+		"test/signed_int_test/"
+            ]
+    paths.each do |path|
+      ruby = readFile("#{path}ruby_test/bin.babel.rb")
+      js   = readFile("#{path}js_test/bin.babel.js")
+      java = readFile("#{path}java_test/bin.babel")
+	    
+      assert_equal ruby, js
+      assert_equal ruby, java
+    end
+  end
 
-Divine::CodeGenerator.new.generate(:ruby, file: 'test_unify.rb', module: 'BabelTest', parent_class: "Object")
-Divine::CodeGenerator.new.generate(:javascript, file: 'test_unify.js')
-Divine::CodeGenerator.new.generate(:java, file: 'test_unify.java')
+  def readFile(file)
+    data = File.new(file).binmode
+    data.read(data.size).each_byte.to_a
+  end
 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: divine
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -65,40 +65,28 @@ files:
 - lib/divine/version.rb
 - test/basic_complex_test/basic_complex_test.rb
 - test/basic_complex_test/java_test/JavaTest.java
-- test/basic_complex_test/java_test/test_babel.java
 - test/basic_complex_test/js_test/js_testBasic.js
 - test/basic_complex_test/js_test/js_testComplex.js
-- test/basic_complex_test/js_test/test_babel.js
 - test/basic_complex_test/ruby_test/ruby_test.rb
-- test/basic_complex_test/ruby_test/test_babel.rb
 - test/binaryTree_test/binaryTree_test.rb
 - test/binaryTree_test/java_test/JavaTest.java
-- test/binaryTree_test/java_test/test_binaryTree.java
 - test/binaryTree_test/js_test/js_test.js
-- test/binaryTree_test/js_test/test_binaryTree.js
 - test/binaryTree_test/ruby_test/ruby_test.rb
-- test/binaryTree_test/ruby_test/test_binaryTree.rb
 - test/complex_test/complex_test.rb
 - test/complex_test/java_test/JavaTest.java
-- test/complex_test/java_test/test_complex.java
 - test/complex_test/js_test/js_test.js
-- test/complex_test/js_test/test_complex.js
 - test/complex_test/ruby_test/ruby_test.rb
-- test/complex_test/ruby_test/test_complex.rb
 - test/ipv6_test/ipv6_test.rb
 - test/ipv6_test/java_test/JavaTest.java
-- test/ipv6_test/java_test/junit.jar
-- test/ipv6_test/java_test/test_ipv6.java
 - test/ipv6_test/js_test/js_test.js
-- test/ipv6_test/js_test/test_ipv6.js
 - test/ipv6_test/ruby_test/ruby_test.rb
-- test/ipv6_test/ruby_test/test_ipv6.rb
 - test/java_lib/junit.jar
-- test/unify_test/java_test/test_unify.java
-- test/unify_test/js_test/js_test.js
-- test/unify_test/js_test/test_unify.js
-- test/unify_test/ruby_test/ruby_test.rb
-- test/unify_test/ruby_test/test_unify.rb
+- test/signed_float_test/ruby_test/ruby_test.rb
+- test/signed_float_test/signed_float_test.rb
+- test/signed_int_test/java_test/JavaTest.java
+- test/signed_int_test/js_test/js_test.js
+- test/signed_int_test/ruby_test/ruby_test.rb
+- test/signed_int_test/signed_int_test.rb
 - test/unify_test/unify_test.rb
 homepage: https://github.com/franzen/babelphish
 licenses: []
@@ -127,38 +115,26 @@ summary: A simple data serialization generator for java, ruby and javascript
 test_files:
 - test/basic_complex_test/basic_complex_test.rb
 - test/basic_complex_test/java_test/JavaTest.java
-- test/basic_complex_test/java_test/test_babel.java
 - test/basic_complex_test/js_test/js_testBasic.js
 - test/basic_complex_test/js_test/js_testComplex.js
-- test/basic_complex_test/js_test/test_babel.js
 - test/basic_complex_test/ruby_test/ruby_test.rb
-- test/basic_complex_test/ruby_test/test_babel.rb
 - test/binaryTree_test/binaryTree_test.rb
 - test/binaryTree_test/java_test/JavaTest.java
-- test/binaryTree_test/java_test/test_binaryTree.java
 - test/binaryTree_test/js_test/js_test.js
-- test/binaryTree_test/js_test/test_binaryTree.js
 - test/binaryTree_test/ruby_test/ruby_test.rb
-- test/binaryTree_test/ruby_test/test_binaryTree.rb
 - test/complex_test/complex_test.rb
 - test/complex_test/java_test/JavaTest.java
-- test/complex_test/java_test/test_complex.java
 - test/complex_test/js_test/js_test.js
-- test/complex_test/js_test/test_complex.js
 - test/complex_test/ruby_test/ruby_test.rb
-- test/complex_test/ruby_test/test_complex.rb
 - test/ipv6_test/ipv6_test.rb
 - test/ipv6_test/java_test/JavaTest.java
-- test/ipv6_test/java_test/junit.jar
-- test/ipv6_test/java_test/test_ipv6.java
 - test/ipv6_test/js_test/js_test.js
-- test/ipv6_test/js_test/test_ipv6.js
 - test/ipv6_test/ruby_test/ruby_test.rb
-- test/ipv6_test/ruby_test/test_ipv6.rb
 - test/java_lib/junit.jar
-- test/unify_test/java_test/test_unify.java
-- test/unify_test/js_test/js_test.js
-- test/unify_test/js_test/test_unify.js
-- test/unify_test/ruby_test/ruby_test.rb
-- test/unify_test/ruby_test/test_unify.rb
+- test/signed_float_test/ruby_test/ruby_test.rb
+- test/signed_float_test/signed_float_test.rb
+- test/signed_int_test/java_test/JavaTest.java
+- test/signed_int_test/js_test/js_test.js
+- test/signed_int_test/ruby_test/ruby_test.rb
+- test/signed_int_test/signed_int_test.rb
 - test/unify_test/unify_test.rb