Moving the regression test to mohawk.test; formatting the regression tests;...

Moving the regression test to mohawk.test; formatting the regression tests; changed positive3 to Ahn's test and positive4 to one of the converted files from NSA

build.xml

 <!--
 	@author Karthick Jayaraman, Jonathan Shahen
 -->
-<project name="mohawk" default="dist" basedir=".">
+<project name="mohawk-2.0" default="dist" basedir=".">
 	<description>Mohawk Tool Implementation.</description>
 
 	<!-- Properties for the JAR file -->
@@ -91,8 +91,8 @@
 
 	<target name="regression" depends="dist" description="Performs a regression test">
 		<!-- @author Jonathan Shahen -->
-		<junit haltonfailure="true" printsummary="true">
-			<test name="mohawk.testing.MohawkRegressionTests" />
+		<junit fork="yes" dir="." haltonfailure="true" printsummary="true">
+			<test name="mohawk.test.MohawkRegressionTests" />
 			<formatter type="plain" usefile="false" />
 			<classpath refid="test.classpath" />
 		</junit>

data/regressiontests/positive1.spec

@@ -2,11 +2,23 @@ Roles role0 role1 role2 role3;
 
 Users user0 user1 user2 user3 user4;
 
-UA <user4,role3>;
+UA
+	<user4,role3>;
 
-CR <FALSE,role0> <FALSE,role2>;
+CR
+	<FALSE,role0>
+	<FALSE,role2>;
 
-CA <role3,role2,role0> <role3,role2&role1,role0> <role3,role2&role0,role1> <role3,TRUE,role1> <role3,role0,role1> <role3,role1&role0,role2> <role3,role0,role2> <role3,role1,role2> <role3,TRUE,role2>;
+CA
+	<role3,role2,role0>
+	<role3,role2&role1,role0>
+	<role3,role2&role0,role1>
+	<role3,TRUE,role1>
+	<role3,role0,role1>
+	<role3,role1&role0,role2>
+	<role3,role0,role2>
+	<role3,role1,role2>
+	<role3,TRUE,role2>;
 
 ADMIN user4;
 

src/mohawk/testing/MohawkRegressionTests.java → src/mohawk/test/MohawkRegressionTests.java

-package mohawk.testing;
+package mohawk.test;
 
 import static org.junit.Assert.assertEquals;
-import mohawk.MohawkInstance;
-import mohawk.global.results.ExecutionResult;
 
 import org.junit.Test;
 
+import mohawk.MohawkInstance;
+import mohawk.global.results.ExecutionResult;
+
 /**
  * Run these JUnit tests before adding any branch to master
  * 
@@ -14,7 +15,7 @@ import org.junit.Test;
  */
 
 public class MohawkRegressionTests {
-    private String defaultParameters = "-loglevel debug -logfile n";
+    private String defaultParameters = "-loglevel quiet -logfile n";
 
     @Test
     public void runPositive1() {