You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2017/06/09 23:52:44 UTC
svn commit: r1798288 - in /webservices/axiom/trunk: WORKSPACE
aspects/dom-aspects/BUILD implementations/axiom-dom/BUILD
implementations/axiom-impl/BUILD testing/dom-testsuite/BUILD
testing/jaxp-testsuite/BUILD
Author: veithen
Date: Fri Jun 9 23:52:44 2017
New Revision: 1798288
URL: http://svn.apache.org/viewvc?rev=1798288&view=rev
Log:
Make the DOM implementation tests executable with Bazel.
Added:
webservices/axiom/trunk/testing/dom-testsuite/BUILD
Modified:
webservices/axiom/trunk/WORKSPACE
webservices/axiom/trunk/aspects/dom-aspects/BUILD
webservices/axiom/trunk/implementations/axiom-dom/BUILD
webservices/axiom/trunk/implementations/axiom-impl/BUILD
webservices/axiom/trunk/testing/jaxp-testsuite/BUILD
Modified: webservices/axiom/trunk/WORKSPACE
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/WORKSPACE?rev=1798288&r1=1798287&r2=1798288&view=diff
==============================================================================
--- webservices/axiom/trunk/WORKSPACE (original)
+++ webservices/axiom/trunk/WORKSPACE Fri Jun 9 23:52:44 2017
@@ -18,6 +18,12 @@
#
maven_jar(
+ name = "asm",
+ artifact = "org.ow2.asm:asm:5.2",
+ sha1 = "4ce3ecdc7115bcbf9d4ff4e6ec638e60760819df",
+)
+
+maven_jar(
name = "aspectj_runtime",
artifact = "org.aspectj:aspectjrt:1.8.7",
sha1 = "c4b70e763194d274477da4da9b05ea913e877268",
Modified: webservices/axiom/trunk/aspects/dom-aspects/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/BUILD?rev=1798288&r1=1798287&r2=1798288&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/BUILD (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/BUILD Fri Jun 9 23:52:44 2017
@@ -21,6 +21,12 @@ package(default_visibility = ["//visibil
load('//buildutils:aspectj.bzl', 'aspectj_library')
+# TODO: include all non mixins here
+java_library(
+ name = "classes",
+ resources = glob(["src/main/resources/**/*"]),
+)
+
aspectj_library(
name = "dom-aspects",
srcs = glob([
@@ -28,6 +34,7 @@ aspectj_library(
"src/main/java/**/*.aj",
]),
deps = [
+ ":classes",
"//aspects/core-aspects",
"//aspects/shared-aspects",
],
Modified: webservices/axiom/trunk/implementations/axiom-dom/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/BUILD?rev=1798288&r1=1798287&r2=1798288&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/BUILD (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/BUILD Fri Jun 9 23:52:44 2017
@@ -44,12 +44,13 @@ aspectj_library(
"//aspects/shared-aspects",
],
deps = [
+ "@woodstox//jar",
":factory",
- "//axiom-api:locator-loader",
],
)
+
java_test(
- name = "om_implementation_test",
+ name = "om-implementation-test",
srcs = ["src/test/java/org/apache/axiom/om/impl/dom/OMImplementationTest.java"],
test_class = "org.apache.axiom.om.impl.dom.OMImplementationTest",
deps = [
@@ -59,7 +60,7 @@ java_test(
)
java_test(
- name = "soap_implementation_test",
+ name = "soap-implementation-test",
srcs = ["src/test/java/org/apache/axiom/soap/impl/dom/SOAPImplementationTest.java"],
test_class = "org.apache.axiom.soap.impl.dom.SOAPImplementationTest",
deps = [
@@ -67,3 +68,34 @@ java_test(
"//testing/axiom-testsuite",
],
)
+
+java_test(
+ name = "dom-implementation-test",
+ srcs = [
+ "src/test/java/org/apache/axiom/om/impl/dom/DOMTests.java",
+ "src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java",
+ ],
+ test_class = "org.apache.axiom.om.impl.dom.DOMImplementationTest",
+ deps = [
+ ":axiom-dom",
+ "//testing/dom-testsuite",
+ # TODO: this shouldn't be here
+ "//testing/dom-testsuite:common",
+ "//testing/dom-testsuite:w3c",
+ ],
+)
+
+[java_test(
+ name = "w3c-dom-level%s-implementation-test" % level,
+ srcs = [
+ "src/test/java/org/apache/axiom/om/impl/dom/DOMTests.java",
+ "src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel%sImplementationTest.java" % level,
+ ],
+ test_class = "org.apache.axiom.om.impl.dom.W3CDOMLevel%sImplementationTest" % level,
+ deps = [
+ ":axiom-dom",
+ "//testing/dom-testsuite:common",
+ "//testing/dom-testsuite:w3c",
+ "//testing/dom-testsuite:w3c-level%s" % level,
+ ],
+) for level in [1, 2, 3]]
Modified: webservices/axiom/trunk/implementations/axiom-impl/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/BUILD?rev=1798288&r1=1798287&r2=1798288&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/BUILD (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/BUILD Fri Jun 9 23:52:44 2017
@@ -42,11 +42,12 @@ aspectj_library(
],
deps = [
":factory",
+ "@woodstox//jar",
],
)
java_test(
- name = "om_implementation_test",
+ name = "om-implementation-test",
srcs = ["src/test/java/org/apache/axiom/om/impl/llom/OMImplementationTest.java"],
test_class = "org.apache.axiom.om.impl.llom.OMImplementationTest",
deps = [
@@ -56,7 +57,7 @@ java_test(
)
java_test(
- name = "soap_implementation_test",
+ name = "soap-implementation-test",
srcs = ["src/test/java/org/apache/axiom/soap/impl/llom/SOAPImplementationTest.java"],
test_class = "org.apache.axiom.soap.impl.llom.SOAPImplementationTest",
deps = [
Added: webservices/axiom/trunk/testing/dom-testsuite/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/BUILD?rev=1798288&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/BUILD (added)
+++ webservices/axiom/trunk/testing/dom-testsuite/BUILD Fri Jun 9 23:52:44 2017
@@ -0,0 +1,107 @@
+genrule(
+ name = "org-w3c-domts",
+ srcs = ["src/w3c/dom1-core-tests-20040405.jar"],
+ outs = ["liborg-w3c-domts.jar"],
+ cmd = """
+ tmpdir=$$(mktemp -d)
+ dir=$$(pwd)
+ cd $$tmpdir
+ jar xf $$dir/$<
+ jar cf $$dir/$@ org/w3c/domts/*.class
+ rm -rf $$tmpdir""",
+)
+
+java_library(
+ name = "common",
+ srcs = [
+ "src/main/java/org/apache/axiom/ts/dom/DocumentBuilderFactoryFactory.java",
+ ],
+ visibility = ["//visibility:public"],
+)
+
+java_library(
+ name = "dom-testsuite",
+ srcs = glob([
+ "src/main/java/org/apache/axiom/ts/dom/DOMTestCase.java",
+ "src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java",
+ "src/main/java/org/apache/axiom/ts/dom/DOMUtils.java",
+ "src/main/java/org/apache/axiom/ts/dom/attr/**/*.java",
+ "src/main/java/org/apache/axiom/ts/dom/builder/**/*.java",
+ "src/main/java/org/apache/axiom/ts/dom/document/**/*.java",
+ "src/main/java/org/apache/axiom/ts/dom/documentfragment/**/*.java",
+ "src/main/java/org/apache/axiom/ts/dom/documenttype/**/*.java",
+ "src/main/java/org/apache/axiom/ts/dom/element/**/*.java",
+ "src/main/java/org/apache/axiom/ts/dom/text/**/*.java",
+ ]),
+ resources = glob(["src/main/resources/**/*"]),
+ visibility = ["//visibility:public"],
+ deps = [
+ "@byte_buddy//jar",
+ "@mockito_core//jar",
+ "@objenesis//jar",
+ "@truth//jar",
+ "@xerces//jar",
+ ":common",
+ "//testing/multiton",
+ "//testing/testutils",
+ "//testing/jaxp-testsuite",
+ "//testing/xml-testsuite",
+ "//testing/xml-truth",
+ ],
+)
+
+java_library(
+ name = "w3c",
+ srcs = glob(["src/main/java/org/apache/axiom/ts/dom/w3c/*.java"]),
+ visibility = ["//visibility:public"],
+ deps = [
+ "@asm//jar",
+ "@junit//jar",
+ ":common",
+ ":org-w3c-domts",
+ "//testing/testutils",
+ ],
+)
+
+[java_library(
+ name = "w3c-level%s" % level,
+ srcs = [
+ "src/main/java/org/apache/axiom/ts/dom/w3c/level%s/W3CDOMLevel%sTestSuiteBuilder.java" % (level, level),
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ "src/w3c/dom%s-core-tests-20040405.jar" % level,
+ ":common",
+ ":w3c",
+ ],
+) for level in [1, 2, 3]]
+
+java_test(
+ name = "xerces-test",
+ srcs = [
+ "src/test/java/org/apache/axiom/ts/dom/XercesTest.java",
+ ],
+ deps = [
+ "@xerces//jar",
+ "@xml_apis//jar",
+ ":common",
+ ":dom-testsuite",
+ ],
+ test_class = "org.apache.axiom.ts.dom.XercesTest",
+)
+
+[java_test(
+ name = "w3c-level%s-xerces-test" % level,
+ srcs = [
+ "src/test/java/org/apache/axiom/ts/dom/w3c/level%s/XercesTest.java" % level,
+ ],
+ deps = [
+ "@xerces//jar",
+ "@xml_apis//jar",
+ ":common",
+ ":w3c",
+ ":w3c-level%s" % level,
+ ],
+ test_class = "org.apache.axiom.ts.dom.w3c.level%s.XercesTest" % level,
+) for level in [1, 2, 3]]
+
Modified: webservices/axiom/trunk/testing/jaxp-testsuite/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/jaxp-testsuite/BUILD?rev=1798288&r1=1798287&r2=1798288&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/jaxp-testsuite/BUILD (original)
+++ webservices/axiom/trunk/testing/jaxp-testsuite/BUILD Fri Jun 9 23:52:44 2017
@@ -28,6 +28,7 @@ java_library(
"@crimson//jar",
"@saxon//jar",
"@xalan//jar",
+ "@xalan_serializer//jar",
"@xml_apis//jar",
"//testing/multiton",
],