Skip to content

Commit

Permalink
remove jsonb tck.
Browse files Browse the repository at this point in the history 
Signed-off-by: gurunrao <gurunandan.rao@oracle.com>
  • Loading branch information
@gurunrao
gurunrao committed Mar 24, 2022
1 parent 9c65249 commit 50f7838
Show file tree
Hide file tree
Showing 75 changed files with 8 additions and 17,214 deletions.
7 changes: 3 additions & 4 deletions Jenkinsfile
View file
Expand Up @@ -17,8 +17,7 @@
env.label = "jakartaee-tck-pod-${UUID.randomUUID().toString()}"

default_suites=[ "samples", "signaturetest/javaee" ]
default_tcks=["caj", "concurrency", "connector", "el", "jacc", "jaspic", "jaxws", "jms", "jpa", "jsf", "jsp", "jsonb", "jstl", "jta", "saaj", "securityapi", "servlet", "websocket"]

default_tcks=["caj", "concurrency", "connector", "el", "jacc", "jaspic", "jaxws", "jms", "jpa", "jsf", "jsp", "jstl", "jta", "saaj", "securityapi", "servlet", "websocket"]

def cts_suites = params.test_suites != null ? params.test_suites.split() : default_suites
def tcks = params.standalone_tcks != null ? params.standalone_tcks.split() : default_tcks
Expand Down Expand Up @@ -169,7 +168,7 @@ spec:
string(name: 'GF_VERSION_URL',
defaultValue: '',
description: 'URL required for downloading GlassFish version details' )
string(name: 'OLD_GF_BUNDLE_URL',
string(name: 'OLD_GF_BUNDLE_URL',
defaultValue: '',
description: 'URL required for downloading Old GlassFish Full/Web profile bundle' )
string(name: 'TCK_BUNDLE_BASE_URL',
Expand All @@ -193,7 +192,7 @@ spec:
description: 'Run the full EE compliance testsuite or a standalone tck' )
string(name: 'test_suites', defaultValue: 'concurrency connector ejb ejb30/bb ejb30/lite/appexception ejb30/lite/async ejb30/lite/basic ejb30/lite/ejbcontext ejb30/lite/enventry ejb30/lite/interceptor ejb30/lite/lookup ejb30/lite/naming ejb30/lite/nointerface ejb30/lite/packaging ejb30/lite/singleton ejb30/lite/stateful ejb30/lite/tx ejb30/lite/view ejb30/lite/xmloverride ejb30/assembly ejb30/timer ejb30/webservice ejb30/zombie ejb30/misc ejb30/sec ejb32 el integration jacc jaspic javaee javamail jaxrs jdbc_appclient jdbc_ejb jdbc_jsp jdbc_servlet jms_appclient jms_ejb jms_jsp jms_servlet jpa_appmanaged jpa_appmanagedNoTx jpa_pmservlet jpa_puservlet jpa_stateful3 jpa_stateless3 jsf jsonb jsonp jsp jstl jta jws samples securityapi servlet signaturetest/javaee webservices12 webservices13 websocket xa',
description: 'Space separated list of Test suites to run')
string(name: 'standalone_tcks', defaultValue: 'caj concurrency connector el jacc jaspic jaxws jms jpa jsf jsp jsonb jstl jta saaj securityapi servlet websocket',
string(name: 'standalone_tcks', defaultValue: 'caj concurrency connector el jacc jaspic jaxws jms jpa jsf jsp jstl jta saaj securityapi servlet websocket',
description: 'Space separated list of standalone TCKs to build and run')
string(name: 'USER_KEYWORDS',
defaultValue: '',
Expand Down
14 changes: 2 additions & 12 deletions bin/coverage-build.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -314,7 +314,7 @@
jta,jdbc,ejb,connector,jaspic,
jsp,el,servlet,jms,jacc,javaee,jstl,jpa,
jaxrs,webservices,jsf,
jsonb,concurrency,websocket,securityapi">
concurrency,websocket,securityapi">
<antcall target="generate.exec.summary"/>
<antcall target="generate.index.page"/>
<antcall target="set.permissions"/>
Expand Down Expand Up @@ -416,16 +416,6 @@
</antcall>
</target>

<target name="jsonb">
<antcall target="calculate.coverage">
<param name="api.coverage.dir" value="${coverage.base.dir}/jsonb_1_0/api"/>
<param name="spec.coverage.dir" value="${coverage.base.dir}/jsonb_1_0/spec"/>
<param name="api.assertions" value="${ts.docs.dir}/jsonb/JSONB10JavadocAssertions.xml"/>
<param name="spec.assertions" value="${ts.docs.dir}/jsonb/Jsonb10SpecAssertions.xml"/>
<param name="test.src.dir" value="/jsonb"/>
</antcall>
</target>

<target name="jws">
<antcall target="calculate.coverage">
<param name="spec.coverage.dir" value="${coverage.base.dir}/jws_2_1/spec"/>
Expand Down
7 changes: 1 addition & 6 deletions docker/build_standalone-tcks.sh
View file
Expand Up @@ -68,7 +68,7 @@ fi
echo "The option selected to build is $TCK_NAME TCK"

if [ "All" == "$TCK_NAME" ];then
TCK_LIST=( jsonb websocket el concurrency connector jacc jaspic caj jms jsp jstl jaxws saaj servlet jsf securityapi jpa jta )
TCK_LIST=( websocket el concurrency connector jacc jaspic caj jms jsp jstl jaxws saaj servlet jsf securityapi jpa jta )
else
TCK_LIST=( ${TCK_NAME} )
fi
Expand Down Expand Up @@ -126,11 +126,6 @@ for tck in ${TCK_LIST[@]}; do
TCK_SPECIFIC_PROPS="-Djsf.classes=$JAKARTA_JARS/modules/jakarta.enterprise.cdi-api.jar:$JAKARTA_JARS/modules/jakarta.servlet.jsp.jstl-api.jar:$JAKARTA_JARS/modules/jakarta.inject-api.jar:$JAKARTA_JARS/modules/jakarta.faces-api.jar:$JAKARTA_JARS/modules/jakarta.servlet.jsp-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/jakarta.el-api.jar:$JAKARTA_JARS/modules/jakarta.annotation-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
DOC_SPECIFIC_PROPS=""
JAXWS_SPECIFIC_PROPS=""
elif [ "jsonb" == "$tck" ]
then
TCK_SPECIFIC_PROPS="-Djsonb.classes=$JAKARTA_JARS/modules/jakarta.json-api.jar:$JAKARTA_JARS/modules/jakarta.json.bind-api.jar:$JAKARTA_JARS/modules/jakarta.inject-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
DOC_SPECIFIC_PROPS=""
JAXWS_SPECIFIC_PROPS=""
elif [ "websocket" == "$tck" ]
then
TCK_SPECIFIC_PROPS="-Dwebsocket.classes=$JAKARTA_JARS/modules/jakarta.websocket-client-api.jar:$JAKARTA_JARS/modules/jakarta.websocket-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/jakarta.inject-api.jar:$JAKARTA_JARS/modules/jakarta.enterprise.cdi-api.jar:$JAKARTA_JARS/modules/jakarta.activation-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar:$JAKARTA_JARS/modules/jakarta.xml.bind-api.jar"
Expand Down
88 changes: 0 additions & 88 deletions docker/jsonbtck.sh
View file

This file was deleted.

5 changes: 0 additions & 5 deletions docker/scripts/tcks/docker-entrypoint.sh
View file
Expand Up @@ -54,11 +54,6 @@ if [ "$TCK_NAME" == "servlet" ];then
exit 0
fi

if [ "$TCK_NAME" == "jsonb" ];then
source jsonbtck.sh
exit 0
fi

if [ "$TCK_NAME" == "jsf" ];then
source jsftck.sh
exit 0
Expand Down
41 changes: 0 additions & 41 deletions docker/scripts/tcks/jsonbtck.sh
View file

This file was deleted.

43 changes: 0 additions & 43 deletions install/jakartaee/bin/ts.jtx
View file
Expand Up @@ -68,49 +68,6 @@ com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/Client.java#elementCollec
com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/Client.java#elementCollectionTest_from_pmservlet
com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/Client.java#elementCollectionTest_from_stateless3

################
# JSON-B
################

#
#
com/sun/ts/tests/jsonb/customizedmapping/visibility/VisibilityCustomizationTest.java#testCustomVisibilityConfig_from_appclient
com/sun/ts/tests/jsonb/customizedmapping/visibility/VisibilityCustomizationTest.java#testCustomVisibilityConfig_from_ejb
com/sun/ts/tests/jsonb/customizedmapping/visibility/VisibilityCustomizationTest.java#testCustomVisibilityConfig_from_jsp
com/sun/ts/tests/jsonb/customizedmapping/visibility/VisibilityCustomizationTest.java#testCustomVisibilityConfig_from_servlet

#
# Bug ID: https://github.com/eclipse-ee4j/jsonb-api/issues/180
#
com/sun/ts/tests/jsonb/defaultmapping/basictypes/BasicJavaTypesMappingTest.java#testLongMapping_from_appclient
com/sun/ts/tests/jsonb/defaultmapping/basictypes/BasicJavaTypesMappingTest.java#testLongMapping_from_ejb
com/sun/ts/tests/jsonb/defaultmapping/basictypes/BasicJavaTypesMappingTest.java#testLongMapping_from_jsp
com/sun/ts/tests/jsonb/defaultmapping/basictypes/BasicJavaTypesMappingTest.java#testLongMapping_from_servlet
com/sun/ts/tests/jsonb/defaultmapping/bignumbers/BigNumbersMappingTest.java#testBigNumberMarshalling_from_appclient
com/sun/ts/tests/jsonb/defaultmapping/bignumbers/BigNumbersMappingTest.java#testBigNumberMarshalling_from_ejb
com/sun/ts/tests/jsonb/defaultmapping/bignumbers/BigNumbersMappingTest.java#testBigNumberMarshalling_from_jsp
com/sun/ts/tests/jsonb/defaultmapping/bignumbers/BigNumbersMappingTest.java#testBigNumberMarshalling_from_servlet

#
# Bug ID: https://github.com/eclipse-ee4j/jakartaee-tck/issues/102
#
com/sun/ts/tests/jsonb/defaultmapping/dates/DatesMappingTest.java#testGregorianCalendarWithTimeMapping_from_appclient
com/sun/ts/tests/jsonb/defaultmapping/dates/DatesMappingTest.java#testGregorianCalendarWithTimeMapping_from_ejb
com/sun/ts/tests/jsonb/defaultmapping/dates/DatesMappingTest.java#testGregorianCalendarWithTimeMapping_from_jsp
com/sun/ts/tests/jsonb/defaultmapping/dates/DatesMappingTest.java#testGregorianCalendarWithTimeMapping_from_servlet

#
# Bug ID: https://github.com/eclipse-ee4j/jakartaee-tck/issues/103
#
com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumMap_from_appclient
com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumMap_from_ejb
com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumMap_from_jsp
com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumMap_from_servlet
com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumSet_from_appclient
com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumSet_from_ejb
com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumSet_from_jsp
com/sun/ts/tests/jsonb/defaultmapping/collections/CollectionsMappingTest.java#testEnumSet_from_servlet


################
# Security API
Expand Down

0 comments on commit 50f7838

Please sign in to comment.