Rework custom RequiredPredicate tests

marvinvo · Jan 14, 2024 · 9f6b1c9 · 9f6b1c9
1 parent 2e97837
commit 9f6b1c9
Show file tree

Hide file tree

Showing 13 changed files with 1,583 additions and 1,316 deletions.
diff --git a/CryptoAnalysis/src/main/resources/CostumClasses/Requires.crysl b/CryptoAnalysis/src/main/resources/CostumClasses/Requires.crysl
diff --git a/.../src/main/resources/CostumClasses/A.crysl → ...is/src/main/resources/CustomRules/A.crysl b/.../src/main/resources/CostumClasses/A.crysl → ...is/src/main/resources/CustomRules/A.crysl
@@ -1,11 +1,11 @@
-SPEC main.prefined.A
+SPEC tests.customrules.customclass.A
 
 OBJECTS
 	byte[] attr1;
 	byte[] attr2;
 	byte[] attr3;
-	main.prefined.B b;
-	main.prefined.C c;
+	tests.customrules.customclass.B b;
+	tests.customrules.customclass.C c;
 
 EVENTS
 	cons : A();
@@ -15,8 +15,8 @@ EVENTS
 	ens2 : b = ensurePred2OnReturnB();
 	ens3 : c = ensurePred1OnReturnC();
 	ens4 : c = ensurePred2OnReturnC();
-	ens5 : ensurePred1OnThis();
-	ens6 : ensurePred2OnThis();
+	ens5 : ensurePred1onThis();
+	ens6 : ensurePred2onThis();
 	ens7 : ensurePred1OnAttr1();
 	ens8 : ensurePred2OnAttr1();
 	ens9 : ensurePred1OnAttr2();

diff --git a/.../src/main/resources/CostumClasses/B.crysl → ...is/src/main/resources/CustomRules/B.crysl b/.../src/main/resources/CostumClasses/B.crysl → ...is/src/main/resources/CustomRules/B.crysl
@@ -1,11 +1,11 @@
-SPEC main.prefined.B
+SPEC tests.customrules.customclass.B
 
 OBJECTS
 	byte[] attr1;
 	byte[] attr2;
 	byte[] attr3;
-	main.prefined.A a;
-	main.prefined.C c;
+	tests.customrules.customclass.A a;
+	tests.customrules.customclass.C c;
 
 EVENTS
 	cons : B();

diff --git a/.../src/main/resources/CostumClasses/C.crysl → ...is/src/main/resources/CustomRules/C.crysl b/.../src/main/resources/CostumClasses/C.crysl → ...is/src/main/resources/CustomRules/C.crysl
@@ -1,11 +1,11 @@
-SPEC main.prefined.A
+SPEC tests.customrules.customclass.C
 
 OBJECTS
 	byte[] attr1;
 	byte[] attr2;
 	byte[] attr3;
-	main.prefined.B b;
-	main.prefined.A a;
+	tests.customrules.customclass.B b;
+	tests.customrules.customclass.A a;
 
 EVENTS
 	cons : C();