fix: all tests working. Error in pysat

flamapy · Jun 5, 2023 · 847ea04 · 847ea04
1 parent 9e43c56
commit 847ea04
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 11 deletions.
diff --git a/flamapy/interfaces/python/FLAMAFeatureModel.py b/flamapy/interfaces/python/FLAMAFeatureModel.py
@@ -215,12 +215,18 @@ def error_detection(self):
         Errors can include things like dead features, false optional features, or 
         contradictions in the constraints.
         """
-        try:
-            self._transform_to_sat()
-            errors = self.dm.use_operation(self.sat_model,'Glucose3ErrorDetection').get_result()
-            return errors
-        except:
-            return False
+        #try:
+        self._transform_to_sat()
+            #errors = self.dm.use_operation(self.sat_model,'Glucose3ErrorDetection').get_result()
+
+        operation = self.dm.get_operation(self.sat_model,'Glucose3ErrorDetection')
+        operation.feature_model=self.fm_model
+        operation.execute(self.sat_model)
+        result = operation.get_result()
+
+        return result
+        #except:
+        #    return False
 
     def false_optional_features(self):
         """
@@ -230,7 +236,12 @@ def false_optional_features(self):
         """
         try:
             self._transform_to_sat()
-            features = self.dm.use_operation(self.sat_model,'Glucose3FalseOptionalFeatures').get_result()
+
+            operation = self.dm.get_operation(self.sat_model,'Glucose3FalseOptionalFeatures')
+            operation.feature_model=self.fm_model
+            operation.execute(self.sat_model)
+            features = operation.get_result()
+
             false_optional_features = []
             for feature in features:
                 false_optional_features.append(feature.name)

diff --git a/resources/configurations/invalid_configuration.csvconf b/resources/configurations/invalid_configuration.csvconf
@@ -0,0 +1,11 @@
+eCommerce,False
+Server,False
+PHP,False
+v74,True
+Storage,False
+Catalog,True
+Shopping,False
+Cart,False
+Payment,False
+Security,False
+HIGH,False
diff --git a/resources/configurations/valid_configuration.csvconf b/resources/configurations/valid_configuration.csvconf
@@ -0,0 +1,16 @@
+eCommerce,True
+Server,True
+PHP,True
+v74,True
+Storage,True
+LOW,True
+Web,True
+Catalog,True
+Search,True
+BASIC,True
+Shopping,True
+Cart,True
+Payment,True
+PayPal,True
+Security,True
+HIGH,True
diff --git a/resources/models/invalid_model.uvl b/resources/models/invalid_model.uvl
@@ -0,0 +1,46 @@
+features
+    eCommerce { abstract }
+        mandatory
+            Server { abstract }
+                mandatory
+                    PHP
+                        mandatory
+                            v74
+                    Storage
+                        alternative
+                            LOW
+                            ENOUGH
+            Web { abstract }
+                mandatory
+                    Catalog
+                    Search
+                        alternative
+                            BASIC
+                            ADVANCED
+                    Shopping 
+                        mandatory
+                            Cart
+                            Payment
+                                or
+                                    PayPal
+                                    CreditCard
+                                    Mobile
+                    Security
+                        alternative
+                            HIGH
+                            STANDARD
+                optional
+                    Backup
+                    Marketing
+                        optional
+                            SEO
+                            Socials
+                                or
+                                    Twitter
+                                    Facebook
+                                    YouTube
+constraints
+    CreditCard => HIGH
+    Mobile => HIGH
+    LOW => !Backup
+    eCommerce excludes Server
diff --git a/resources/products/invalid_product.csv → resources/products/invalid_product.csvconf b/resources/products/invalid_product.csv → resources/products/invalid_product.csvconf
diff --git a/resources/products/valid_product.csv → resources/products/valid_product.csvconf b/resources/products/valid_product.csv → resources/products/valid_product.csvconf
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="flamapy-fm-dist",
-    version="1.0.0.dev3",
+    version="1.0.0.dev4",
     author="Flamapy",
     author_email="flamapy@us.es",
     description="Flamapy feature model is a distribution of the flama framework containing all plugins required to analyze feature models. It also offers a richier API and a complete command line interface and documentation.",

diff --git a/tests/test_units.py b/tests/test_units.py
@@ -1,11 +1,11 @@
 import sys
 import warnings
 import pytest
-from operations.FLAMAFeatureModel import FLAMAFeatureModel
+from flamapy.interfaces.python.FLAMAFeatureModel import FLAMAFeatureModel
 sys.path.append(".")
 
 VALID_MODEL = "./resources/models/valid_model.uvl"
-NON_VALID_MODEL = "./resources/models/non_valid_model.uvl"
+NON_VALID_MODEL = "./resources/models/invalid_model.uvl"
 
 VALID_CONFIG = "./resources/configurations/valid_configuration.csvconf"
 def test_atomic_sets():
@@ -122,7 +122,7 @@ def test_dead_features():
 
 def test_error_detection():
     # Prepare
-    flamafm=FLAMAFeatureModel(VALID_MODEL)
+    flamafm=FLAMAFeatureModel(NON_VALID_MODEL)
 
     # Act
     result = flamafm.error_detection()