Changeset 79 for java/main/src/test

Timestamp:

01/09/13 13:00:20 (12 years ago)

Author:

psniegowski

Message:

Simplify f0 class organization.

File:

• java/main/src/test/java/com/framsticks/parsers/F0ParserTest.java (modified) (2 diffs)

java/main/src/test/java/com/framsticks/parsers/F0ParserTest.java

@@ -39 +39 @@
                 {
                         assertEquals(12, accesses.size());
-                        assertTrue(accesses.get(0).getSelected() instanceof F0Genotype);
+                        assertTrue(accesses.get(0).getSelected() instanceof Model);
                         assertEquals("1,2,3,\"dsadsa,,,,", accesses.get(5).get("i", String.class));
                         assertEquals("|:p=0.25,r=1", accesses.get(7).get("d", String.class));
@@ -52 +52 @@
                 }
 
-                F0Genotype f0Genotype = Genotype.build(objects);
+                Model model = Model.build(objects);
                 {
-                        assertEquals(3, f0Genotype.getParts().size());
-                        assertEquals(6, f0Genotype.getNeuroDefs().size());
-                        assertEquals(2, f0Genotype.getJoints().size());
+                        assertEquals(3, model.getParts().size());
+                        assertEquals(6, model.getNeuroDefs().size());
+                        assertEquals(2, model.getJoints().size());
 
-                        assertEquals(new Integer(0), f0Genotype.getJoints().get(0).part1);
-                        assertEquals(new Integer(1), f0Genotype.getJoints().get(0).part2);
-                        assertEquals(new Integer(1), f0Genotype.getNeuroDefs().get(0).part);
-                        assertEquals(new Integer(-1), f0Genotype.getNeuroDefs().get(0).joint);
-                        assertEquals("|:p=0.25,r=1", f0Genotype.getNeuroDefs().get(1).details);
-                        assertEquals("N", f0Genotype.getNeuroDefs().get(3).details);
-                        assertEquals(new Integer(-1), f0Genotype.getNeuroDefs().get(4).part);
+                        assertEquals(new Integer(0), model.getJoints().get(0).part1);
+                        assertEquals(new Integer(1), model.getJoints().get(0).part2);
+                        assertEquals(new Integer(1), model.getNeuroDefs().get(0).part);
+                        assertEquals(new Integer(-1), model.getNeuroDefs().get(0).joint);
+                        assertEquals("|:p=0.25,r=1", model.getNeuroDefs().get(1).details);
+                        assertEquals("N", model.getNeuroDefs().get(3).details);
+                        assertEquals(new Integer(-1), model.getNeuroDefs().get(4).part);
+
+                        assertEquals(2.0, model.getParts().get(1).getPosition().x, 0.0);
+                        assertTrue(model.getParts().get(2).getPosition().sub(new Point3d(2.27236, -0.0792596, -0.958924)).length() < 0.0001);
+                        assertTrue(model.getParts().get(2).getOrientation().y.sub(new Point3d(0.870277, -0.404792, 0.280644)).length() < 0.0001);
                 }
 
-                F0Model f0model = F0Model.build(f0Genotype);
-                {
-                        assertEquals(2.0, f0model.getMechParts().get(1).getPosition().x, 0.0);
-                        assertTrue(f0model.getMechParts().get(2).getPosition().sub(new Point3d(2.27236, -0.0792596, -0.958924)).length() < 0.0001);
-                        assertTrue(f0model.getMechParts().get(2).getOrientation().y.sub(new Point3d(0.870277, -0.404792, 0.280644)).length() < 0.0001);
-                }
 
         }