fixed false positives of NPEfix on repogit4test data

SpoonLabs · Jul 16, 2019 · 471d01d · 471d01d
1 parent db52712
commit 471d01d
Show file tree

Hide file tree

Showing 15 changed files with 80 additions and 178 deletions.
diff --git a/all_instances_found.json b/all_instances_found.json
diff --git a/src/main/java/fr/inria/coming/repairability/repairtools/NPEfix.java b/src/main/java/fr/inria/coming/repairability/repairtools/NPEfix.java
@@ -28,9 +28,16 @@
 public class NPEfix extends AbstractRepairTool {
 
     private static final String[] patternFileNames = {
-            "replacement.xml",
+            "replacement3.xml",
             "replacement2.xml",
-            "replacement3.xml"
+            "replacement.xml",
+            "replacement4.xml",
+            "replacement5.xml",
+            "replacement6.xml",
+            "replacement7.xml",
+            "replacement8.xml",
+            "replacement9.xml",
+            "replacement11.xml"
     };
 
     /**

diff --git a/src/main/resources/repairability/NPEfix/replacement.xml b/src/main/resources/repairability/NPEfix/replacement.xml
@@ -1,6 +1,7 @@
-<pattern name="replacement">
-    <entity id="1" type="*" />
+<pattern name="replacement1">
+    <entity id="1" type="Assignment" />
     <action entityId="1" type="INS"/>
 
 </pattern>
 
+
diff --git a/src/main/resources/repairability/NPEfix/replacement11.xml b/src/main/resources/repairability/NPEfix/replacement11.xml
@@ -0,0 +1,7 @@
+<pattern name="replacement11">
+    <entity id="1" type="Literal"/>
+    <action entityId="1" type="UPD"/>
+
+</pattern>
+
+
diff --git a/src/main/resources/repairability/NPEfix/replacement2.xml b/src/main/resources/repairability/NPEfix/replacement2.xml
@@ -1,6 +1,7 @@
-<pattern name="replacement">
-    <entity id="1" type="*"/>
+<pattern name="replacement2">
+    <entity id="1" type="Assignment"/>
     <action entityId="1" type="UPD"/>
 
 </pattern>
 
+
diff --git a/src/main/resources/repairability/NPEfix/replacement3.xml b/src/main/resources/repairability/NPEfix/replacement3.xml
@@ -1,4 +1,4 @@
-<pattern name="replacement">
+<pattern name="replacement3">
     <entity id="1" type="Return" role="Statement"/>
     <action entityId="1" type="INS"/>
 

diff --git a/src/main/resources/repairability/NPEfix/replacement4.xml b/src/main/resources/repairability/NPEfix/replacement4.xml
@@ -0,0 +1,7 @@
+<pattern name="replacement4">
+    <entity id="1" type="Assignment" />
+    <action entityId="1" type="MOV"/>
+
+</pattern>
+
+
diff --git a/src/main/resources/repairability/NPEfix/replacement5.xml b/src/main/resources/repairability/NPEfix/replacement5.xml
@@ -0,0 +1,7 @@
+<pattern name="replacement5">
+    <entity id="1" type="VariableRead" />
+    <action entityId="1" type="UPD"/>
+
+</pattern>
+
+
diff --git a/src/main/resources/repairability/NPEfix/replacement6.xml b/src/main/resources/repairability/NPEfix/replacement6.xml
@@ -0,0 +1,10 @@
+<pattern name="replacement6">
+    <entity id="1" type="FieldRead"/>
+    <action entityId="1" type="INS"/>
+
+    <entity id="2" type="*"/>
+    <action entityId="2" type="DEL"/>
+
+</pattern>
+
+
diff --git a/src/main/resources/repairability/NPEfix/replacement7.xml b/src/main/resources/repairability/NPEfix/replacement7.xml
@@ -0,0 +1,10 @@
+<pattern name="replacement7">
+    <entity id="1" type="FieldRead"/>
+    <action entityId="1" type="MOV"/>
+
+    <entity id="2" type="*"/>
+    <action entityId="2" type="DEL"/>
+
+</pattern>
+
+
diff --git a/src/main/resources/repairability/NPEfix/replacement8.xml b/src/main/resources/repairability/NPEfix/replacement8.xml
@@ -0,0 +1,10 @@
+<pattern name="replacement8">
+    <entity id="1" type="Invocation"/>
+    <action entityId="1" type="INS"/>
+
+    <entity id="2" type="*"/>
+    <action entityId="2" type="DEL"/>
+
+</pattern>
+
+
diff --git a/src/main/resources/repairability/NPEfix/replacement9.xml b/src/main/resources/repairability/NPEfix/replacement9.xml
@@ -0,0 +1,10 @@
+<pattern name="replacement9">
+    <entity id="1" type="VariableRead"/>
+    <action entityId="1" type="INS"/>
+
+    <entity id="2" type="*"/>
+    <action entityId="2" type="DEL"/>
+
+</pattern>
+
+
diff --git a/src/main/resources/repairability_test_files/NPEfix/NPEfix12/twelve/NPEfix12_twelve_t.java b/src/main/resources/repairability_test_files/NPEfix/NPEfix12/twelve/NPEfix12_twelve_t.java
@@ -1,4 +1,4 @@
-/*
+ /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.

diff --git a/src/test/java/fr/inria/coming/spoon/repairability/RepairabilityTest.java b/src/test/java/fr/inria/coming/spoon/repairability/RepairabilityTest.java
@@ -28,7 +28,7 @@ public void testRepairabilityInterface() throws Exception {
     public void testRepairabilityAll() throws Exception {
 
         FinalResult result = TestUtills.runRepairability("ALL", "/repairability_test_files/mixed/");
-        TestUtills.numberOfInstances(result, 2, 5);
+        TestUtills.numberOfInstances(result, 2, 3);
     }
 
     @Test

diff --git a/src/test/java/fr/inria/coming/spoon/repairability/repairtools/NPEfixTest.java b/src/test/java/fr/inria/coming/spoon/repairability/repairtools/NPEfixTest.java
@@ -10,7 +10,7 @@ public class NPEfixTest {
     @Test
     public void NPEfixTest() throws Exception {
         FinalResult result = TestUtills.runRepairability("NPEfix", "/repairability_test_files/NPEfix/");
-        TestUtills.numberOfInstances(result, 18, 18);
+        TestUtills.numberOfInstances(result, 18, 16);
     }
 
 //    @Test