Commit 4438255e authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Move public tests to a different package to verify class availability. 

Because public api tests where in the same package, various important
API components were not public and caused issues.  Fix by moving them
to a more appropriate place.


git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/branches/TableTool_javization@9654 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent 1fbe2092

Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/AppTest.java→Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/test/AppTest.java

+1 −1
Original line number Diff line number Diff line 
package ca.mcmaster.cas.matlab2smt;

package ca.mcmaster.cas.matlab2smt.test;



import junit.framework.Test;

import junit.framework.TestCase;

Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/MatlabLiteralTest.java→Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/test/MatlabLiteralTest.java

+4 −1
Original line number Diff line number Diff line
@@ -2,8 +2,11 @@ 
 * To change this template, choose Tools | Templates

 * and open the template in the editor.

 */

package ca.mcmaster.cas.matlab2smt;

package ca.mcmaster.cas.matlab2smt.test;



import ca.mcmaster.cas.matlab2smt.MatlabLiteral;

import ca.mcmaster.cas.matlab2smt.RealVariableType;

import ca.mcmaster.cas.matlab2smt.VariableType;

import org.junit.After;

import org.junit.AfterClass;

import org.junit.Before;

Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/MatlabParserTest.java→Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/test/MatlabParserTest.java

+7 −3
Original line number Diff line number Diff line
@@ -2,8 +2,14 @@ 
 * To change this template, choose Tools | Templates

 * and open the template in the editor.

 */

package ca.mcmaster.cas.matlab2smt;

package ca.mcmaster.cas.matlab2smt.test;



import ca.mcmaster.cas.matlab2smt.MatlabExpression;

import ca.mcmaster.cas.matlab2smt.MatlabLiteral;

import ca.mcmaster.cas.matlab2smt.MatlabParser;

import ca.mcmaster.cas.matlab2smt.RealVariableType;

import ca.mcmaster.cas.matlab2smt.Variable;

import ca.mcmaster.cas.matlab2smt.VariableParser;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;
@@ -41,7 +47,6 @@ public class MatlabParserTest { 
        MatlabParser parser = new MatlabParser(null, "5+5\n");

        MatlabExpression expr = parser.getRootExpression();

        

        assertSame(MatlabExpressionOperation.class, expr.getClass());

        assertEquals(new RealVariableType(), expr.type());

        assertEquals(RealVariableType.class, expr.type().getClass());

        assertEquals("(5 + 5)", expr.getCVC3Output());
@@ -52,7 +57,6 @@ public class MatlabParserTest { 
        MatlabParser parser = new MatlabParser(null, "5 > 5\n");

        MatlabExpression expr = parser.getRootExpression();

        

        assertSame(MatlabExpressionOperation.class, expr.getClass());

        assertEquals(new RealVariableType(), expr.type());

        assertEquals(RealVariableType.class, expr.type().getClass());

        assertEquals("(5 > 5)", expr.getCVC3Output());

Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/RealVariableTypeTest.java→Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/test/RealVariableTypeTest.java

+2 −1
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ 
 * To change this template, choose Tools | Templates

 * and open the template in the editor.

 */

package ca.mcmaster.cas.matlab2smt;

package ca.mcmaster.cas.matlab2smt.test;



import ca.mcmaster.cas.matlab2smt.RealVariableType;

import org.junit.After;

import org.junit.AfterClass;

import org.junit.Before;

Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/VariableParserTest.java→Matlab2SMT/src/test/java/ca/mcmaster/cas/matlab2smt/test/VariableParserTest.java

+4 −1
Original line number Diff line number Diff line
@@ -2,8 +2,11 @@ 
 * To change this template, choose Tools | Templates

 * and open the template in the editor.

 */

package ca.mcmaster.cas.matlab2smt;

package ca.mcmaster.cas.matlab2smt.test;



import ca.mcmaster.cas.matlab2smt.RealVariableType;

import ca.mcmaster.cas.matlab2smt.Variable;

import ca.mcmaster.cas.matlab2smt.VariableParser;

import static org.junit.Assert.*;



import org.junit.Test;