change internal process method, which introducing ExtractionResultSet

[stigmata/stigmata.git] / src / test / java / jp / naist / se / stigmata / birthmarks / cvfv / CVFVBirthmarkExtractorTest.java

diff --git a/src/test/java/jp/naist/se/stigmata/birthmarks/cvfv/CVFVBirthmarkExtractorTest.java b/src/test/java/jp/naist/se/stigmata/birthmarks/cvfv/CVFVBirthmarkExtractorTest.java
index b1dc532..dae216e 100755 (executable)
--- a/src/test/java/jp/naist/se/stigmata/birthmarks/cvfv/CVFVBirthmarkExtractorTest.java
+++ b/src/test/java/jp/naist/se/stigmata/birthmarks/cvfv/CVFVBirthmarkExtractorTest.java
@@ -4,15 +4,17 @@ package jp.naist.se.stigmata.birthmarks.cvfv;
  * $Id$\r
  */\r
 \r
-import org.junit.Assert;\r
-import org.junit.Before;\r
-import org.junit.Test;\r
-\r
 import jp.naist.se.stigmata.Birthmark;\r
+import jp.naist.se.stigmata.BirthmarkContext;\r
 import jp.naist.se.stigmata.BirthmarkElement;\r
 import jp.naist.se.stigmata.BirthmarkSet;\r
+import jp.naist.se.stigmata.ExtractionResultSet;\r
 import jp.naist.se.stigmata.Stigmata;\r
 \r
+import org.junit.Assert;\r
+import org.junit.Before;\r
+import org.junit.Test;\r
+\r
 /**\r
  *\r
  * @author Haruaki TAMADA\r
@@ -20,25 +22,29 @@ import jp.naist.se.stigmata.Stigmata;
  */\r
 public class CVFVBirthmarkExtractorTest{\r
     private Stigmata stigmata;\r
+    private BirthmarkContext context;\r
 \r
     @Before\r
     public void setup(){\r
         stigmata = Stigmata.getInstance();\r
+        context = stigmata.createContext();\r
+        context.addExtractionType("cvfv");\r
     }\r
 \r
     @Test\r
     public void checkCVFVBirthmark() throws Exception{\r
-        BirthmarkSet[] array = stigmata.extract(\r
-            new String[] { "cvfv", },\r
-            new String[] { "target/classes/jp/naist/se/stigmata/Stigmata.class", }\r
+        ExtractionResultSet ers = stigmata.createEngine().extract(\r
+            new String[] { "target/classes/jp/naist/se/stigmata/Stigmata.class", },\r
+            context\r
         );\r
+        BirthmarkSet[] array = ers.getBirthmarkSets();\r
 \r
         Assert.assertEquals(1, array.length);\r
         Assert.assertNotNull(array[0].getBirthmark("cvfv"));\r
 \r
         Birthmark birthmark = array[0].getBirthmark("cvfv");\r
         Assert.assertEquals("cvfv", birthmark.getType());\r
-        Assert.assertEquals(6, birthmark.getElementCount());\r
+        Assert.assertEquals(3, birthmark.getElementCount());\r
 \r
         BirthmarkElement[] elements = birthmark.getElements();\r
         Assert.assertEquals("jp.naist.se.stigmata.birthmarks.cvfv.TypeAndValueBirthmarkElement",\r
@@ -47,12 +53,6 @@ public class CVFVBirthmarkExtractorTest{
                             elements[1].getClass().getName());\r
         Assert.assertEquals("jp.naist.se.stigmata.birthmarks.cvfv.TypeAndValueBirthmarkElement",\r
                             elements[2].getClass().getName());\r
-        Assert.assertEquals("jp.naist.se.stigmata.birthmarks.cvfv.TypeAndValueBirthmarkElement",\r
-                            elements[3].getClass().getName());\r
-        Assert.assertEquals("jp.naist.se.stigmata.birthmarks.cvfv.TypeAndValueBirthmarkElement",\r
-                            elements[4].getClass().getName());\r
-        Assert.assertEquals("jp.naist.se.stigmata.birthmarks.cvfv.TypeAndValueBirthmarkElement",\r
-                            elements[5].getClass().getName());\r
 \r
         Assert.assertEquals("Ljp/naist/se/stigmata/Stigmata;",\r
                             ((TypeAndValueBirthmarkElement)elements[0]).getSignature());\r
@@ -62,33 +62,26 @@ public class CVFVBirthmarkExtractorTest{
                             ((TypeAndValueBirthmarkElement)elements[1]).getSignature());\r
         Assert.assertNull(((TypeAndValueBirthmarkElement)elements[1]).getValue());\r
 \r
-        Assert.assertEquals("Z",   ((TypeAndValueBirthmarkElement)elements[2]).getSignature());\r
-        Assert.assertEquals(0,     ((TypeAndValueBirthmarkElement)elements[2]).getValue());\r
-\r
-        Assert.assertEquals("Ljava/util/Stack;", ((TypeAndValueBirthmarkElement)elements[3]).getSignature());\r
-        Assert.assertNull(((TypeAndValueBirthmarkElement)elements[3]).getValue());\r
-\r
-        Assert.assertEquals("Ljp/naist/se/stigmata/event/WarningMessages;",\r
-                            ((TypeAndValueBirthmarkElement)elements[4]).getSignature());\r
-        Assert.assertNull(((TypeAndValueBirthmarkElement)elements[4]).getValue());\r
-\r
-        Assert.assertEquals("Ljava/util/List;", ((TypeAndValueBirthmarkElement)elements[5]).getSignature());\r
-        Assert.assertNull(((TypeAndValueBirthmarkElement)elements[5]).getValue());\r
+        Assert.assertEquals("Ljava/util/List;",\r
+                            ((TypeAndValueBirthmarkElement)elements[2]).getSignature());\r
+        Assert.assertNull(((TypeAndValueBirthmarkElement)elements[2]).getValue());\r
     }\r
 \r
     @Test\r
     public void checkCVFVBirthmark2() throws Exception{\r
-        BirthmarkSet[] array = stigmata.extract(\r
-            new String[] { "cvfv", },\r
-            new String[] { "target/classes/jp/naist/se/stigmata/RoundRobinComparisonResultSet.class", }\r
+        ExtractionResultSet ers = stigmata.createEngine().extract(\r
+            new String[] { "target/classes/jp/naist/se/stigmata/result/RoundRobinComparisonResultSet.class", },\r
+            context\r
         );\r
 \r
+        BirthmarkSet[] array = ers.getBirthmarkSets();\r
+\r
         Assert.assertEquals(array.length, 1);\r
         Assert.assertNotNull(array[0].getBirthmark("cvfv"));\r
 \r
         Birthmark birthmark = array[0].getBirthmark("cvfv");\r
         Assert.assertEquals(birthmark.getType(), "cvfv");\r
-        Assert.assertEquals(birthmark.getElementCount(), 6);\r
+        Assert.assertEquals(3, birthmark.getElementCount());\r
 \r
         BirthmarkElement[] elements = birthmark.getElements();\r
         Assert.assertEquals("jp.naist.se.stigmata.birthmarks.cvfv.TypeAndValueBirthmarkElement",\r
@@ -97,28 +90,12 @@ public class CVFVBirthmarkExtractorTest{
                             elements[1].getClass().getName());\r
         Assert.assertEquals("jp.naist.se.stigmata.birthmarks.cvfv.TypeAndValueBirthmarkElement",\r
                             elements[2].getClass().getName());\r
-        Assert.assertEquals("jp.naist.se.stigmata.birthmarks.cvfv.TypeAndValueBirthmarkElement",\r
-                            elements[3].getClass().getName());\r
-        Assert.assertEquals("jp.naist.se.stigmata.birthmarks.cvfv.TypeAndValueBirthmarkElement",\r
-                            elements[4].getClass().getName());\r
-        Assert.assertEquals("jp.naist.se.stigmata.birthmarks.cvfv.TypeAndValueBirthmarkElement",\r
-                            elements[5].getClass().getName());\r
 \r
-        Assert.assertEquals("Ljava/util/List;",\r
-                            ((TypeAndValueBirthmarkElement)elements[0]).getSignature());\r
-        Assert.assertEquals(null, ((TypeAndValueBirthmarkElement)elements[0]).getValue());\r
-        Assert.assertEquals("Ljava/util/List;",\r
-                            ((TypeAndValueBirthmarkElement)elements[1]).getSignature());\r
+        Assert.assertEquals("I",  ((TypeAndValueBirthmarkElement)elements[0]).getSignature());\r
+        Assert.assertEquals(-1,   ((TypeAndValueBirthmarkElement)elements[0]).getValue());\r
+        Assert.assertEquals("Z",  ((TypeAndValueBirthmarkElement)elements[1]).getSignature());\r
         Assert.assertEquals(null, ((TypeAndValueBirthmarkElement)elements[1]).getValue());\r
-        Assert.assertEquals("Ljp/naist/se/stigmata/BirthmarkEnvironment;",\r
-                            ((TypeAndValueBirthmarkElement)elements[2]).getSignature());\r
-        Assert.assertEquals(null, ((TypeAndValueBirthmarkElement)elements[2]).getValue());\r
-\r
-        Assert.assertEquals("I", ((TypeAndValueBirthmarkElement)elements[3]).getSignature());\r
-        Assert.assertEquals(1,   ((TypeAndValueBirthmarkElement)elements[3]).getValue());\r
-        Assert.assertEquals("Z", ((TypeAndValueBirthmarkElement)elements[4]).getSignature());\r
-        Assert.assertEquals(1,   ((TypeAndValueBirthmarkElement)elements[4]).getValue());\r
-        Assert.assertEquals("Z", ((TypeAndValueBirthmarkElement)elements[5]).getSignature());\r
-        Assert.assertEquals(0,   ((TypeAndValueBirthmarkElement)elements[5]).getValue());\r
+        Assert.assertEquals("Z",  ((TypeAndValueBirthmarkElement)elements[2]).getSignature());\r
+        Assert.assertEquals(0,    ((TypeAndValueBirthmarkElement)elements[2]).getValue());\r
     }\r
 }\r