Commit 1e386ff7 authored by lichenchong's avatar lichenchong
Browse files

Update conformance test cases and script.

parent f0a8392f

bin/runConformanceTests.sh

+9 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ HOST=127.0.0.1 
PORT=8123

SSL_PORT=8443

HOME=`cd ~; pwd`

USE_SSL=false



JAVA=""

if [ "$JAVA_HOME" != "" ]; then
@@ -39,11 +40,12 @@ printUsage(){ 
   echo "            -port                 connection port, default is 8123"

   echo "            -tlsport              ssl connection port, defalt is 8443"

   echo "            -home                 drive or simulator home, default is user home path"

   echo "            -ssl                  true or false, default is false, run test without ssl connecttion"

}





if [ $# -eq 0 ]; then

   exec "$JAVA" -classpath "$CLASSPATH" -Dkinetic.io.in=true -Dkinetic.io.out=true -DRUN_NIO_TEST=true -DRUN_SSL_TEST=true -DRUN_AGAINST_EXTERNAL=true -DKINETIC_HOST=$HOST com.seagate.kinetic.allTests.ConformanceTestRunner

   exec "$JAVA" -classpath "$CLASSPATH" -Dkinetic.io.in=true -Dkinetic.io.out=true -DRUN_NIO_TEST=true -DRUN_SSL_TEST=${USE_SSL} -DRUN_AGAINST_EXTERNAL=true -DKINETIC_HOST=$HOST com.seagate.kinetic.allTests.ConformanceTestRunner

   exit 0

fi
@@ -75,6 +77,11 @@ do 
      HOME=$2

      shift

      ;;

    -ssl)

      echo "Print ssl \"$2\""

      USE_SSL=$2

      shift

      ;;

    -usesocketlog)

      echo "Print usesocketlog \"$2\""

      USE_SOCKET_LOG=$2
@@ -105,6 +112,6 @@ do 
   shift

done



exec "$JAVA" -classpath "$CLASSPATH" -Dkinetic.io.in=true -Dkinetic.io.out=true -DRUN_NIO_TEST=true -DRUN_SSL_TEST=true -DRUN_AGAINST_EXTERNAL=true -DKINETIC_HOST=$HOST -DKINETIC_PORT=$PORT -DKINETIC_SSL_PORT=$SSL_PORT  -DKINETIC_HOME=$HOME com.seagate.kinetic.allTests.ConformanceTestRunner

exec "$JAVA" -classpath "$CLASSPATH" -Dkinetic.io.in=true -Dkinetic.io.out=true -DRUN_NIO_TEST=true -DRUN_SSL_TEST=${USE_SSL} -DRUN_AGAINST_EXTERNAL=true -DKINETIC_HOST=$HOST -DKINETIC_PORT=$PORT -DKINETIC_SSL_PORT=$SSL_PORT  -DKINETIC_HOME=$HOME com.seagate.kinetic.allTests.ConformanceTestRunner



exit 0

kinetic-test/src/test/java/com/seagate/kinetic/allTests/ConformanceTestRunner.java

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ public class ConformanceTestRunner { 
                "com.seagate.kinetic.concurrent.KineticClientConcurrentTest"));

        classes.add(new XmlClass(

                "com.seagate.kinetic.concurrent.KineticPutConcurrentTest"));

        classes.add(new XmlClass(

                "com.seagate.kinetic.batchOp.BatchBasicAPITest"));

        classes.add(new XmlClass(

                "com.seagate.kinetic.batchOp.BatchBoundaryTest"));

        test.setXmlClasses(classes);



        List<XmlSuite> suites = new ArrayList<XmlSuite>();

kinetic-test/src/test/java/com/seagate/kinetic/boundary/KineticBoundaryTest.java

+2 −2
Original line number Diff line number Diff line
@@ -3079,7 +3079,7 @@ public class KineticBoundaryTest extends IntegrationTestCase { 
     * @throws KineticException

     *             if any internal error occurred.

     */

    @Test(dataProvider = "transportProtocolOptions")

    @Test(dataProvider = "transportProtocolOptions", enabled = false)

    public void testGetKeyRange_ReturnsFirstNKeysWithRangeRole(String clientName)

            throws KineticException {

        List<Entry> listEntry = new ArrayList<Entry>();
@@ -3158,7 +3158,7 @@ public class KineticBoundaryTest extends IntegrationTestCase { 
     * @throws KineticException

     *             if any internal error occurred.

     */

    @Test(dataProvider = "transportProtocolOptions")

    @Test(dataProvider = "transportProtocolOptions", enabled = false)

    public void testGetKeyRangeReversed_ReturnsLastNKeysWithRangeRole(

            String clientName) throws KineticException {

        List<Entry> listEntry = new ArrayList<Entry>();