Laundry pass on /bugs to make them work the same in java, cpp & csharp

Signed-off-by: mmazas <mmazas@ITEM-S104678.emea.msad.sopra>
javacc · Sep 4, 2024 · b8bffb1 · b8bffb1
1 parent b21b9f6
commit b8bffb1
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 59 deletions.
diff --git a/bugs/bug001/test/clc1.exp_err → bugs/bug001/files/clc1.exp_err b/bugs/bug001/test/clc1.exp_err → bugs/bug001/files/clc1.exp_err
diff --git a/bugs/bug001/test/clc1.exp_out → bugs/bug001/files/clc1.exp_out b/bugs/bug001/test/clc1.exp_out → bugs/bug001/files/clc1.exp_out
diff --git a/bugs/bug001/test/clc1.in → bugs/bug001/files/clc1.in b/bugs/bug001/test/clc1.in → bugs/bug001/files/clc1.in
diff --git a/bugs/bug001/test/clc2.exp_err → bugs/bug001/files/clc2.exp_err b/bugs/bug001/test/clc2.exp_err → bugs/bug001/files/clc2.exp_err
diff --git a/bugs/bug001/test/clc2.exp_out → bugs/bug001/files/clc2.exp_out b/bugs/bug001/test/clc2.exp_out → bugs/bug001/files/clc2.exp_out
diff --git a/bugs/bug001/test/clc2.in → bugs/bug001/files/clc2.in b/bugs/bug001/test/clc2.in → bugs/bug001/files/clc2.in
diff --git a/bugs/bug001/pom.xml b/bugs/bug001/pom.xml
@@ -88,9 +88,9 @@ THE POSSIBILITY OF SUCH DAMAGE.
             <configuration>
               <mainClass>clc.ComplexLineComment</mainClass>
               <arguments>
-                <argument>${project.basedir}/test/clc1.in2</argument>
-                <argument>${project.basedir}/test/clc1.out</argument>
-                <argument>${project.basedir}/test/clc1.err</argument>
+                <argument>${project.basedir}/files/clc1.in2</argument>
+                <argument>${project.basedir}/files/clc1.out</argument>
+                <argument>${project.basedir}/files/clc1.err</argument>
               </arguments>
             </configuration>
           </execution>
@@ -103,9 +103,9 @@ THE POSSIBILITY OF SUCH DAMAGE.
             <configuration>
               <mainClass>clc.ComplexLineComment</mainClass>
               <arguments>
-                <argument>${project.basedir}/test/clc2.in</argument>
-                <argument>${project.basedir}/test/clc2.out</argument>
-                <argument>${project.basedir}/test/clc2.err</argument>
+                <argument>${project.basedir}/files/clc2.in</argument>
+                <argument>${project.basedir}/files/clc2.out</argument>
+                <argument>${project.basedir}/files/clc2.err</argument>
               </arguments>
             </configuration>
           </execution>
@@ -127,33 +127,33 @@ THE POSSIBILITY OF SUCH DAMAGE.
               <skip>false</skip>
               <target unless="maven.test.skip">
                 <!-- out -->
-                <available file="${project.basedir}/test/clc1.out" property="isActualOutAvailable" />
+                <available file="${project.basedir}/files/clc1.out" property="isActualOutAvailable" />
                 <fail unless="isActualOutAvailable"
-                  message="${project.basedir}/test/clc1.out does not exist!" />
-                <available file="${project.basedir}/test/clc1.exp_out"
+                  message="${project.basedir}/files/clc1.out does not exist!" />
+                <available file="${project.basedir}/files/clc1.exp_out"
                   property="isExpectedOutAvailable" />
                 <fail unless="isExpectedOutAvailable"
-                  message="${project.basedir}/test/clc1.exp_out does not exist!" />
+                  message="${project.basedir}/files/clc1.exp_out does not exist!" />
                 <condition property="out.files.match">
-                  <filesmatch textfile="true" file1="${project.basedir}/test/clc1.out"
-                    file2="${project.basedir}/test/clc1.exp_out" />
+                  <filesmatch textfile="true" file1="${project.basedir}/files/clc1.out"
+                    file2="${project.basedir}/files/clc1.exp_out" />
                 </condition>
                 <fail unless="out.files.match"
-                  message="${project.basedir}/test/clc1.out does not match ${project.basedir}/test/clc1.exp_out!" />
+                  message="${project.basedir}/files/clc1.out does not match ${project.basedir}/files/clc1.exp_out!" />
                 <!-- err -->
-                <available file="${project.basedir}/test/clc1.err" property="isActualErrAvailable" />
+                <available file="${project.basedir}/files/clc1.err" property="isActualErrAvailable" />
                 <fail unless="isActualErrAvailable"
-                  message="${project.basedir}/test/clc1.err does not exist!" />
-                <available file="${project.basedir}/test/clc1.exp_err"
+                  message="${project.basedir}/files/clc1.err does not exist!" />
+                <available file="${project.basedir}/files/clc1.exp_err"
                   property="isExpectedErrAvailable" />
                 <fail unless="isExpectedErrAvailable"
-                  message="${project.basedir}/test/clc1.exp_err does not exist!" />
+                  message="${project.basedir}/files/clc1.exp_err does not exist!" />
                 <condition property="err.files.match">
-                  <filesmatch textfile="true" file1="${project.basedir}/test/clc1.err"
-                    file2="${project.basedir}/test/clc1.exp_err" />
+                  <filesmatch textfile="true" file1="${project.basedir}/files/clc1.err"
+                    file2="${project.basedir}/files/clc1.exp_err" />
                 </condition>
                 <fail unless="err.files.match"
-                  message="${project.basedir}/test/clc1.err does not match ${project.basedir}/test/clc1.exp_err!" />
+                  message="${project.basedir}/files/clc1.err does not match ${project.basedir}/files/clc1.exp_err!" />
               </target>
             </configuration>
           </execution>
@@ -167,32 +167,32 @@ THE POSSIBILITY OF SUCH DAMAGE.
               <skip>false</skip>
               <target unless="maven.test.skip">
                 <!-- out -->
-                <available file="${project.basedir}/test/clc2.out" property="isActualAvailable" />
+                <available file="${project.basedir}/files/clc2.out" property="isActualAvailable" />
                 <fail unless="isActualAvailable"
-                  message="${project.basedir}/test/clc2.out does not exist!" />
-                <available file="${project.basedir}/test/clc2.ref" property="isExpectedAvailable" />
+                  message="${project.basedir}/files/clc2.out does not exist!" />
+                <available file="${project.basedir}/files/clc2.exp_out" property="isExpectedAvailable" />
                 <fail unless="isExpectedAvailable"
-                  message="${project.basedir}/test/clc2.ref does not exist!" />
+                  message="${project.basedir}/files/clc2.exp_out does not exist!" />
                 <condition property="files.match">
-                  <filesmatch textfile="true" file1="${project.basedir}/test/clc2.out"
-                    file2="${project.basedir}/test/clc2.ref" />
+                  <filesmatch textfile="true" file1="${project.basedir}/files/clc2.out"
+                    file2="${project.basedir}/files/clc2.exp_out" />
                 </condition>
                 <fail unless="files.match"
-                  message="${project.basedir}/test/clc2.out does not match ${project.basedir}/test/clc2.ref!" />
+                  message="${project.basedir}/files/clc2.out does not match ${project.basedir}/files/clc2.exp_out!" />
                 <!-- err -->
-                <available file="${project.basedir}/test/clc2.err" property="isActualErrAvailable" />
+                <available file="${project.basedir}/files/clc2.err" property="isActualErrAvailable" />
                 <fail unless="isActualErrAvailable"
-                  message="${project.basedir}/test/clc2.err does not exist!" />
-                <available file="${project.basedir}/test/clc2.exp_err"
+                  message="${project.basedir}/files/clc2.err does not exist!" />
+                <available file="${project.basedir}/files/clc2.exp_err"
                   property="isExpectedErrAvailable" />
                 <fail unless="isExpectedErrAvailable"
-                  message="${project.basedir}/test/clc2.exp_err does not exist!" />
+                  message="${project.basedir}/files/clc2.exp_err does not exist!" />
                 <condition property="err.files.match">
-                  <filesmatch textfile="true" file1="${project.basedir}/test/clc2.err"
-                    file2="${project.basedir}/test/clc2.exp_err" />
+                  <filesmatch textfile="true" file1="${project.basedir}/files/clc2.err"
+                    file2="${project.basedir}/files/clc2.exp_err" />
                 </condition>
                 <fail unless="err.files.match"
-                  message="${project.basedir}/test/clc2.err does not match ${project.basedir}/test/clc2.exp_err!" />
+                  message="${project.basedir}/files/clc2.err does not match ${project.basedir}/files/clc2.exp_err!" />
               </target>
             </configuration>
           </execution>

diff --git a/bugs/bug001/test/clc1.out b/bugs/bug001/test/clc1.out
diff --git a/bugs/bug001/test/clc2.ref b/bugs/bug001/test/clc2.ref
diff --git a/bugs/bug002/test/bug.exp_err → bugs/bug002/files/bug.exp_err b/bugs/bug002/test/bug.exp_err → bugs/bug002/files/bug.exp_err
diff --git a/bugs/bug002/test/bug.exp_out → bugs/bug002/files/bug.exp_out b/bugs/bug002/test/bug.exp_out → bugs/bug002/files/bug.exp_out
diff --git a/bugs/bug002/test/bug.in → bugs/bug002/files/bug.in b/bugs/bug002/test/bug.in → bugs/bug002/files/bug.in
diff --git a/bugs/bug002/pom.xml b/bugs/bug002/pom.xml
@@ -88,15 +88,16 @@ THE POSSIBILITY OF SUCH DAMAGE.
             <configuration>
               <mainClass>Bug</mainClass>
               <arguments>
-                <argument>${project.basedir}/test/bug.in</argument>
-                <argument>${project.basedir}/test/bug.out</argument>
-                <argument>${project.basedir}/test/bug.err</argument>
+                <argument>${project.basedir}/files/bug.in</argument>
+                <argument>${project.basedir}/files/bug.out</argument>
+                <argument>${project.basedir}/files/bug.err</argument>
               </arguments>
             </configuration>
           </execution>
         </executions>
       </plugin>
 
+      <!-- check the tests results -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -110,33 +111,33 @@ THE POSSIBILITY OF SUCH DAMAGE.
             <configuration>
               <target unless="maven.test.skip">
                 <!-- out -->
-                <available file="${project.basedir}/test/bug.out" property="isActualOutAvailable" />
+                <available file="${project.basedir}/files/bug.out" property="isActualOutAvailable" />
                 <fail unless="isActualOutAvailable"
-                  message="${project.basedir}/test/bug.out does not exist!" />
-                <available file="${project.basedir}/test/bug.exp_out"
+                  message="${project.basedir}/files/bug.out does not exist!" />
+                <available file="${project.basedir}/files/bug.exp_out"
                   property="isExpectedOutAvailable" />
                 <fail unless="isExpectedOutAvailable"
-                  message="${project.basedir}/test/bug.exp_out does not exist!" />
+                  message="${project.basedir}/files/bug.exp_out does not exist!" />
                 <condition property="out.files.match">
-                  <filesmatch textfile="true" file1="${project.basedir}/test/bug.out"
-                    file2="${project.basedir}/test/bug.exp_out" />
+                  <filesmatch textfile="true" file1="${project.basedir}/files/bug.out"
+                    file2="${project.basedir}/files/bug.exp_out" />
                 </condition>
                 <fail unless="out.files.match"
-                  message="${project.basedir}/test/bug.out does not match ${project.basedir}/test/bug.exp_out!" />
+                  message="${project.basedir}/files/bug.out does not match ${project.basedir}/files/bug.exp_out!" />
                 <!-- err -->
-                <available file="${project.basedir}/test/bug.err" property="isActualErrAvailable" />
+                <available file="${project.basedir}/files/bug.err" property="isActualErrAvailable" />
                 <fail unless="isActualErrAvailable"
-                  message="${project.basedir}/test/bug.err does not exist!" />
-                <available file="${project.basedir}/test/bug.exp_err"
+                  message="${project.basedir}/files/bug.err does not exist!" />
+                <available file="${project.basedir}/files/bug.exp_err"
                   property="isExpectedErrAvailable" />
                 <fail unless="isExpectedErrAvailable"
-                  message="${project.basedir}/test/bug.exp_err does not exist!" />
+                  message="${project.basedir}/files/bug.exp_err does not exist!" />
                 <condition property="err.files.match">
-                  <filesmatch textfile="true" file1="${project.basedir}/test/bug.err"
-                    file2="${project.basedir}/test/bug.exp_err" />
+                  <filesmatch textfile="true" file1="${project.basedir}/files/bug.err"
+                    file2="${project.basedir}/files/bug.exp_err" />
                 </condition>
                 <fail unless="err.files.match"
-                  message="${project.basedir}/test/bug.err does not match ${project.basedir}/test/bug.exp_err!" />
+                  message="${project.basedir}/files/bug.err does not match ${project.basedir}/files/bug.exp_err!" />
               </target>
             </configuration>
           </execution>