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 2026/05/14 06:16:55 UTC
(ws-axiom) branch master updated: Migrate JUnit 3 assertions to AssertJ in axiom-testsuite
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 1e68d8fee Migrate JUnit 3 assertions to AssertJ in axiom-testsuite
1e68d8fee is described below
commit 1e68d8fee5982e83c7eb91cf8a3e53e3dbb2a6ee
Author: Copilot <19...@users.noreply.github.com>
AuthorDate: Thu May 14 07:15:18 2026 +0100
Migrate JUnit 3 assertions to AssertJ in axiom-testsuite
---
.../apache/axiom/ts/dimension/ElementContext.java | 5 +-
.../axiom/ts/dimension/ExpansionStrategy.java | 15 +-
.../org/apache/axiom/ts/om/DigestTestCase.java | 4 +-
.../apache/axiom/ts/om/SetNamespaceTestCase.java | 37 ++-
.../om/attribute/TestGetAttributeTypeDefault.java | 4 +-
.../om/attribute/TestGetNamespaceNormalized.java | 4 +-
.../TestGetNamespaceURIWithNamespace.java | 4 +-
.../TestGetNamespaceURIWithoutNamespace.java | 4 +-
.../om/attribute/TestGetPrefixWithNamespace.java | 4 +-
.../attribute/TestGetPrefixWithoutNamespace.java | 4 +-
.../ts/om/attribute/TestGetQNameWithNamespace.java | 8 +-
.../om/attribute/TestGetQNameWithoutNamespace.java | 8 +-
.../ts/om/attribute/TestHasNameWithNamespace.java | 10 +-
.../om/attribute/TestHasNameWithoutNamespace.java | 6 +-
.../axiom/ts/om/attribute/TestSetLocalName.java | 10 +-
.../axiom/ts/om/builder/TestCloseWithStream.java | 4 +-
.../om/builder/TestCloseWithXMLStreamReader.java | 2 +
.../builder/TestCreateOMBuilderFromDOMElement.java | 6 +-
.../TestCreateStAXOMBuilderFromFragment.java | 12 +-
.../TestCreateStAXOMBuilderNamespaceRepairing.java | 18 +-
...TestCreateStAXOMBuilderNamespaceRepairing2.java | 18 +-
.../ts/om/builder/TestGetDocumentElement.java | 27 +-
.../ts/om/builder/TestIOExceptionInGetText.java | 5 +-
.../apache/axiom/ts/om/builder/TestInvalidXML.java | 2 +-
.../TestReadAttachmentBeforeRootPartComplete.java | 8 +-
.../axiom/ts/om/builder/TestRootPartStreaming.java | 4 +-
.../ts/om/builder/TestStandaloneConfiguration.java | 6 +-
.../axiom/ts/om/container/TestSerialize.java | 5 +-
.../ts/om/document/TestAddChildIncomplete.java | 12 +-
.../org/apache/axiom/ts/om/document/TestBuild.java | 10 +-
.../ts/om/document/TestGetOMDocumentElement.java | 4 +-
.../TestGetOMDocumentElementAfterDetach.java | 6 +-
.../TestGetOMDocumentElementWithParser.java | 6 +-
.../TestIsCompleteAfterAddingIncompleteChild.java | 6 +-
.../axiom/ts/om/document/TestRemoveChildren.java | 19 +-
.../om/document/TestSetOMDocumentElementNew.java | 16 +-
.../document/TestSetOMDocumentElementReplace.java | 22 +-
.../sr/TestCharacterDataReaderFromParser.java | 8 +-
.../ts/om/document/sr/TestCloseWithoutCaching.java | 4 +-
.../axiom/ts/om/document/sr/TestDTDReader.java | 14 +-
.../ts/om/document/sr/TestDTDReaderFromParser.java | 12 +-
.../TestAddAttributeAlreadyOwnedByElement.java | 12 +-
...TestAddAttributeAlreadyOwnedByOtherElement.java | 8 +-
.../element/TestAddAttributeGeneratedPrefix.java | 10 +-
...uteWithExistingNamespaceDeclarationInScope.java | 4 +-
...hExistingNamespaceDeclarationOnSameElement.java | 8 +-
...AddAttributeWithMaskedNamespaceDeclaration.java | 8 +-
...tributeWithoutExistingNamespaceDeclaration.java | 10 +-
.../element/TestAddAttributeWithoutNamespace.java | 10 +-
.../apache/axiom/ts/om/element/TestAddChild.java | 6 +-
.../apache/axiom/ts/om/element/TestAddChild2.java | 9 +-
.../ts/om/element/TestAddChildIncomplete.java | 10 +-
.../ts/om/element/TestAddChildWithParent.java | 8 +-
.../ts/om/element/TestAddChildWithSameParent.java | 12 +-
...ReDeclaringGrandParentsDefaultNSWithPrefix.java | 6 +-
...ChildReDeclaringParentsDefaultNSWithPrefix.java | 11 +-
.../TestCloneOMElementNamespaceRepairing.java | 6 +-
.../axiom/ts/om/element/TestDeclareNamespace1.java | 12 +-
.../TestDeclareNamespaceWithGeneratedPrefix1.java | 14 +-
.../TestDeclareNamespaceWithGeneratedPrefix3.java | 14 +-
.../ts/om/element/TestDiscardDocumentElement.java | 4 +-
.../ts/om/element/TestDiscardPartiallyBuilt.java | 5 +-
.../TestFindNamespaceByNamespaceURIMasked.java | 4 +-
.../ts/om/element/TestFindNamespaceByPrefix.java | 6 +-
.../element/TestFindNamespaceCaseSensitivity.java | 4 +-
.../TestFindNamespaceURIWithPrefixUndeclaring.java | 6 +-
.../axiom/ts/om/element/TestGetAllAttributes1.java | 12 +-
.../axiom/ts/om/element/TestGetAllAttributes2.java | 10 +-
.../om/element/TestGetAllDeclaredNamespaces.java | 10 +-
.../element/TestGetAttributeValueNonExisting.java | 4 +-
.../TestGetAttributeValueWithXmlPrefix1.java | 8 +-
.../TestGetAttributeValueWithXmlPrefix2.java | 8 +-
.../om/element/TestGetAttributeWithXmlPrefix1.java | 7 +-
.../om/element/TestGetAttributeWithXmlPrefix2.java | 7 +-
.../axiom/ts/om/element/TestGetChildElements.java | 8 +-
.../axiom/ts/om/element/TestGetChildren.java | 7 +-
.../ts/om/element/TestGetChildrenRemove3.java | 2 +
.../ts/om/element/TestGetChildrenRemove4.java | 9 +-
.../ts/om/element/TestGetChildrenWithName.java | 10 +-
.../ts/om/element/TestGetChildrenWithName3.java | 4 +-
.../TestGetChildrenWithNameNextWithoutHasNext.java | 4 +-
.../element/TestGetChildrenWithNamespaceURI.java | 12 +-
.../ts/om/element/TestGetDefaultNamespace.java | 8 +-
.../ts/om/element/TestGetDefaultNamespace2.java | 4 +-
.../axiom/ts/om/element/TestGetDescendants.java | 16 +-
.../ts/om/element/TestGetFirstChildWithName.java | 12 +-
...stGetFirstChildWithNameOnIncompleteElement.java | 4 +-
.../ts/om/element/TestGetNamespaceContext.java | 36 +--
.../ts/om/element/TestGetNamespaceNormalized.java | 4 +-
.../TestGetNamespaceNormalizedWithParser.java | 4 +-
.../TestGetNamespaceNormalizedWithSAXSource.java | 4 +-
.../element/TestGetNamespaceURIWithNamespace.java | 4 +-
.../TestGetNamespaceURIWithoutNamespace.java | 4 +-
.../ts/om/element/TestGetNamespacesInScope.java | 13 +-
...stGetNamespacesInScopeWithDefaultNamespace.java | 10 +-
...amespacesInScopeWithMaskedDefaultNamespace.java | 4 +-
...estGetNamespacesInScopeWithMaskedNamespace.java | 10 +-
.../element/TestGetPrefixWithDefaultNamespace.java | 4 +-
.../ts/om/element/TestGetPrefixWithNamespace.java | 4 +-
.../om/element/TestGetPrefixWithoutNamespace.java | 4 +-
.../ts/om/element/TestGetQNameWithNamespace.java | 8 +-
.../om/element/TestGetQNameWithoutNamespace.java | 8 +-
.../ts/om/element/TestGetSAXResultWithDTD.java | 6 +-
...estGetSAXSourceIdentityTransformOnFragment.java | 6 +-
.../apache/axiom/ts/om/element/TestGetText.java | 4 +-
.../axiom/ts/om/element/TestGetTextAsQName.java | 6 +-
.../ts/om/element/TestGetTextAsQNameEmpty.java | 4 +-
.../om/element/TestGetTextAsQNameNoNamespace.java | 4 +-
.../TestGetTextAsQNameWithExtraWhitespace.java | 4 +-
.../TestGetTextAsStreamWithNonTextChildren.java | 4 +-
.../TestGetTextAsStreamWithSingleTextNode.java | 6 +-
.../element/TestGetTextWithCDATASectionChild.java | 4 +-
.../TestGetTextWithMixedOMTextChildren.java | 4 +-
...estGetXMLStreamReaderCDATAEventFromElement.java | 14 +-
...TestGetXMLStreamReaderCDATAEventFromParser.java | 17 +-
.../TestGetXMLStreamReaderOnNonRootElement.java | 20 +-
.../element/TestGetXMLStreamReaderWithCaching.java | 4 +-
...GetXMLStreamReaderWithIncompleteDescendant.java | 28 +-
...etXMLStreamReaderWithNamespaceURIInterning.java | 4 +-
...MLStreamReaderWithoutCachingPartiallyBuilt.java | 4 +-
...ReaderWithoutCachingPartiallyBuiltModified.java | 14 +-
.../ts/om/element/TestHasNameWithNamespace.java | 11 +-
.../ts/om/element/TestHasNameWithoutNamespace.java | 6 +-
.../TestIsCompleteAfterAddingIncompleteChild.java | 6 +-
.../ts/om/element/TestIsCompleteWithParser.java | 8 +-
.../axiom/ts/om/element/TestMultipleDefaultNS.java | 12 +-
.../axiom/ts/om/element/TestRemoveAttribute.java | 10 +-
.../axiom/ts/om/element/TestRemoveChildren.java | 15 +-
.../TestResolveQNameWithDefaultNamespace.java | 8 +-
.../TestResolveQNameWithNonDefaultNamespace.java | 8 +-
.../element/TestResolveQNameWithUnboundPrefix.java | 4 +-
.../element/TestResolveQNameWithoutNamespace.java | 8 +-
.../axiom/ts/om/element/TestSerialization.java | 4 +-
...TestSerializationWithTwoNonBuiltOMElements.java | 4 +-
.../TestSerializeAndConsumePartiallyBuilt.java | 4 +-
...erializeAndConsumeWithIncompleteDescendant.java | 3 +-
.../apache/axiom/ts/om/element/TestSetText.java | 12 +-
.../ts/om/element/TestSetTextEmptyString.java | 4 +-
.../axiom/ts/om/element/TestSetTextNull.java | 4 +-
.../axiom/ts/om/element/TestSetTextQName.java | 10 +-
.../axiom/ts/om/element/TestSetTextQNameNull.java | 4 +-
.../element/TestSetTextQNameWithEmptyPrefix.java | 12 +-
.../TestSetTextQNameWithExistingChildren.java | 12 +-
.../element/TestSetTextQNameWithoutNamespace.java | 6 +-
.../element/TestSetTextWithExistingChildren.java | 12 +-
.../axiom/ts/om/element/TestUndeclarePrefix.java | 10 +-
.../axiom/ts/om/element/TestWriteTextTo.java | 6 +-
.../element/TestWriteTextToWithNonTextNodes.java | 4 +-
.../element/sr/TestCloseAndContinueBuilding.java | 12 +-
.../axiom/ts/om/element/sr/TestCommentEvent.java | 20 +-
.../ts/om/element/sr/TestGetBlobFromElement.java | 6 +-
.../axiom/ts/om/element/sr/TestGetElementText.java | 4 +-
.../element/sr/TestGetElementTextFromParser.java | 8 +-
.../ts/om/element/sr/TestGetNamespaceContext.java | 14 +-
.../apache/axiom/ts/om/element/sr/TestNextTag.java | 14 +-
.../TestCreateOMAttributeGeneratedPrefix.java | 8 +-
.../factory/TestCreateOMAttributeInterfaces.java | 4 +-
...TestCreateOMAttributeNullPrefixNoNamespace.java | 4 +-
.../factory/TestCreateOMCommentWithoutParent.java | 6 +-
.../factory/TestCreateOMDocTypeWithoutParent.java | 12 +-
.../axiom/ts/om/factory/TestCreateOMDocument.java | 8 +-
.../TestCreateOMElementWithDefaultNamespace.java | 14 +-
.../TestCreateOMElementWithGeneratedPrefix.java | 16 +-
.../TestCreateOMElementWithNamespaceInScope1.java | 10 +-
.../TestCreateOMElementWithNamespaceInScope2.java | 6 +-
.../TestCreateOMElementWithNamespaceInScope3.java | 6 +-
...TestCreateOMElementWithNonDefaultNamespace.java | 14 +-
.../TestCreateOMElementWithoutNamespace.java | 8 +-
.../TestCreateOMElementWithoutNamespace2.java | 14 +-
.../TestCreateOMElementWithoutNamespace3.java | 8 +-
...tCreateOMElementWithoutNamespaceNullPrefix.java | 8 +-
.../ts/om/factory/TestCreateOMEntityReference.java | 8 +-
.../TestCreateOMEntityReferenceWithNullParent.java | 8 +-
.../axiom/ts/om/factory/TestCreateOMNamespace.java | 6 +-
...CreateOMProcessingInstructionWithoutParent.java | 8 +-
.../axiom/ts/om/factory/TestCreateOMText.java | 8 +-
.../factory/TestCreateOMTextFromBlobProvider.java | 4 +-
.../ts/om/factory/TestCreateOMTextFromOMText.java | 6 +-
.../om/factory/TestCreateOMTextWithNullParent.java | 4 +-
.../ts/om/factory/TestFactoryIsSingleton.java | 4 +-
.../axiom/ts/om/factory/TestGetMetaFactory.java | 4 +-
.../org/apache/axiom/ts/om/misc/TestAxiom95.java | 4 +-
.../apache/axiom/ts/om/namespace/TestEquals.java | 16 +-
.../ts/om/namespace/TestEqualsWithNullPrefix.java | 4 +-
.../axiom/ts/om/namespace/TestGetNamespaceURI.java | 4 +-
.../axiom/ts/om/namespace/TestGetPrefix.java | 6 +-
.../apache/axiom/ts/om/namespace/TestHashCode.java | 4 +-
.../axiom/ts/om/namespace/TestObjectEquals.java | 4 +-
.../TestObjectEqualsWithDifferentPrefixes.java | 4 +-
.../TestObjectEqualsWithDifferentURIs.java | 4 +-
.../org/apache/axiom/ts/om/node/TestDetach.java | 22 +-
.../axiom/ts/om/node/TestDetachFirstChild.java | 10 +-
.../axiom/ts/om/node/TestInsertSiblingAfter.java | 4 +-
.../om/node/TestInsertSiblingAfterSameParent.java | 12 +-
.../axiom/ts/om/node/TestInsertSiblingBefore.java | 6 +-
.../om/node/TestInsertSiblingBeforeSameParent.java | 12 +-
.../ts/om/sourcedelement/TestBlobOMDataSource.java | 20 +-
.../om/sourcedelement/TestCloneNonDestructive.java | 14 +-
.../ts/om/sourcedelement/TestCloneUnknownName.java | 14 +-
.../ts/om/sourcedelement/TestCloseOnComplete.java | 10 +-
.../axiom/ts/om/sourcedelement/TestComplete.java | 10 +-
.../axiom/ts/om/sourcedelement/TestExpand.java | 36 +--
.../ts/om/sourcedelement/TestGetLocalName.java | 8 +-
.../ts/om/sourcedelement/TestGetNamespace.java | 12 +-
.../sourcedelement/TestGetNamespaceNormalized.java | 6 +-
.../TestGetNamespaceNormalized2.java | 6 +-
.../ts/om/sourcedelement/TestGetNamespaceURI.java | 10 +-
.../TestGetNextOMSiblingIncomplete.java | 8 +-
.../axiom/ts/om/sourcedelement/TestGetObject.java | 10 +-
.../axiom/ts/om/sourcedelement/TestGetPrefix.java | 10 +-
...TextAsStreamWithNonDestructiveOMDataSource.java | 6 +-
.../axiom/ts/om/sourcedelement/TestHasName.java | 10 +-
.../om/sourcedelement/TestName1DefaultPrefix.java | 38 ++-
.../sourcedelement/TestName1QualifiedPrefix.java | 42 ++-
.../ts/om/sourcedelement/TestName1Unqualified.java | 31 ++-
.../om/sourcedelement/TestName2DefaultPrefix.java | 26 +-
.../sourcedelement/TestName2QualifiedPrefix.java | 26 +-
.../ts/om/sourcedelement/TestName2Unqualified.java | 14 +-
.../om/sourcedelement/TestName3DefaultPrefix.java | 36 ++-
.../sourcedelement/TestName3QualifiedPrefix.java | 36 ++-
.../ts/om/sourcedelement/TestName3Unqualified.java | 32 +--
.../om/sourcedelement/TestName4DefaultPrefix.java | 18 +-
.../sourcedelement/TestName4QualifiedPrefix.java | 20 +-
.../ts/om/sourcedelement/TestName4Unqualified.java | 20 +-
.../TestPushOMDataSourceExpansion.java | 6 +-
.../TestRemoveChildrenUnexpanded.java | 12 +-
.../axiom/ts/om/sourcedelement/TestSerialize.java | 12 +-
...zeModifiedOMSEWithNonDestructiveDataSource.java | 10 +-
.../ts/om/sourcedelement/TestSetDataSource.java | 16 +-
.../TestSetDataSourceOnAlreadyExpandedElement.java | 10 +-
.../om/sourcedelement/TestStringOMDataSource.java | 13 +-
.../TestWrappedTextNodeOMDataSourceFromReader.java | 4 +-
...tWriteTextToWithNonDestructiveOMDataSource.java | 4 +-
.../push/GetNamespaceContextScenario.java | 5 +-
.../push/WriteAttributeAutoPrefixScenario.java | 13 +-
.../WriteAttributeNamespaceUnawareScenario.java | 5 +-
.../push/WriteBlobProviderScenario.java | 7 +-
.../om/sourcedelement/push/WriteBlobScenario.java | 7 +-
.../om/sourcedelement/push/WriteCDataScenario.java | 9 +-
.../push/WriteCharactersCharArrayScenario.java | 13 +-
.../sourcedelement/push/WriteCommentScenario.java | 7 +-
.../push/WriteEmptyElementAutoPrefixScenario.java | 9 +-
.../push/WriteEmptyElementScenario.java | 9 +-
.../push/WriteEntityRefScenario.java | 9 +-
.../push/WriteNamespaceScenario.java | 12 +-
.../push/WriteProcessingInstruction1Scenario.java | 9 +-
.../push/WriteProcessingInstruction2Scenario.java | 9 +-
.../push/WriteStartElementAutoPrefixScenario.java | 9 +-
...thDefaultNamespaceDeclaredOnParentScenario.java | 11 +-
.../sourcedelement/sr/TestCloseWithoutCaching.java | 4 +-
.../axiom/ts/om/sourcedelement/sr/TestGetName.java | 12 +-
.../apache/axiom/ts/om/text/TestCloneBinary.java | 8 +-
.../apache/axiom/ts/om/text/TestGetNamespace.java | 6 +-
.../ts/om/text/TestGetNamespaceNoNamespace.java | 4 +-
.../text/TestGetTextCharactersFromDataHandler.java | 4 +-
.../org/apache/axiom/ts/om/xop/TestSerialize.java | 8 +-
.../apache/axiom/ts/om/xop/XOPRoundtripTest.java | 10 +-
.../axiom/ts/om/xpath/TestAddNamespaces.java | 4 +-
.../axiom/ts/om/xpath/TestAddNamespaces2.java | 4 +-
.../axiom/ts/om/xpath/TestGetAttributeQName.java | 4 +-
.../ts/omdom/attr/TestGetNamespaceNormalized.java | 4 +-
.../TestCreateDocumentFragmentInterfaces.java | 4 +-
.../axiom/ts/omdom/document/TestGetOMFactory1.java | 4 +-
.../axiom/ts/omdom/document/TestGetOMFactory2.java | 4 +-
.../ts/omdom/element/TestAddAttributeReplace.java | 10 +-
.../element/TestAddChildFromForeignDocument.java | 6 +-
.../omdom/element/TestAppendChildIncomplete.java | 10 +-
.../axiom/ts/omdom/element/TestCloneOMElement.java | 5 +-
.../apache/axiom/ts/omdom/element/TestDetach.java | 4 +-
.../omdom/element/TestGetNamespaceNormalized.java | 4 +-
.../omdom/element/TestInsertBeforeIncomplete.java | 10 +-
.../ts/omdom/element/TestRemoveAttribute.java | 10 +-
.../TestRemoveAttributeNSNamespaceDeclaration.java | 4 +-
.../omdom/element/TestRemoveChildIncomplete.java | 8 +-
.../element/TestReplaceChildFirstIncomplete.java | 38 +--
.../element/TestReplaceChildMiddleIncomplete.java | 38 +--
.../ts/omdom/factory/TestCreateOMAttribute.java | 12 +-
.../factory/TestCreateOMTextCDATASection.java | 4 +-
.../TestCreateOMTextCDATASectionWithParent.java | 4 +-
.../TestInsertSiblingAfterFromForeignDocument.java | 6 +-
...TestInsertSiblingBeforeFromForeignDocument.java | 6 +-
.../axiom/ts/omdom/text/TestCloneNodeBinary.java | 6 +-
.../apache/axiom/ts/soap/SOAPSampleAdapter.java | 8 +-
.../apache/axiom/ts/soap/body/TestAddFault1.java | 6 +-
.../apache/axiom/ts/soap/body/TestAddFault2.java | 6 +-
.../axiom/ts/soap/body/TestCloneOMElement.java | 9 +-
.../apache/axiom/ts/soap/body/TestGetFault.java | 8 +-
.../axiom/ts/soap/body/TestGetFaultFakeFault.java | 4 +-
.../axiom/ts/soap/body/TestGetFaultNoFault.java | 4 +-
.../axiom/ts/soap/body/TestGetFaultWithParser.java | 9 +-
.../soap/body/TestGetFaultWithParserNoFault.java | 4 +-
.../TestGetFirstElementLocalNameEmptyBody.java | 4 +-
.../TestGetFirstElementLocalNameWithParser.java | 4 +-
.../soap/body/TestGetFirstElementNSEmptyBody.java | 4 +-
.../soap/body/TestGetFirstElementNSWithParser.java | 8 +-
.../apache/axiom/ts/soap/body/TestHasFault.java | 8 +-
.../ts/soap/body/TestHasFaultAfterReplace.java | 6 +-
.../axiom/ts/soap/body/TestHasFaultFakeFault.java | 4 +-
.../axiom/ts/soap/body/TestHasFaultNoFault.java | 4 +-
.../soap/body/TestHasFaultWithOMSEUnknownName.java | 6 +-
.../axiom/ts/soap/body/TestHasFaultWithParser.java | 4 +-
.../soap/body/TestHasFaultWithParserNoFault.java | 4 +-
.../apache/axiom/ts/soap/builder/OMTestUtils.java | 10 +-
.../axiom/ts/soap/builder/TestCommentInEpilog.java | 4 +-
.../axiom/ts/soap/builder/TestCommentInProlog.java | 4 +-
.../ts/soap/builder/TestRegisterCustomBuilder.java | 6 +-
...CustomBuilderForPayloadAfterSOAPFaultCheck.java | 4 +-
.../axiom/ts/soap/envelope/CloneTestCase.java | 25 +-
.../TestAddHeaderToIncompleteEnvelope.java | 6 +-
.../ts/soap/envelope/TestBodyHeaderOrder.java | 4 +-
.../envelope/TestCloneWithSourcedElement1.java | 4 +-
.../envelope/TestCloneWithSourcedElement2.java | 4 +-
.../apache/axiom/ts/soap/envelope/TestDetach.java | 10 +-
.../apache/axiom/ts/soap/envelope/TestGetBody.java | 12 +-
.../soap/envelope/TestGetBodyOnEmptyEnvelope.java | 4 +-
.../TestGetBodyOnEnvelopeWithHeaderOnly.java | 4 +-
.../ts/soap/envelope/TestGetBodyWithParser.java | 12 +-
.../axiom/ts/soap/envelope/TestGetHeader.java | 13 +-
.../ts/soap/envelope/TestGetHeaderWithParser.java | 13 +-
.../envelope/TestGetHeaderWithParserNoHeader.java | 6 +-
.../ts/soap/envelope/TestGetOrCreateHeader.java | 4 +-
.../TestGetOrCreateHeaderWithParserNoHeader.java | 8 +-
.../TestGetSOAPBodyFirstElementLocalNameAndNS.java | 10 +-
...APBodyFirstElementLocalNameAndNSWithParser.java | 30 ++-
...ithoutCachingWithPartiallyBuiltHeaderBlock.java | 6 +-
.../axiom/ts/soap/envelope/TestHasFault.java | 8 +-
.../ts/soap/envelope/TestHasFaultWithParser.java | 4 +-
.../CreateSOAPElementWithoutParentTestCase.java | 21 +-
.../soap/factory/TestCreateDefaultSOAPMessage.java | 18 +-
.../factory/TestCreateSOAPElementWithParent.java | 19 +-
.../TestCreateSOAPEnvelopeWithCustomPrefix.java | 14 +-
.../ts/soap/factory/TestFactoryIsSingleton.java | 6 +-
.../ts/soap/factory/TestGetDefaultEnvelope.java | 18 +-
.../soap/factory/TestGetDefaultFaultEnvelope.java | 21 +-
.../axiom/ts/soap/factory/TestGetMetaFactory.java | 4 +-
.../axiom/ts/soap/factory/TestGetNamespace.java | 6 +-
.../apache/axiom/ts/soap/fault/TestChildOrder.java | 8 +-
.../axiom/ts/soap/fault/TestGetCodeWithParser.java | 11 +-
.../ts/soap/fault/TestGetDetailWithParser.java | 12 +-
.../axiom/ts/soap/fault/TestGetException.java | 6 +-
.../ts/soap/fault/TestGetReasonWithParser.java | 12 +-
.../axiom/ts/soap/fault/TestGetRoleWithParser.java | 11 +-
.../axiom/ts/soap/fault/TestSetException.java | 18 +-
.../ts/soap/faultcode/TestGetValueAsQName.java | 4 +-
.../faultcode/TestGetValueAsQNameWithParser.java | 4 +-
.../ts/soap/faultdetail/TestAddDetailEntry.java | 34 +--
...tailEntriesUsingDefaultNamespaceWithParser.java | 8 +-
.../soap/faultdetail/TestGetAllDetailEntries.java | 24 +-
.../TestGetAllDetailEntriesWithParser.java | 24 +-
.../ts/soap/faultdetail/TestSerialization.java | 6 +-
.../ts/soap/faultdetail/TestWSCommons202.java | 12 +-
.../ts/soap/faultnode/TestGetFaultNodeValue.java | 6 +-
.../faultnode/TestGetFaultNodeValueWithParser.java | 7 +-
.../ts/soap/faultnode/TestSetFaultNodeValue.java | 4 +-
.../axiom/ts/soap/faultrole/TestGetRoleValue.java | 6 +-
.../soap/faultrole/TestGetRoleValueWithParser.java | 7 +-
.../axiom/ts/soap/faultrole/TestSetRoleValue.java | 4 +-
.../axiom/ts/soap/faulttext/TestGetLang.java | 6 +-
.../ts/soap/faulttext/TestGetLangFromParser.java | 5 +-
.../axiom/ts/soap/faulttext/TestSetLang.java | 25 +-
.../axiom/ts/soap/header/TestAddHeaderBlock.java | 48 ++--
.../soap/header/TestAddHeaderBlockFromQName.java | 10 +-
.../ts/soap/header/TestDiscardPartiallyBuilt.java | 6 +-
.../ts/soap/header/TestExamineAllHeaderBlocks.java | 40 +--
.../TestExamineAllHeaderBlocksWithParser.java | 20 +-
.../ts/soap/header/TestExamineHeaderBlocks.java | 20 +-
.../ts/soap/header/TestExtractAllHeaderBlocks.java | 12 +-
.../soap/header/TestGetHeaderBlocksWithNSURI.java | 13 +-
.../TestGetHeadersToProcessWithNamespace.java | 12 +-
.../header/TestGetHeadersToProcessWithParser.java | 14 +-
.../ts/soap/headerblock/TestBlobOMDataSource.java | 16 +-
.../soap/headerblock/TestGetBooleanAttribute.java | 7 +-
.../TestGetBooleanAttributeDefault.java | 5 +-
.../TestGetMustUnderstandWithParser.java | 10 +-
.../axiom/ts/soap/headerblock/TestGetRole.java | 11 +-
.../ts/soap/headerblock/TestGetRoleWithParser.java | 6 +-
.../axiom/ts/soap/headerblock/TestGetVersion.java | 4 +-
.../soap/headerblock/TestSetBooleanAttribute.java | 14 +-
.../axiom/ts/soap/headerblock/TestSetRole.java | 7 +-
.../apache/axiom/ts/soap/message/TestClone.java | 16 +-
.../axiom/ts/soap/message/TestCloneIncomplete.java | 10 +-
.../message/TestGetCharsetEncodingWithParser.java | 4 +-
.../soap/message/TestGetOMFactoryWithParser.java | 4 +-
.../ts/soap/message/TestSetOMDocumentElement.java | 4 +-
.../apache/axiom/ts/soap/misc/TestGetChild.java | 6 +-
.../apache/axiom/ts/soap/misc/TestSetChild.java | 6 +-
.../soap/xpath/TestXPathAppliedToSOAPEnvelope.java | 4 +-
.../axiom/ts/soap11/builder/TestBuilder.java | 196 +++++---------
.../apache/axiom/ts/soap11/fault/TestGetNode.java | 6 +-
.../axiom/ts/soap11/faultcode/TestGetValue.java | 4 +-
.../soap11/faultcode/TestGetValueWithParser.java | 4 +-
.../ts/soap11/faultcode/TestSetValueFromQName.java | 10 +-
.../ts/soap11/faultreason/TestAddSOAPText.java | 4 +-
.../soap11/faultreason/TestGetTextWithCDATA.java | 11 +-
.../axiom/ts/soap12/builder/TestBuilder.java | 292 +++++++--------------
.../soap12/factory/TestCreateSOAPFaultSubCode.java | 20 +-
.../apache/axiom/ts/soap12/fault/TestGetNode.java | 16 +-
.../ts/soap12/fault/TestGetNodeWithParser.java | 12 +-
.../ts/soap12/fault/TestMoreChildrenAddition.java | 20 +-
.../apache/axiom/ts/soap12/fault/TestSetNode.java | 11 +-
.../soap12/faultcode/TestGetSubCodeWithParser.java | 12 +-
.../soap12/faultcode/TestGetValueWithParser.java | 12 +-
.../ts/soap12/faultcode/TestSetValueFromQName.java | 12 +-
.../TestSetValueFromQNameWithExistingValue.java | 12 +-
.../ts/soap12/faultreason/TestAddSOAPText.java | 6 +-
.../soap12/faultreason/TestGetFirstSOAPText.java | 10 +-
.../TestGetFirstSOAPTextWithParser.java | 6 +-
.../TestGetSubCodeNestedWithParser.java | 12 +-
.../faultsubcode/TestGetSubCodeWithParser.java | 12 +-
.../TestGetValueAsQNameWithParser.java | 7 +-
.../faultsubcode/TestGetValueNestedWithParser.java | 11 +-
.../faultsubcode/TestGetValueWithParser.java | 11 +-
.../ts/soap12/faulttext/TestGetLangWithParser.java | 29 +-
.../TestExamineMustUnderstandHeaderBlocks.java | 23 +-
.../soap12/headerblock/TestGetRelayWithParser.java | 8 +-
.../mtom/TestGetXMLStreamReaderMTOMEncoded.java | 10 +-
416 files changed, 2388 insertions(+), 2129 deletions(-)
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/ElementContext.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/ElementContext.java
index 2e7c2ccd4..7f8c12149 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/ElementContext.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/ElementContext.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dimension;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.io.StringWriter;
@@ -33,7 +35,6 @@ import org.apache.axiom.testing.multiton.Multiton;
import org.apache.axiom.testutils.suite.Dimension;
import org.apache.axiom.testutils.suite.LabelTarget;
import org.apache.axiom.ts.jaxp.dom.DOMImplementation;
-import org.junit.Assert;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
@@ -111,7 +112,7 @@ public abstract class ElementContext extends Multiton implements Dimension {
new StringReader("<parent><sibling/></parent>"))
.getDocumentElement();
parent.getFirstOMChild().insertSiblingBefore(element);
- Assert.assertFalse(parent.isComplete());
+ assertThat(parent.isComplete()).isFalse();
return parent;
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/ExpansionStrategy.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/ExpansionStrategy.java
index bfa5d7177..56405c447 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/ExpansionStrategy.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/ExpansionStrategy.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dimension;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMSourcedElement;
@@ -27,7 +29,6 @@ import org.apache.axiom.testing.multiton.Multiton;
import org.apache.axiom.testutils.suite.Dimension;
import org.apache.axiom.testutils.suite.LabelTarget;
import org.apache.axiom.ts.dimension.serialization.SerializationStrategy;
-import org.junit.Assert;
/**
* Defines if and how an {@link OMContainer} is to be built or expanded during the execution of a
@@ -46,9 +47,9 @@ public abstract class ExpansionStrategy extends Multiton implements Dimension {
public void apply(OMContainer container) {
if (container instanceof OMSourcedElement sourcedElement) {
// Do nothing, but check that the element isn't expanded already
- Assert.assertFalse(sourcedElement.isExpanded());
+ assertThat(sourcedElement.isExpanded()).isFalse();
} else {
- Assert.assertFalse(container.isComplete());
+ assertThat(container.isComplete()).isFalse();
}
}
@@ -84,9 +85,9 @@ public abstract class ExpansionStrategy extends Multiton implements Dimension {
public void apply(OMContainer container) {
container.getFirstOMChild();
if (container instanceof OMSourcedElement sourcedElement) {
- Assert.assertTrue(sourcedElement.isExpanded());
+ assertThat(sourcedElement.isExpanded()).isTrue();
}
- Assert.assertFalse(container.isComplete());
+ assertThat(container.isComplete()).isFalse();
}
@Override
@@ -119,9 +120,9 @@ public abstract class ExpansionStrategy extends Multiton implements Dimension {
container.getFirstOMChild();
container.build();
if (container instanceof OMSourcedElement sourcedElement) {
- Assert.assertTrue(sourcedElement.isExpanded());
+ assertThat(sourcedElement.isExpanded()).isTrue();
}
- Assert.assertTrue(container.isComplete());
+ assertThat(container.isComplete()).isTrue();
}
@Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/DigestTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/DigestTestCase.java
index 7abf1dd6b..0355d5e24 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/DigestTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/DigestTestCase.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMInformationItem;
@@ -56,7 +58,7 @@ public abstract class DigestTestCase extends AxiomTestCase {
} else {
digest = digestGenerator.getDigest((OMNode) node, algorithm);
}
- assertEquals(expectedDigest, DigestUtils.toHexString(digest));
+ assertThat(DigestUtils.toHexString(digest)).isEqualTo(expectedDigest);
}
protected abstract OMInformationItem createInformationItem() throws Exception;
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java
index 20065d735..be9970b1f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java
@@ -20,6 +20,7 @@ package org.apache.axiom.ts.om;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -125,44 +126,42 @@ public abstract class SetNamespaceTestCase extends AxiomTestCase {
String expectedPrefix;
if (params.expectedPrefix() == null) {
expectedPrefix = node.getPrefix();
- assertNotNull(expectedPrefix);
- assertFalse(expectedPrefix.length() == 0);
+ assertThat(expectedPrefix).isNotNull();
+ assertThat(expectedPrefix).isNotEmpty();
} else {
expectedPrefix = params.expectedPrefix();
if (expectedPrefix.length() == 0) {
- assertNull(node.getPrefix());
+ assertThat(node.getPrefix()).isNull();
} else {
- assertEquals(expectedPrefix, node.getPrefix());
+ assertThat(node.getPrefix()).isEqualTo(expectedPrefix);
}
}
if (params.namespaceURI() == null || params.namespaceURI().length() == 0) {
- assertNull(node.getNamespace());
+ assertThat(node.getNamespace()).isNull();
} else {
OMNamespace actualNS = node.getNamespace();
- assertEquals(expectedPrefix, actualNS.getPrefix());
- assertEquals(params.namespaceURI(), actualNS.getNamespaceURI());
+ assertThat(actualNS.getPrefix()).isEqualTo(expectedPrefix);
+ assertThat(actualNS.getNamespaceURI()).isEqualTo(params.namespaceURI());
}
if (params.namespaceURI() == null || params.namespaceURI().length() == 0) {
- assertNull(node.getNamespaceURI());
+ assertThat(node.getNamespaceURI()).isNull();
} else {
- assertEquals(params.namespaceURI(), node.getNamespaceURI());
+ assertThat(node.getNamespaceURI()).isEqualTo(params.namespaceURI());
}
QName qname = node.getQName();
- assertEquals(expectedPrefix, qname.getPrefix());
- assertEquals(
- params.namespaceURI() == null ? "" : params.namespaceURI(),
- qname.getNamespaceURI());
+ assertThat(qname.getPrefix()).isEqualTo(expectedPrefix);
+ assertThat(qname.getNamespaceURI())
+ .isEqualTo(params.namespaceURI() == null ? "" : params.namespaceURI());
if (element != null) {
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
if (params.expectNSDecl()) {
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace decl = it.next();
- assertEquals(expectedPrefix, decl.getPrefix());
- assertEquals(
- params.namespaceURI() == null ? "" : params.namespaceURI(),
- decl.getNamespaceURI());
+ assertThat(decl.getPrefix()).isEqualTo(expectedPrefix);
+ assertThat(decl.getNamespaceURI())
+ .isEqualTo(params.namespaceURI() == null ? "" : params.namespaceURI());
}
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isFalse();
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetAttributeTypeDefault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetAttributeTypeDefault.java
index 471cdf8b4..7bb3151bb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetAttributeTypeDefault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetAttributeTypeDefault.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -40,6 +42,6 @@ public class TestGetAttributeTypeDefault extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("http://www.me.com", "axiom");
OMAttribute at = factory.createOMAttribute("id", ns, "value");
- assertEquals("CDATA", at.getAttributeType());
+ assertThat(at.getAttributeType()).isEqualTo("CDATA");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceNormalized.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceNormalized.java
index 6eb1e270d..28960a42d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceNormalized.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceNormalized.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -46,6 +48,6 @@ public class TestGetNamespaceNormalized extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("", "");
OMAttribute attr = factory.createOMAttribute("parent", ns, "value");
- assertNull(attr.getNamespace());
+ assertThat(attr.getNamespace()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceURIWithNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceURIWithNamespace.java
index 6151ada9c..5658914fb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceURIWithNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceURIWithNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -42,6 +44,6 @@ public class TestGetNamespaceURIWithNamespace extends AxiomTestCase {
OMAttribute attr =
factory.createOMAttribute(
"name", factory.createOMNamespace("urn:ns", "p"), "value");
- assertEquals("urn:ns", attr.getNamespaceURI());
+ assertThat(attr.getNamespaceURI()).isEqualTo("urn:ns");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceURIWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceURIWithoutNamespace.java
index 5c7ce006a..902895494 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceURIWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetNamespaceURIWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -40,6 +42,6 @@ public class TestGetNamespaceURIWithoutNamespace extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMAttribute attr = factory.createOMAttribute("name", null, "value");
- assertNull(attr.getNamespaceURI());
+ assertThat(attr.getNamespaceURI()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetPrefixWithNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetPrefixWithNamespace.java
index 18f5d67d3..17f35f7d6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetPrefixWithNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetPrefixWithNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -42,6 +44,6 @@ public class TestGetPrefixWithNamespace extends AxiomTestCase {
OMAttribute attr =
factory.createOMAttribute(
"name", factory.createOMNamespace("urn:ns", "p"), "value");
- assertEquals("p", attr.getPrefix());
+ assertThat(attr.getPrefix()).isEqualTo("p");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetPrefixWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetPrefixWithoutNamespace.java
index 15d825efa..18e452597 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetPrefixWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetPrefixWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -40,6 +42,6 @@ public class TestGetPrefixWithoutNamespace extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMAttribute attr = factory.createOMAttribute("name", null, "value");
- assertNull(attr.getPrefix());
+ assertThat(attr.getPrefix()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetQNameWithNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetQNameWithNamespace.java
index 7958cbae9..467170405 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetQNameWithNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetQNameWithNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
@@ -46,8 +48,8 @@ public class TestGetQNameWithNamespace extends AxiomTestCase {
OMNamespace ns = fac.createOMNamespace(uri, "p");
OMAttribute attr = fac.createOMAttribute(localName, ns, "value");
QName qname = attr.getQName();
- assertEquals("Wrong namespace", uri, qname.getNamespaceURI());
- assertEquals("Wrong localPart", localName, qname.getLocalPart());
- assertEquals("Wrong prefix", "p", qname.getPrefix());
+ assertThat(qname.getNamespaceURI()).isEqualTo(uri);
+ assertThat(qname.getLocalPart()).isEqualTo(localName);
+ assertThat(qname.getPrefix()).isEqualTo("p");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetQNameWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetQNameWithoutNamespace.java
index edb59b82f..573511aaa 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetQNameWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetQNameWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
@@ -42,8 +44,8 @@ public class TestGetQNameWithoutNamespace extends AxiomTestCase {
protected void runTest() throws Throwable {
OMAttribute attr = metaFactory.getOMFactory().createOMAttribute("name", null, "value");
QName qname = attr.getQName();
- assertEquals("name", qname.getLocalPart());
- assertEquals("", qname.getNamespaceURI());
- assertEquals("", qname.getPrefix());
+ assertThat(qname.getLocalPart()).isEqualTo("name");
+ assertThat(qname.getNamespaceURI()).isEqualTo("");
+ assertThat(qname.getPrefix()).isEqualTo("");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestHasNameWithNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestHasNameWithNamespace.java
index 6b7ba8b28..630d1b660 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestHasNameWithNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestHasNameWithNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
@@ -45,9 +47,9 @@ public class TestHasNameWithNamespace extends AxiomTestCase {
OMFactory fac = metaFactory.getOMFactory();
OMNamespace ns = fac.createOMNamespace(uri, "p");
OMAttribute attr = fac.createOMAttribute(localName, ns, "value");
- assertTrue(attr.hasName(new QName(uri, localName, "p")));
- assertTrue(attr.hasName(new QName(uri, localName, "q")));
- assertFalse(attr.hasName(new QName("http://example.org", localName, "p")));
- assertFalse(attr.hasName(new QName(uri, "otherName", "p")));
+ assertThat(attr.hasName(new QName(uri, localName, "p"))).isTrue();
+ assertThat(attr.hasName(new QName(uri, localName, "q"))).isTrue();
+ assertThat(attr.hasName(new QName("http://example.org", localName, "p"))).isFalse();
+ assertThat(attr.hasName(new QName(uri, "otherName", "p"))).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestHasNameWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestHasNameWithoutNamespace.java
index 260bee03e..92eb45f82 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestHasNameWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestHasNameWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
@@ -41,7 +43,7 @@ public class TestHasNameWithoutNamespace extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
OMAttribute attr = metaFactory.getOMFactory().createOMAttribute("name", null, "value");
- assertTrue(attr.hasName(new QName("name")));
- assertFalse(attr.hasName(new QName("urn:test", "name")));
+ assertThat(attr.hasName(new QName("name"))).isTrue();
+ assertThat(attr.hasName(new QName("urn:test", "name"))).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestSetLocalName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestSetLocalName.java
index bd01f15d8..0591353ed 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestSetLocalName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestSetLocalName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
@@ -40,10 +42,10 @@ public class TestSetLocalName extends AxiomTestCase {
factory.createOMAttribute(
"test", factory.createOMNamespace("urn:test", "p"), "value");
attr.setLocalName("test2");
- assertEquals("test2", attr.getLocalName());
+ assertThat(attr.getLocalName()).isEqualTo("test2");
QName qname = attr.getQName();
- assertEquals("test2", qname.getLocalPart());
- assertEquals("p", qname.getPrefix());
- assertEquals("urn:test", qname.getNamespaceURI());
+ assertThat(qname.getLocalPart()).isEqualTo("test2");
+ assertThat(qname.getPrefix()).isEqualTo("p");
+ assertThat(qname.getNamespaceURI()).isEqualTo("urn:test");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithStream.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithStream.java
index 9f4056cc2..15cde5437 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithStream.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithStream.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.testutils.io.InstrumentedStream;
@@ -48,7 +50,7 @@ public class TestCloseWithStream extends AxiomTestCase {
builder.getDocument().build();
builder.close();
// OMXMLParserWrapper#close() does _not_ close the underlying input stream
- assertFalse(in.isClosed());
+ assertThat(in.isClosed()).isFalse();
} finally {
in.close();
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
index a3ebf4c77..a9da0f4c0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.fail;
+
import java.io.InputStream;
import java.lang.ref.WeakReference;
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMElement.java
index 344b5d11b..44111f96b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMElement;
@@ -52,7 +54,7 @@ public class TestCreateOMBuilderFromDOMElement extends AxiomTestCase {
OMElement omB =
OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(), domB, true)
.getDocumentElement();
- assertEquals("b", omB.getLocalName());
- assertNull(omB.getNextOMSibling());
+ assertThat(omB.getLocalName()).isEqualTo("b");
+ assertThat(omB.getNextOMSibling()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderFromFragment.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderFromFragment.java
index 7acc74ac1..d72339fc7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderFromFragment.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderFromFragment.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLStreamConstants;
@@ -58,12 +60,12 @@ public class TestCreateStAXOMBuilderFromFragment extends AxiomTestCase {
OMElement element =
OMXMLBuilderFactory.createStAXOMBuilder(metaFactory.getOMFactory(), reader)
.getDocumentElement();
- assertEquals("b", element.getLocalName());
+ assertThat(element.getLocalName()).isEqualTo("b");
OMNode child = element.getFirstOMChild();
- assertTrue(child instanceof OMText);
- assertNull(element.getNextOMSibling());
+ assertThat(child).isInstanceOf(OMText.class);
+ assertThat(element.getNextOMSibling()).isNull();
// Check that the original reader is now positioned on the event just following </b>
- assertEquals(XMLStreamReader.END_ELEMENT, reader.getEventType());
- assertEquals("a", reader.getLocalName());
+ assertThat(reader.getEventType()).isEqualTo(XMLStreamReader.END_ELEMENT);
+ assertThat(reader.getLocalName()).isEqualTo("a");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java
index 41fd4778e..47ead8c07 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Iterator;
@@ -54,18 +56,18 @@ public class TestCreateStAXOMBuilderNamespaceRepairing extends AxiomTestCase {
.getDocumentElement();
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns = it.next();
- assertEquals("p", ns.getPrefix());
- assertEquals("urn:ns1", ns.getNamespaceURI());
- assertFalse(it.hasNext());
+ assertThat(ns.getPrefix()).isEqualTo("p");
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns1");
+ assertThat(it.hasNext()).isFalse();
OMElement child = element.getFirstElement();
it = child.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
ns = it.next();
- assertEquals("q", ns.getPrefix());
- assertEquals("urn:ns2", ns.getNamespaceURI());
- assertFalse(it.hasNext());
+ assertThat(ns.getPrefix()).isEqualTo("q");
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns2");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
index dab17f3c9..914856543 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Iterator;
@@ -56,18 +58,18 @@ public class TestCreateStAXOMBuilderNamespaceRepairing2 extends AxiomTestCase {
.getDocumentElement();
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns = it.next();
- assertEquals("", ns.getPrefix());
- assertEquals("urn:test", ns.getNamespaceURI());
- assertFalse(it.hasNext());
+ assertThat(ns.getPrefix()).isEqualTo("");
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(it.hasNext()).isFalse();
OMElement child = element.getFirstElement();
it = child.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
ns = it.next();
- assertEquals("", ns.getPrefix());
- assertEquals("", ns.getNamespaceURI());
- assertFalse(it.hasNext());
+ assertThat(ns.getPrefix()).isEqualTo("");
+ assertThat(ns.getNamespaceURI()).isEqualTo("");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
index 4fa6b976e..753765714 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.om.builder;
import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
import org.apache.axiom.om.OMComment;
@@ -65,36 +66,36 @@ public class TestGetDocumentElement extends AxiomTestCase {
} else {
element = builder.getDocumentElement(discardDocument.booleanValue());
}
- assertNotNull("Document element can not be null", element);
- assertEquals("Name of the document element is wrong", "root", element.getLocalName());
+ assertThat(element).isNotNull();
+ assertThat(element.getLocalName()).isEqualTo("root");
if (Boolean.TRUE.equals(discardDocument)) {
if (builderFactory.isDeferredParsing()) {
- assertFalse(element.isComplete());
+ assertThat(element.isComplete()).isFalse();
}
- assertNull(element.getParent());
+ assertThat(element.getParent()).isNull();
// Note: we can't test getNextOMSibling here because this would build the element
- assertNull(element.getPreviousOMSibling());
+ assertThat(element.getPreviousOMSibling()).isNull();
OMElement newParent = element.getOMFactory().createOMElement("newParent", null);
newParent.addChild(element);
if (builderFactory.isDeferredParsing()) {
- assertFalse(element.isComplete());
- assertFalse(builder.isCompleted());
+ assertThat(element.isComplete()).isFalse();
+ assertThat(builder.isCompleted()).isFalse();
}
assertAbout(xml())
.that(xml(OMElement.class, newParent))
.hasSameContentAs("<newParent><root/></newParent>");
- assertTrue(element.isComplete());
+ assertThat(element.isComplete()).isTrue();
// Since we discarded the document, the nodes in the epilog will not be accessible.
// Therefore we expect that when the document element changes its completion status,
// the builder will consume the epilog and change its completion status as well.
// This gives the underlying parser a chance to release some resources.
- assertTrue(builder.isCompleted());
+ assertThat(builder.isCompleted()).isTrue();
} else {
// The getDocumentElement doesn't detach the document element from the document:
- assertSame(builder.getDocument(), element.getParent());
- assertSame(builder.getDocument().getOMDocumentElement(), element);
- assertTrue(element.getPreviousOMSibling() instanceof OMComment);
- assertTrue(element.getNextOMSibling() instanceof OMComment);
+ assertThat(element.getParent()).isSameAs(builder.getDocument());
+ assertThat(element).isSameAs(builder.getDocument().getOMDocumentElement());
+ assertThat(element.getPreviousOMSibling()).isInstanceOf(OMComment.class);
+ assertThat(element.getNextOMSibling()).isInstanceOf(OMComment.class);
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
index d82736b4f..dbbee77fe 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
@@ -20,6 +20,7 @@ package org.apache.axiom.ts.om.builder;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
@@ -74,11 +75,11 @@ public class TestIOExceptionInGetText extends AxiomTestCase {
assertThatThrownBy(element::getNextOMSibling);
- assertTrue(invocationCounter.getInvocationCount() > 0);
+ assertThat(invocationCounter.getInvocationCount()).isGreaterThan(0);
invocationCounter.reset();
assertThatThrownBy(element::getNextOMSibling);
- assertEquals(0, invocationCounter.getInvocationCount());
+ assertThat(invocationCounter.getInvocationCount()).isEqualTo(0);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
index a93638e7f..49353d9a3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
@@ -60,7 +60,7 @@ public class TestInvalidXML extends AxiomTestCase {
assertThat(exception).isNotNull();
- assertTrue(invocationCounter.getInvocationCount() > 0);
+ assertThat(invocationCounter.getInvocationCount() > 0).isTrue();
invocationCounter.reset();
// Intentionally call builder again to make sure the same error is returned.
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java
index 70345f2c3..67edff363 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.OutputStream;
import org.apache.axiom.blob.Blob;
@@ -95,12 +97,12 @@ public class TestReadAttachmentBeforeRootPartComplete extends AxiomTestCase {
OMElement root = builder.getDocumentElement();
OMElement child1 = (OMElement) root.getFirstOMChild();
OMText text = (OMText) child1.getFirstOMChild();
- assertTrue(text.isBinary());
+ assertThat(text.isBinary()).isTrue();
// Access the Blob
Blob blob = text.getBlob();
IOTestUtils.compareStreams(orgBlob.getInputStream(), blob.getInputStream());
OMElement child2 = (OMElement) child1.getNextOMSibling();
- assertFalse(child2.isComplete());
- assertEquals(s, child2.getText());
+ assertThat(child2.isComplete()).isFalse();
+ assertThat(child2.getText()).isEqualTo(s);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestRootPartStreaming.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestRootPartStreaming.java
index a4ee07604..8b5c1ec8e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestRootPartStreaming.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestRootPartStreaming.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -84,6 +86,6 @@ public class TestRootPartStreaming extends AxiomTestCase {
// We expect that after requesting the document element, only a small part (corresponding to
// the size of the parser buffer) should have been read:
- assertTrue(count1 < count2 / 2);
+ assertThat(count1).isLessThan(count2 / 2);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestStandaloneConfiguration.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestStandaloneConfiguration.java
index c862c2619..8007f3ca6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestStandaloneConfiguration.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestStandaloneConfiguration.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.InputStream;
import java.util.Iterator;
@@ -50,7 +52,7 @@ public class TestStandaloneConfiguration extends AxiomTestCase {
OMXMLBuilderFactory.createOMBuilder(
metaFactory.getOMFactory(), StAXParserConfiguration.STANDALONE, is);
OMElement root = builder.getDocumentElement();
- assertTrue(root.getLocalName().equals("web-app"));
+ assertThat(root.getLocalName().equals("web-app")).isTrue();
OMDocument document = builder.getDocument();
Iterator<OMNode> i = document.getChildren();
OMDocType docType = null;
@@ -60,7 +62,7 @@ public class TestStandaloneConfiguration extends AxiomTestCase {
docType = omDocType;
}
}
- assertTrue(docType != null);
+ assertThat(docType != null).isTrue();
root.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
index 784d8c747..9cdee8154 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
@@ -22,6 +22,7 @@ import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -85,9 +86,9 @@ public class TestSerialize extends ConformanceTestCase {
throw ex;
}
if (serializationStrategy.isCaching()) {
- assertTrue(container.isComplete());
+ assertThat(container.isComplete()).isTrue();
} else {
- assertFalse(container.isComplete());
+ assertThat(container.isComplete()).isFalse();
assertThatThrownBy(container::getFirstOMChild)
.isInstanceOf(NodeUnavailableException.class);
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildIncomplete.java
index 26a2635a7..cb25dc756 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildIncomplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Iterator;
@@ -55,10 +57,10 @@ public class TestAddChildIncomplete extends AxiomTestCase {
.getDocument();
parent.addChild(factory.createOMComment(null, "d"));
Iterator<OMNode> it = parent.getChildren();
- assertEquals("a", ((OMComment) it.next()).getValue());
- assertEquals("b", ((OMElement) it.next()).getLocalName());
- assertEquals("c", ((OMComment) it.next()).getValue());
- assertEquals("d", ((OMComment) it.next()).getValue());
- assertFalse(it.hasNext());
+ assertThat(((OMComment) it.next()).getValue()).isEqualTo("a");
+ assertThat(((OMElement) it.next()).getLocalName()).isEqualTo("b");
+ assertThat(((OMComment) it.next()).getValue()).isEqualTo("c");
+ assertThat(((OMComment) it.next()).getValue()).isEqualTo("d");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java
index 652c14f90..ceac9e136 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -39,16 +41,16 @@ public class TestBuild extends AxiomTestCase {
InstrumentedInputStream in = new InstrumentedInputStream(XMLSample.LARGE.getInputStream());
OMDocument doc =
OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(), in).getDocument();
- assertFalse(doc.isComplete());
+ assertThat(doc.isComplete()).isFalse();
long countBeforeBuild = in.getCount();
doc.build();
- assertTrue(doc.isComplete());
+ assertThat(doc.isComplete()).isTrue();
long countAfterBuild = in.getCount();
- assertTrue(countAfterBuild > countBeforeBuild);
+ assertThat(countAfterBuild).isGreaterThan(countBeforeBuild);
OMNode node = doc.getFirstOMChild();
while (node != null) {
node = node.getNextOMSibling();
}
- assertEquals(countAfterBuild, in.getCount());
+ assertThat(in.getCount()).isEqualTo(countAfterBuild);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElement.java
index d1229811c..1fa6cfe81 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -41,6 +43,6 @@ public class TestGetOMDocumentElement extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMDocument document = factory.createOMDocument();
OMElement documentElement = factory.createOMElement("root", null, document);
- assertSame(documentElement, document.getOMDocumentElement());
+ assertThat(document.getOMDocumentElement()).isSameAs(documentElement);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElementAfterDetach.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElementAfterDetach.java
index 605880ecc..ec682373f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElementAfterDetach.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElementAfterDetach.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -43,8 +45,8 @@ public class TestGetOMDocumentElementAfterDetach extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMDocument document = factory.createOMDocument();
OMElement documentElement = factory.createOMElement("root", null, document);
- assertSame(documentElement, document.getOMDocumentElement());
+ assertThat(document.getOMDocumentElement()).isSameAs(documentElement);
documentElement.detach();
- assertNull(document.getOMDocumentElement());
+ assertThat(document.getOMDocumentElement()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElementWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElementWithParser.java
index b60fa7f79..ee759b2b8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElementWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetOMDocumentElementWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMDocument;
@@ -48,7 +50,7 @@ public class TestGetOMDocumentElementWithParser extends AxiomTestCase {
new StringReader("<!-- comment --><root/><!-- comment -->"))
.getDocument();
OMElement documentElement = document.getOMDocumentElement();
- assertNotNull(documentElement);
- assertEquals("root", documentElement.getLocalName());
+ assertThat(documentElement).isNotNull();
+ assertThat(documentElement.getLocalName()).isEqualTo("root");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestIsCompleteAfterAddingIncompleteChild.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestIsCompleteAfterAddingIncompleteChild.java
index 03b506617..a8809137a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestIsCompleteAfterAddingIncompleteChild.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestIsCompleteAfterAddingIncompleteChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMDocument;
@@ -47,8 +49,8 @@ public class TestIsCompleteAfterAddingIncompleteChild extends AxiomTestCase {
OMXMLBuilderFactory.createOMBuilder(factory, new StringReader("<elem>text</elem>"))
.getDocumentElement(true);
OMDocument document = factory.createOMDocument();
- assertTrue(document.isComplete());
+ assertThat(document.isComplete()).isTrue();
document.addChild(incompleteElement);
- assertFalse(document.isComplete());
+ assertThat(document.isComplete()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
index 0e270b058..147665cee 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.om.document;
import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
import org.apache.axiom.om.OMContainer;
@@ -64,25 +65,25 @@ public class TestRemoveChildren extends AxiomTestCase {
OMElement documentElement;
if (accessDocumentElement) {
documentElement = document.getOMDocumentElement();
- assertEquals(complete, documentElement.isComplete());
+ assertThat(documentElement.isComplete()).isEqualTo(complete);
} else {
documentElement = null;
}
document.removeChildren();
// Test that the child has been detached correctly.
- assertNull(firstChild.getParent());
- assertNull(firstChild.getPreviousOMSibling());
- assertNull(firstChild.getNextOMSibling());
+ assertThat(firstChild.getParent()).isNull();
+ assertThat(firstChild.getPreviousOMSibling()).isNull();
+ assertThat(firstChild.getNextOMSibling()).isNull();
if (documentElement != null) {
// Test that the child has been detached correctly.
- assertNull(documentElement.getParent());
- assertNull(documentElement.getPreviousOMSibling());
- assertNull(documentElement.getNextOMSibling());
+ assertThat(documentElement.getParent()).isNull();
+ assertThat(documentElement.getPreviousOMSibling()).isNull();
+ assertThat(documentElement.getNextOMSibling()).isNull();
// Test that we can still get the content of the document element.
- assertEquals("text", documentElement.getText());
+ assertThat(documentElement.getText()).isEqualTo("text");
}
// Test that the document is now empty.
- assertNull(document.getFirstOMChild());
+ assertThat(document.getFirstOMChild()).isNull();
// Check that the document is in a clean state and that we are able to add
// new children.
document.addChild(factory.createOMElement("newroot", null));
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNew.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNew.java
index 4869feb51..efc18d172 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNew.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNew.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMComment;
@@ -47,13 +49,13 @@ public class TestSetOMDocumentElementNew extends AxiomTestCase {
OMComment comment = factory.createOMComment(document, "some comment");
OMElement documentElement = factory.createOMElement("root", null);
document.setOMDocumentElement(documentElement);
- assertSame(documentElement, document.getOMDocumentElement());
- assertSame(document, documentElement.getParent());
+ assertThat(document.getOMDocumentElement()).isSameAs(documentElement);
+ assertThat(documentElement.getParent()).isSameAs(document);
Iterator<OMNode> it = document.getChildren();
- assertTrue(it.hasNext());
- assertSame(comment, it.next());
- assertTrue(it.hasNext());
- assertSame(documentElement, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isSameAs(comment);
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isSameAs(documentElement);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplace.java
index 0fd95cf32..0f641bda0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Iterator;
@@ -51,18 +53,18 @@ public class TestSetOMDocumentElementReplace extends AxiomTestCase {
.getDocument();
OMElement documentElement = factory.createOMElement("new", null);
document.setOMDocumentElement(documentElement);
- assertSame(documentElement, document.getOMDocumentElement());
+ assertThat(document.getOMDocumentElement()).isSameAs(documentElement);
Iterator<OMNode> it = document.getChildren();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNode child = it.next();
- assertTrue(child instanceof OMComment);
- assertEquals("comment1", ((OMComment) child).getValue());
- assertTrue(it.hasNext());
- assertSame(documentElement, it.next());
- assertTrue(it.hasNext());
+ assertThat(child).isInstanceOf(OMComment.class);
+ assertThat(((OMComment) child).getValue()).isEqualTo("comment1");
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isSameAs(documentElement);
+ assertThat(it.hasNext()).isTrue();
child = it.next();
- assertTrue(child instanceof OMComment);
- assertEquals("comment2", ((OMComment) child).getValue());
- assertFalse(it.hasNext());
+ assertThat(child).isInstanceOf(OMComment.class);
+ assertThat(((OMComment) child).getValue()).isEqualTo("comment2");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCharacterDataReaderFromParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCharacterDataReaderFromParser.java
index 446f3eea1..8837d2577 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCharacterDataReaderFromParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCharacterDataReaderFromParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.io.StringWriter;
@@ -59,12 +61,12 @@ public class TestCharacterDataReaderFromParser extends AxiomTestCase {
XMLStreamReader reader = doc.getXMLStreamReader(cache);
CharacterDataReader cdataReader =
(CharacterDataReader) reader.getProperty(CharacterDataReader.PROPERTY);
- assertNotNull(cdataReader);
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+ assertThat(cdataReader).isNotNull();
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
StringWriter sw = new StringWriter();
while (reader.next() == XMLStreamReader.CHARACTERS) {
cdataReader.writeTextTo(sw);
}
- assertEquals(text, sw.toString());
+ assertThat(sw.toString()).isEqualTo(text);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCloseWithoutCaching.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCloseWithoutCaching.java
index b9681b460..b24c33c83 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCloseWithoutCaching.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCloseWithoutCaching.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
@@ -66,6 +68,6 @@ public class TestCloseWithoutCaching extends AxiomTestCase {
reader.next();
long count = in.getCount();
reader.close();
- assertEquals(count, in.getCount());
+ assertThat(in.getCount()).isEqualTo(count);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReader.java
index 37b722573..1430ea6e2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReader.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.ext.stax.DTDReader;
@@ -50,11 +52,11 @@ public class TestDTDReader extends AxiomTestCase {
// Note that according to the specification of the DTDReader interface, it is
// allowed to look up the extension before reaching the DTD event.
DTDReader dtdReader = (DTDReader) reader.getProperty(DTDReader.PROPERTY);
- assertNotNull(dtdReader);
- assertEquals(XMLStreamReader.DTD, reader.next());
- assertEquals("root", dtdReader.getRootName());
- assertEquals("-//MY//DTD", dtdReader.getPublicId());
- assertEquals("my.dtd", dtdReader.getSystemId());
- assertEquals("<!ELEMENT root (#PCDATA)>", reader.getText());
+ assertThat(dtdReader).isNotNull();
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.DTD);
+ assertThat(dtdReader.getRootName()).isEqualTo("root");
+ assertThat(dtdReader.getPublicId()).isEqualTo("-//MY//DTD");
+ assertThat(dtdReader.getSystemId()).isEqualTo("my.dtd");
+ assertThat(reader.getText()).isEqualTo("<!ELEMENT root (#PCDATA)>");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReaderFromParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReaderFromParser.java
index 8a09ed6a6..abae140bc 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReaderFromParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestDTDReaderFromParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.ext.stax.DTDReader;
@@ -64,13 +66,13 @@ public class TestDTDReaderFromParser extends AxiomTestCase {
// Note that according to the specification of the DTDReader interface, it is
// allowed to look up the extension before reaching the DTD event.
DTDReader dtdReader = (DTDReader) reader.getProperty(DTDReader.PROPERTY);
- assertNotNull(dtdReader);
+ assertThat(dtdReader).isNotNull();
while (reader.next() != XMLStreamReader.DTD) {
// Just loop
}
- assertEquals("web-app", dtdReader.getRootName());
- assertEquals(
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", dtdReader.getPublicId());
- assertEquals("http://java.sun.com/dtd/web-app_2_3.dtd", dtdReader.getSystemId());
+ assertThat(dtdReader.getRootName()).isEqualTo("web-app");
+ assertThat(dtdReader.getPublicId())
+ .isEqualTo("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN");
+ assertThat(dtdReader.getSystemId()).isEqualTo("http://java.sun.com/dtd/web-app_2_3.dtd");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByElement.java
index 7a876a760..3e4dd5ead 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -46,11 +48,11 @@ public class TestAddAttributeAlreadyOwnedByElement extends AxiomTestCase {
OMElement element = factory.createOMElement(new QName("test"));
OMAttribute att = element.addAttribute("test", "test", null);
OMAttribute result = element.addAttribute(att);
- assertSame(result, att);
- assertSame(element, att.getOwner());
+ assertThat(att).isSameAs(result);
+ assertThat(att.getOwner()).isSameAs(element);
Iterator<OMAttribute> it = element.getAllAttributes();
- assertTrue(it.hasNext());
- assertSame(att, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isSameAs(att);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByOtherElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByOtherElement.java
index 18fe54f1e..4f599323d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByOtherElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByOtherElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
@@ -45,8 +47,8 @@ public class TestAddAttributeAlreadyOwnedByOtherElement extends AxiomTestCase {
OMElement element2 = factory.createOMElement(new QName("test"));
OMAttribute att1 = element1.addAttribute("test", "test", null);
OMAttribute att2 = element2.addAttribute(att1);
- assertSame(element1, att1.getOwner());
- assertNotSame(att1, att2);
- assertSame(element2, att2.getOwner());
+ assertThat(att1.getOwner()).isSameAs(element1);
+ assertThat(att2).isNotSameAs(att1);
+ assertThat(att2.getOwner()).isSameAs(element2);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java
index ca37b4f86..9aa88479b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMAttribute;
@@ -58,10 +60,10 @@ public class TestAddAttributeGeneratedPrefix extends AxiomTestCase {
OMAttribute attr =
element.addAttribute("attr", "value", factory.createOMNamespace("urn:test", null));
OMNamespace ns = attr.getNamespace();
- assertTrue(ns.getPrefix().length() > 0);
+ assertThat(ns.getPrefix()).isNotEmpty();
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
- assertEquals(ns, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java
index f1896b1b2..671cd834e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -54,6 +56,6 @@ public class TestAddAttributeWithExistingNamespaceDeclarationInScope extends Axi
OMElement child = factory.createOMElement(new QName("test"), root);
strategy.addAttribute(child, "test", ns, "test");
Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java
index ce7e30c59..8869485b0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -53,8 +55,8 @@ public class TestAddAttributeWithExistingNamespaceDeclarationOnSameElement exten
element.declareNamespace(ns);
strategy.addAttribute(element, "test", ns, "test");
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
- assertEquals(ns, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
index ac9bc7539..92a2d69a6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -71,8 +73,8 @@ public class TestAddAttributeWithMaskedNamespaceDeclaration extends AxiomTestCas
OMElement element3 = factory.createOMElement(new QName("c"), element2);
strategy.addAttribute(element3, "attr", ns1, "test");
Iterator<OMNamespace> it = element3.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
- assertEquals(ns1, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isEqualTo(ns1);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java
index 40ea65fe0..0ea9eabf1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -51,10 +53,10 @@ public class TestAddAttributeWithoutExistingNamespaceDeclaration extends AxiomTe
OMElement element = factory.createOMElement(new QName("test"));
OMNamespace ns = factory.createOMNamespace("urn:ns", "p");
strategy.addAttribute(element, "test", ns, "test");
- assertEquals(ns, element.findNamespace(ns.getNamespaceURI(), ns.getPrefix()));
+ assertThat(element.findNamespace(ns.getNamespaceURI(), ns.getPrefix())).isEqualTo(ns);
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
- assertEquals(ns, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java
index 3f4a9d990..0ac07c6f0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMAttribute;
@@ -58,10 +60,10 @@ public class TestAddAttributeWithoutNamespace extends AxiomTestCase {
OMAttribute attr =
addAttributeStrategy.addAttribute(
element, "test", noNamespaceStrategy.createOMNamespace(factory), "test");
- assertNull(attr.getNamespace());
+ assertThat(attr.getNamespace()).isNull();
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
- assertEquals(ns, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild.java
index c5d7a3f50..18817ff59 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -38,7 +40,7 @@ public class TestAddChild extends AxiomTestCase {
OMElement element = factory.createOMElement("test", null);
OMText text = factory.createOMText("test");
element.addChild(text);
- assertSame(element, text.getParent());
- assertSame(text, element.getFirstOMChild());
+ assertThat(text.getParent()).isSameAs(element);
+ assertThat(element.getFirstOMChild()).isSameAs(text);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild2.java
index 7f6c3f421..fa9f66171 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -53,11 +55,10 @@ public class TestAddChild2 extends AxiomTestCase {
int count = 0;
while (it.hasNext()) {
OMElement child = it.next();
- assertEquals("Child local name mismatch", childLocalName, child.getLocalName());
- assertEquals(
- "Child namespace mismatch", namespace, child.getNamespace().getNamespaceURI());
+ assertThat(child.getLocalName()).isEqualTo(childLocalName);
+ assertThat(child.getNamespace().getNamespaceURI()).isEqualTo(namespace);
count++;
}
- assertEquals("In correct number of children", 1, count);
+ assertThat(count).isEqualTo(1);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildIncomplete.java
index 3682c6169..470b5c297 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildIncomplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Iterator;
@@ -53,9 +55,9 @@ public class TestAddChildIncomplete extends AxiomTestCase {
.getDocumentElement();
parent.addChild(factory.createOMElement("c", null));
Iterator<OMNode> it = parent.getChildren();
- assertEquals("a", ((OMElement) it.next()).getLocalName());
- assertEquals("b", ((OMElement) it.next()).getLocalName());
- assertEquals("c", ((OMElement) it.next()).getLocalName());
- assertFalse(it.hasNext());
+ assertThat(((OMElement) it.next()).getLocalName()).isEqualTo("a");
+ assertThat(((OMElement) it.next()).getLocalName()).isEqualTo("b");
+ assertThat(((OMElement) it.next()).getLocalName()).isEqualTo("c");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithParent.java
index c5c8e55d5..6fc32739b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -45,8 +47,8 @@ public class TestAddChildWithParent extends AxiomTestCase {
OMText text = factory.createOMText("test");
element1.addChild(text);
element2.addChild(text);
- assertSame(element2, text.getParent());
- assertNull(element1.getFirstOMChild());
- assertSame(text, element2.getFirstOMChild());
+ assertThat(text.getParent()).isSameAs(element2);
+ assertThat(element1.getFirstOMChild()).isNull();
+ assertThat(element2.getFirstOMChild()).isSameAs(text);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java
index 7f93f6b19..973412468 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
@@ -52,12 +54,12 @@ public class TestAddChildWithSameParent extends AxiomTestCase {
OMElement b = (OMElement) parent.getFirstOMChild().getNextOMSibling();
parent.addChild(b);
OMElement child = (OMElement) parent.getFirstOMChild();
- assertEquals("a", child.getLocalName());
+ assertThat(child.getLocalName()).isEqualTo("a");
child = (OMElement) child.getNextOMSibling();
- assertEquals("c", child.getLocalName());
+ assertThat(child.getLocalName()).isEqualTo("c");
child = (OMElement) child.getNextOMSibling();
- assertSame(child, b);
- assertNull(child.getNextOMSibling());
- assertSame(parent, b.getParent());
+ assertThat(b).isSameAs(child);
+ assertThat(child.getNextOMSibling()).isNull();
+ assertThat(b.getParent()).isSameAs(parent);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestChildReDeclaringGrandParentsDefaultNSWithPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestChildReDeclaringGrandParentsDefaultNSWithPrefix.java
index 86b216e28..78fa23b91 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestChildReDeclaringGrandParentsDefaultNSWithPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestChildReDeclaringGrandParentsDefaultNSWithPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -56,8 +58,6 @@ public class TestChildReDeclaringGrandParentsDefaultNSWithPrefix extends AxiomTe
entElem);
binSecElem.setText("secret value");
String xml = elem.toString();
- assertTrue(
- "Binarysecret element should have \'wst\' ns prefix",
- xml.indexOf("<wst:Binarysecret") != -1);
+ assertThat(xml).contains("<wst:Binarysecret");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestChildReDeclaringParentsDefaultNSWithPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestChildReDeclaringParentsDefaultNSWithPrefix.java
index 281ed5404..a05849ad4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestChildReDeclaringParentsDefaultNSWithPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestChildReDeclaringParentsDefaultNSWithPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.ByteArrayInputStream;
import javax.xml.namespace.QName;
@@ -65,9 +67,10 @@ public class TestChildReDeclaringParentsDefaultNSWithPrefix extends AxiomTestCas
String assertText3 =
"<wst:Entropy xmlns:wst=\"http://schemas.xmlsoap.org/ws/2005/02/trust\"></wst:Entropy>";
- assertTrue(
- (xml.indexOf(assertText1) != -1)
- || (xml.indexOf(assertText2) != -1)
- || (xml.indexOf(assertText3) != -1));
+ assertThat(xml)
+ .satisfiesAnyOf(
+ s -> assertThat(s).contains(assertText1),
+ s -> assertThat(s).contains(assertText2),
+ s -> assertThat(s).contains(assertText3));
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElementNamespaceRepairing.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElementNamespaceRepairing.java
index 10550d301..c7f9a3286 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElementNamespaceRepairing.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElementNamespaceRepairing.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -55,7 +57,7 @@ public class TestCloneOMElementNamespaceRepairing extends AxiomTestCase {
// Check that the child has no namespace declarations (to validate the correctness of the
// test)
- assertFalse(child.getAllDeclaredNamespaces().hasNext());
+ assertThat(child.getAllDeclaredNamespaces().hasNext()).isFalse();
// Clone the child and check that namespace declarations have been generated automatically
OMElement clone = child.cloneOMElement();
@@ -66,6 +68,6 @@ public class TestCloneOMElementNamespaceRepairing extends AxiomTestCase {
for (Iterator<OMNamespace> it = clone.getAllDeclaredNamespaces(); it.hasNext(); ) {
actualNSDecls.add(it.next());
}
- assertEquals(expectedNSDecls, actualNSDecls);
+ assertThat(actualNSDecls).isEqualTo(expectedNSDecls);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespace1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespace1.java
index a4ccdb315..9d4bec298 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespace1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespace1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -39,12 +41,12 @@ public class TestDeclareNamespace1 extends AxiomTestCase {
protected void runTest() throws Throwable {
OMElement element = metaFactory.getOMFactory().createOMElement(new QName("test"));
OMNamespace ns = element.declareNamespace("urn:ns1", "ns1");
- assertEquals("urn:ns1", ns.getNamespaceURI());
- assertEquals("ns1", ns.getPrefix());
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns1");
+ assertThat(ns.getPrefix()).isEqualTo("ns1");
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns2 = it.next();
- assertEquals(ns, ns2);
- assertFalse(it.hasNext());
+ assertThat(ns2).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix1.java
index 027f4ed40..21ad836e3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -45,13 +47,13 @@ public class TestDeclareNamespaceWithGeneratedPrefix1 extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName("test"));
OMNamespace ns = element.declareNamespace(factory.createOMNamespace("urn:ns", null));
- assertEquals("urn:ns", ns.getNamespaceURI());
- assertNotNull(ns.getPrefix());
- assertTrue(ns.getPrefix().length() > 0);
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns");
+ assertThat(ns.getPrefix()).isNotNull();
+ assertThat(ns.getPrefix().length() > 0).isTrue();
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns2 = it.next();
- assertEquals(ns, ns2);
- assertFalse(it.hasNext());
+ assertThat(ns2).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix3.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix3.java
index b61c21a50..df2a1e2f1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix3.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix3.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -45,13 +47,13 @@ public class TestDeclareNamespaceWithGeneratedPrefix3 extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName("test"));
OMNamespace ns = element.declareNamespace("urn:ns", null);
- assertEquals("urn:ns", ns.getNamespaceURI());
- assertNotNull(ns.getPrefix());
- assertTrue(ns.getPrefix().length() > 0);
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns");
+ assertThat(ns.getPrefix()).isNotNull();
+ assertThat(ns.getPrefix().length() > 0).isTrue();
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns2 = it.next();
- assertEquals(ns, ns2);
- assertFalse(it.hasNext());
+ assertThat(ns2).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardDocumentElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardDocumentElement.java
index ba46e4c9a..81a0ffefd 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardDocumentElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardDocumentElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMDocument;
@@ -49,6 +51,6 @@ public class TestDiscardDocumentElement extends AxiomTestCase {
.getDocument();
OMElement element = document.getOMDocumentElement();
element.discard();
- assertNull(document.getFirstOMChild());
+ assertThat(document.getFirstOMChild()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardPartiallyBuilt.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardPartiallyBuilt.java
index c8c1a9b56..49e1afdbb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardPartiallyBuilt.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardPartiallyBuilt.java
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.om.element;
import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
import org.apache.axiom.om.OMElement;
@@ -58,7 +59,7 @@ public class TestDiscardPartiallyBuilt extends AxiomTestCase {
// Navigate to the text node so that the element is partially built
OMElement b = element.getFirstElement().getFirstElement();
OMText text = (OMText) b.getFirstOMChild();
- assertEquals("text", text.getText());
+ assertThat(text.getText()).isEqualTo("text");
element.discard();
assertAbout(xml())
@@ -67,6 +68,6 @@ public class TestDiscardPartiallyBuilt extends AxiomTestCase {
// Force the builder to complete the document. If the discard method didn't adjust the
// element depth correctly, then an exception will occur here
- assertNull(root.getNextOMSibling());
+ assertThat(root.getNextOMSibling()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceByNamespaceURIMasked.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceByNamespaceURIMasked.java
index a426a73c0..babf95778 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceByNamespaceURIMasked.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceByNamespaceURIMasked.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.util.AXIOMUtil;
@@ -42,7 +44,7 @@ public class TestFindNamespaceByNamespaceURIMasked extends AxiomTestCase {
AXIOMUtil.stringToOM(
metaFactory.getOMFactory(),
"<root xmlns:p='urn:ns1'><child xmlns:p='urn:ns2'/></a>");
- assertNull(root.getFirstElement().findNamespace("urn:ns1", null));
+ assertThat(root.getFirstElement().findNamespace("urn:ns1", null)).isNull();
root.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceByPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceByPrefix.java
index 93195f73a..0a1997cb4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceByPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceByPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -38,8 +40,8 @@ public class TestFindNamespaceByPrefix extends AxiomTestCase {
AXIOMUtil.stringToOM(
metaFactory.getOMFactory(), "<a:root xmlns:a='urn:a'><child/></a:root>");
OMNamespace ns = root.getFirstElement().findNamespace(null, "a");
- assertNotNull(ns);
- assertEquals("urn:a", ns.getNamespaceURI());
+ assertThat(ns).isNotNull();
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:a");
root.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceCaseSensitivity.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceCaseSensitivity.java
index f93f0256f..c4ace6b8b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceCaseSensitivity.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceCaseSensitivity.java
@@ -19,6 +19,8 @@
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -40,6 +42,6 @@ public class TestFindNamespaceCaseSensitivity extends AxiomTestCase {
OMFactory fac = metaFactory.getOMFactory();
OMElement el = fac.createOMElement("foo", null);
el.declareNamespace(NSURI, "p");
- assertNull(el.findNamespace(NSURI_UPPER, "p"));
+ assertThat(el.findNamespace(NSURI_UPPER, "p")).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceURIWithPrefixUndeclaring.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceURIWithPrefixUndeclaring.java
index dc9a06a41..78ee06a1e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceURIWithPrefixUndeclaring.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestFindNamespaceURIWithPrefixUndeclaring.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -39,7 +41,7 @@ public class TestFindNamespaceURIWithPrefixUndeclaring extends AxiomTestCase {
OMElement child = factory.createOMElement("child", null, parent);
OMNamespace ns = parent.declareNamespace("urn:test", "p");
child.undeclarePrefix("p");
- assertEquals(ns, parent.findNamespaceURI("p"));
- assertNull(child.findNamespaceURI("p"));
+ assertThat(parent.findNamespaceURI("p")).isEqualTo(ns);
+ assertThat(child.findNamespaceURI("p")).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes1.java
index b1776647a..0c189e4c9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMAttribute;
@@ -40,12 +42,12 @@ public class TestGetAllAttributes1 extends AxiomTestCase {
element.addAttribute("attr1", "value1", null);
element.addAttribute("attr2", "value2", null);
Iterator<OMAttribute> it = element.getAllAttributes();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMAttribute attr = it.next();
- assertEquals("attr1", attr.getLocalName());
- assertTrue(it.hasNext());
+ assertThat(attr.getLocalName()).isEqualTo("attr1");
+ assertThat(it.hasNext()).isTrue();
attr = it.next();
- assertEquals("attr2", attr.getLocalName());
- assertFalse(it.hasNext());
+ assertThat(attr.getLocalName()).isEqualTo("attr2");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes2.java
index 2361e8384..3af3c626a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMAttribute;
@@ -44,10 +46,10 @@ public class TestGetAllAttributes2 extends AxiomTestCase {
AXIOMUtil.stringToOM(
metaFactory.getOMFactory(), "<e xmlns:p='urn:test' p:attr='test'/>");
Iterator<OMAttribute> it = element.getAllAttributes();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMAttribute attr = it.next();
- assertEquals("urn:test", attr.getNamespace().getNamespaceURI());
- assertEquals("attr", attr.getLocalName());
- assertFalse(it.hasNext());
+ assertThat(attr.getNamespace().getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(attr.getLocalName()).isEqualTo("attr");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespaces.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespaces.java
index ad272cb72..d9edfd2e7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespaces.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespaces.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -40,10 +42,10 @@ public class TestGetAllDeclaredNamespaces extends AxiomTestCase {
AXIOMUtil.stringToOM(
metaFactory.getOMFactory(), "<e xmlns:p='urn:test' p:attr='test'/>");
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns = it.next();
- assertEquals("p", ns.getPrefix());
- assertEquals("urn:test", ns.getNamespaceURI());
- assertFalse(it.hasNext());
+ assertThat(ns.getPrefix()).isEqualTo("p");
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueNonExisting.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueNonExisting.java
index 23182cbab..844803c15 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueNonExisting.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueNonExisting.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -42,6 +44,6 @@ public class TestGetAttributeValueNonExisting extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement("test", null);
element.addAttribute("attr", "value", null);
- assertNull(element.getAttributeValue(new QName("urn:ns", "attr2")));
+ assertThat(element.getAttributeValue(new QName("urn:ns", "attr2"))).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java
index a745a8386..59caeecf5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
@@ -47,9 +49,7 @@ public class TestGetAttributeValueWithXmlPrefix1 extends AxiomTestCase {
"<wsp:Policy xml:base=\"uri:thisBase\" "
+ "xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\">"
+ "</wsp:Policy>");
- assertEquals(
- "Attribute value mismatch",
- "uri:thisBase",
- elem.getAttributeValue(new QName(XMLConstants.XML_NS_URI, "base")));
+ assertThat(elem.getAttributeValue(new QName(XMLConstants.XML_NS_URI, "base")))
+ .isEqualTo("uri:thisBase");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java
index 3528e94c0..6952bc3d9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
@@ -44,9 +46,7 @@ public class TestGetAttributeValueWithXmlPrefix2 extends AxiomTestCase {
OMElement elem =
AXIOMUtil.stringToOM(
metaFactory.getOMFactory(), "<Policy xml:base=\"uri:thisBase\"></Policy>");
- assertEquals(
- "Attribute value mismatch",
- "uri:thisBase",
- elem.getAttributeValue(new QName(XMLConstants.XML_NS_URI, "base")));
+ assertThat(elem.getAttributeValue(new QName(XMLConstants.XML_NS_URI, "base")))
+ .isEqualTo("uri:thisBase");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java
index 9ab579e42..1fd108d90 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
@@ -49,9 +51,6 @@ public class TestGetAttributeWithXmlPrefix1 extends AxiomTestCase {
+ "xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\">"
+ "</wsp:Policy>");
OMAttribute attr = elem.getAttribute(new QName(XMLConstants.XML_NS_URI, "base"));
- assertEquals(
- "Attribute namespace mismatch",
- XMLConstants.XML_NS_URI,
- attr.getNamespace().getNamespaceURI());
+ assertThat(attr.getNamespace().getNamespaceURI()).isEqualTo(XMLConstants.XML_NS_URI);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java
index aefeecb24..0e3263f4b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
@@ -46,9 +48,6 @@ public class TestGetAttributeWithXmlPrefix2 extends AxiomTestCase {
AXIOMUtil.stringToOM(
metaFactory.getOMFactory(), "<Policy xml:base=\"uri:thisBase\"></Policy>");
OMAttribute attr = elem.getAttribute(new QName(XMLConstants.XML_NS_URI, "base"));
- assertEquals(
- "Attribute namespace mismatch",
- XMLConstants.XML_NS_URI,
- attr.getNamespace().getNamespaceURI());
+ assertThat(attr.getNamespace().getNamespaceURI()).isEqualTo(XMLConstants.XML_NS_URI);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java
index ddee7279e..092babbd9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Iterator;
@@ -48,10 +50,10 @@ public class TestGetChildElements extends AxiomTestCase {
while (iter.hasNext()) {
counter++;
OMElement o = iter.next();
- assertNotNull("Must return not null objects!", o);
- assertTrue("All these should be elements!", o.getType() == OMNode.ELEMENT_NODE);
+ assertThat(o).isNotNull();
+ assertThat(o.getType()).isEqualTo(OMNode.ELEMENT_NODE);
}
- assertEquals("This element should contain only two elements ", 2, counter);
+ assertThat(counter).isEqualTo(2);
elt.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java
index e51e1039b..8ea7d93ca 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Iterator;
@@ -47,10 +49,9 @@ public class TestGetChildren extends AxiomTestCase {
int counter = 0;
while (iter.hasNext()) {
counter++;
- assertNotNull("Must return not null objects!", iter.next());
+ assertThat(iter.next()).isNotNull();
}
- assertEquals(
- "This element should contain only five children including the text ", 5, counter);
+ assertThat(counter).isEqualTo(5);
elt.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java
index baffddebf..c37816616 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.fail;
+
import java.io.StringReader;
import java.util.Iterator;
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java
index 91ee5d3af..356fc24e5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Iterator;
@@ -47,7 +49,7 @@ public class TestGetChildrenRemove4 extends AxiomTestCase {
int firstChildrenCount = 0;
int secondChildrenCount = 0;
while (iter.hasNext()) {
- assertNotNull(iter.next());
+ assertThat(iter.next()).isNotNull();
firstChildrenCount++;
}
@@ -59,11 +61,10 @@ public class TestGetChildrenRemove4 extends AxiomTestCase {
// reset the iterator
iter = elt.getChildren(); // reset the iterator
while (iter.hasNext()) {
- assertNotNull(iter.next());
+ assertThat(iter.next()).isNotNull();
secondChildrenCount++;
}
- assertEquals(
- "children count must reduce from 1", firstChildrenCount - 1, secondChildrenCount);
+ assertThat(secondChildrenCount).isEqualTo(firstChildrenCount - 1);
elt.close(false);
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName.java
index e5b9d2295..7b4dc4011 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -51,12 +53,10 @@ public class TestGetChildrenWithName extends AxiomTestCase {
while (iter.hasNext()) {
counter++;
Object o = iter.next();
- assertNotNull("Must return not null objects!", o);
- assertTrue(
- "All these should be elements!", ((OMNode) o).getType() == OMNode.ELEMENT_NODE);
+ assertThat(o).isNotNull();
+ assertThat(((OMNode) o).getType()).isEqualTo(OMNode.ELEMENT_NODE);
}
- assertEquals(
- "This element should contain only one element with the given QName ", 1, counter);
+ assertThat(counter).isEqualTo(1);
elt.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName3.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName3.java
index 76406870d..4b56c74d2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName3.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName3.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -51,6 +53,6 @@ public class TestGetChildrenWithName3 extends AxiomTestCase {
documentElement.getChildrenWithName(
new QName("http://test.ws.org", "Employee", "test"));
OMElement employee = childrenIter.next(); // should walk past OMText
- assertEquals("Employee test was incorrect", employee.getText(), "Apache Developer");
+ assertThat(employee.getText()).isEqualTo("Apache Developer");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNameNextWithoutHasNext.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNameNextWithoutHasNext.java
index d0af7ac31..e49041740 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNameNextWithoutHasNext.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNameNextWithoutHasNext.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -50,6 +52,6 @@ public class TestGetChildrenWithNameNextWithoutHasNext extends AxiomTestCase {
factory.createOMElement(new QName("child1"), element);
OMElement child2 = factory.createOMElement(new QName("child2"), element);
Iterator<OMElement> it = element.getChildrenWithName(new QName("child2"));
- assertSame(child2, it.next());
+ assertThat(it.next()).isSameAs(child2);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNamespaceURI.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNamespaceURI.java
index 502facfc7..be82e23a6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNamespaceURI.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNamespaceURI.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Iterator;
@@ -45,10 +47,10 @@ public class TestGetChildrenWithNamespaceURI extends AxiomTestCase {
"<root><a xmlns='urn:ns1'/><b xmlns='urn:ns2'/><c xmlns='urn:ns1'/></root>"))
.getDocumentElement();
Iterator<OMElement> it = element.getChildrenWithNamespaceURI("urn:ns1");
- assertTrue(it.hasNext());
- assertEquals("a", it.next().getLocalName());
- assertTrue(it.hasNext());
- assertEquals("c", it.next().getLocalName());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next().getLocalName()).isEqualTo("a");
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next().getLocalName()).isEqualTo("c");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace.java
index 2acfa68b3..a354940c7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -40,8 +42,8 @@ public class TestGetDefaultNamespace extends AxiomTestCase {
OMElement parent = factory.createOMElement("parent", "urn:ns1", "");
OMElement child = factory.createOMElement(new QName("urn:ns2", "child", "p"), parent);
OMNamespace ns = child.getDefaultNamespace();
- assertNotNull(ns);
- assertEquals("", ns.getPrefix());
- assertEquals("urn:ns1", ns.getNamespaceURI());
+ assertThat(ns).isNotNull();
+ assertThat(ns.getPrefix()).isEqualTo("");
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns1");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace2.java
index 208b06241..e262a5a2f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -48,6 +50,6 @@ public class TestGetDefaultNamespace2 extends AxiomTestCase {
OMElement parent = factory.createOMElement("parent", "urn:test", "");
OMElement child = factory.createOMElement("child", null, parent);
OMNamespace ns = child.getDefaultNamespace();
- assertNull(ns);
+ assertThat(ns).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java
index b211ad56e..19fafd74d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -49,13 +51,13 @@ public class TestGetDescendants extends AxiomTestCase {
// (the iterator must never return <g>, which is a sibling of <a>).
Iterator<OMNode> it = element.getFirstElement().getDescendants(includeSelf);
if (includeSelf) {
- assertEquals("a", ((OMElement) it.next()).getLocalName());
+ assertThat(((OMElement) it.next()).getLocalName()).isEqualTo("a");
}
- assertEquals("b", ((OMElement) it.next()).getLocalName());
- assertEquals("c", ((OMElement) it.next()).getLocalName());
- assertEquals("d", ((OMElement) it.next()).getLocalName());
- assertEquals("e", ((OMElement) it.next()).getLocalName());
- assertEquals("f", ((OMElement) it.next()).getLocalName());
- assertFalse(it.hasNext());
+ assertThat(((OMElement) it.next()).getLocalName()).isEqualTo("b");
+ assertThat(((OMElement) it.next()).getLocalName()).isEqualTo("c");
+ assertThat(((OMElement) it.next()).getLocalName()).isEqualTo("d");
+ assertThat(((OMElement) it.next()).getLocalName()).isEqualTo("e");
+ assertThat(((OMElement) it.next()).getLocalName()).isEqualTo("f");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstChildWithName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstChildWithName.java
index 860383aca..00915cc42 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstChildWithName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstChildWithName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -49,18 +51,18 @@ public class TestGetFirstChildWithName extends AxiomTestCase {
factory.createOMElement("a", ns1, parent);
// Check that it's really the first element that is returned
- assertSame(child1, parent.getFirstChildWithName(new QName("urn:ns1", "a")));
+ assertThat(parent.getFirstChildWithName(new QName("urn:ns1", "a"))).isSameAs(child1);
// Test with a child that is not the first one
- assertSame(child2, parent.getFirstChildWithName(new QName("urn:ns2", "b")));
+ assertThat(parent.getFirstChildWithName(new QName("urn:ns2", "b"))).isSameAs(child2);
// Check that the namespace URI is taken into account
- assertNull(parent.getFirstChildWithName(new QName("b")));
+ assertThat(parent.getFirstChildWithName(new QName("b"))).isNull();
// Check that the prefix of the given QName is not taken into account
- assertSame(child3, parent.getFirstChildWithName(new QName("urn:ns1", "b", "ns2")));
+ assertThat(parent.getFirstChildWithName(new QName("urn:ns1", "b", "ns2"))).isSameAs(child3);
// Test with null namespace
- assertSame(child4, parent.getFirstChildWithName(new QName("c")));
+ assertThat(parent.getFirstChildWithName(new QName("c"))).isSameAs(child4);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstChildWithNameOnIncompleteElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstChildWithNameOnIncompleteElement.java
index 116c25ac9..4b1f8b15c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstChildWithNameOnIncompleteElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstChildWithNameOnIncompleteElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.namespace.QName;
@@ -48,6 +50,6 @@ public class TestGetFirstChildWithNameOnIncompleteElement extends AxiomTestCase
new StringReader("<root><a/><b/><c/></root>"))
.getDocumentElement();
OMElement b = element.getFirstChildWithName(new QName("b"));
- assertFalse(b.isComplete());
+ assertThat(b.isComplete()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java
index aa5d26091..9aecb7e43 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.InputStream;
import java.util.HashSet;
import java.util.Iterator;
@@ -51,34 +53,34 @@ public class TestGetNamespaceContext extends AxiomTestCase {
.getDocumentElement();
OMElement inner = root.getFirstElement().getFirstElement();
NamespaceContext context = inner.getNamespaceContext(detached);
- assertEquals("urn:test2", context.getNamespaceURI("p"));
- assertEquals("urn:test3", context.getNamespaceURI("q"));
- assertEquals("urn:test3", context.getNamespaceURI("r"));
- assertEquals("urn:test4", context.getNamespaceURI(""));
- assertEquals("", context.getNamespaceURI("unbound"));
+ assertThat(context.getNamespaceURI("p")).isEqualTo("urn:test2");
+ assertThat(context.getNamespaceURI("q")).isEqualTo("urn:test3");
+ assertThat(context.getNamespaceURI("r")).isEqualTo("urn:test3");
+ assertThat(context.getNamespaceURI("")).isEqualTo("urn:test4");
+ assertThat(context.getNamespaceURI("unbound")).isEqualTo("");
- assertNull(context.getPrefix("urn:test1"));
- assertEquals("p", context.getPrefix("urn:test2"));
+ assertThat(context.getPrefix("urn:test1")).isNull();
+ assertThat(context.getPrefix("urn:test2")).isEqualTo("p");
String prefix = context.getPrefix("urn:test3");
- assertTrue(prefix.equals("q") || prefix.equals("r"));
- assertEquals("", context.getPrefix("urn:test4"));
- assertNull(context.getPrefix("unbound"));
+ assertThat(prefix.equals("q") || prefix.equals("r")).isTrue();
+ assertThat(context.getPrefix("urn:test4")).isEqualTo("");
+ assertThat(context.getPrefix("unbound")).isNull();
Iterator<?> it = context.getPrefixes("urn:test1");
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isFalse();
it = context.getPrefixes("urn:test2");
- assertTrue(it.hasNext());
- assertEquals("p", it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isEqualTo("p");
+ assertThat(it.hasNext()).isFalse();
it = context.getPrefixes("urn:test3");
Set<String> prefixes = new HashSet<>();
while (it.hasNext()) {
prefixes.add((String) it.next());
}
- assertEquals(2, prefixes.size());
- assertTrue(prefixes.contains("q"));
- assertTrue(prefixes.contains("r"));
+ assertThat(prefixes.size()).isEqualTo(2);
+ assertThat(prefixes.contains("q")).isTrue();
+ assertThat(prefixes.contains("r")).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java
index b45a281a4..9fcc0bc9a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -59,6 +61,6 @@ public class TestGetNamespaceNormalized extends AxiomTestCase {
OMNamespace ns = useNull ? null : factory.createOMNamespace("", "");
OMElement child = factory.createOMElement("child", ns);
parent.addChild(child);
- assertNull(child.getNamespace());
+ assertThat(child.getNamespace()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithParser.java
index 72537c716..2eb37411d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMElement;
@@ -46,6 +48,6 @@ public class TestGetNamespaceNormalizedWithParser extends AxiomTestCase {
OMXMLBuilderFactory.createOMBuilder(
metaFactory.getOMFactory(), new StringReader("<root xmlns=''/>"))
.getDocumentElement();
- assertNull(element.getNamespace());
+ assertThat(element.getNamespace()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithSAXSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithSAXSource.java
index 4b31ff965..115819024 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithSAXSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithSAXSource.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.parsers.SAXParser;
@@ -59,6 +61,6 @@ public class TestGetNamespaceNormalizedWithSAXSource extends AxiomTestCase {
OMElement element =
OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(), source)
.getDocumentElement();
- assertNull(element.getNamespace());
+ assertThat(element.getNamespace()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceURIWithNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceURIWithNamespace.java
index e09a03a26..263655b46 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceURIWithNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceURIWithNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -42,6 +44,6 @@ public class TestGetNamespaceURIWithNamespace extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName("urn:ns", "test", "p"));
- assertEquals("urn:ns", element.getNamespaceURI());
+ assertThat(element.getNamespaceURI()).isEqualTo("urn:ns");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceURIWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceURIWithoutNamespace.java
index 64bab6401..086cdd04c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceURIWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceURIWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -42,6 +44,6 @@ public class TestGetNamespaceURIWithoutNamespace extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName("test"));
- assertNull(element.getNamespaceURI());
+ assertThat(element.getNamespaceURI()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScope.java
index 9b25318ac..575499463 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScope.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -49,16 +52,16 @@ public class TestGetNamespacesInScope extends AxiomTestCase {
count++;
if (ns.getPrefix().equals("ns1")) {
ns1seen = true;
- assertEquals("urn:ns1", ns.getNamespaceURI());
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns1");
} else if (ns.getPrefix().equals("ns2")) {
ns2seen = true;
- assertEquals("urn:ns2", ns.getNamespaceURI());
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns2");
} else {
fail("Unexpected prefix: " + ns.getPrefix());
}
}
- assertEquals("Number of namespaces in scope", 2, count);
- assertTrue(ns1seen);
- assertTrue(ns2seen);
+ assertThat(count).isEqualTo(2);
+ assertThat(ns1seen).isTrue();
+ assertThat(ns2seen).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithDefaultNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithDefaultNamespace.java
index fc40d7092..66960e6c2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithDefaultNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -39,10 +41,10 @@ public class TestGetNamespacesInScopeWithDefaultNamespace extends AxiomTestCase
OMElement element =
AXIOMUtil.stringToOM(metaFactory.getOMFactory(), "<a xmlns='urn:test'><b/></a>");
Iterator<OMNamespace> it = element.getFirstElement().getNamespacesInScope();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns = it.next();
- assertEquals("", ns.getPrefix());
- assertEquals("urn:test", ns.getNamespaceURI());
- assertFalse(it.hasNext());
+ assertThat(ns.getPrefix()).isEqualTo("");
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedDefaultNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedDefaultNamespace.java
index a6fbf8a1f..7d1a242b3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedDefaultNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -40,6 +42,6 @@ public class TestGetNamespacesInScopeWithMaskedDefaultNamespace extends AxiomTes
AXIOMUtil.stringToOM(
metaFactory.getOMFactory(), "<a xmlns='urn:test'><b xmlns=''/></a>");
Iterator<OMNamespace> it = element.getFirstElement().getNamespacesInScope();
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedNamespace.java
index 2abb9a712..717d03607 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -41,10 +43,10 @@ public class TestGetNamespacesInScopeWithMaskedNamespace extends AxiomTestCase {
metaFactory.getOMFactory(),
"<a xmlns:p='urn:ns1'><b xmlns:p='urn:ns2'/></a>");
Iterator<OMNamespace> it = element.getFirstElement().getNamespacesInScope();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns = it.next();
- assertEquals("p", ns.getPrefix());
- assertEquals("urn:ns2", ns.getNamespaceURI());
- assertFalse(it.hasNext());
+ assertThat(ns.getPrefix()).isEqualTo("p");
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns2");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithDefaultNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithDefaultNamespace.java
index d5f8dde98..e8a483e0c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithDefaultNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -41,6 +43,6 @@ public class TestGetPrefixWithDefaultNamespace extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element =
factory.createOMElement("test", factory.createOMNamespace("urn:ns", ""));
- assertNull(element.getPrefix());
+ assertThat(element.getPrefix()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithNamespace.java
index 752a2a556..10c52eb92 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -42,6 +44,6 @@ public class TestGetPrefixWithNamespace extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName("urn:ns", "test", "p"));
- assertEquals("p", element.getPrefix());
+ assertThat(element.getPrefix()).isEqualTo("p");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithoutNamespace.java
index ba6be129f..5dc54ac8d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetPrefixWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -42,6 +44,6 @@ public class TestGetPrefixWithoutNamespace extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName("test"));
- assertNull(element.getPrefix());
+ assertThat(element.getPrefix()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetQNameWithNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetQNameWithNamespace.java
index b92c75de4..f8c2e10a2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetQNameWithNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetQNameWithNamespace.java
@@ -19,6 +19,8 @@
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -43,8 +45,8 @@ public class TestGetQNameWithNamespace extends AxiomTestCase {
OMElement elem = factory.createOMElement(localName, namespace, prefix);
QName qname = elem.getQName();
- assertEquals("Localname mismatch", localName, qname.getLocalPart());
- assertEquals("Namespace mismatch", namespace, qname.getNamespaceURI());
- assertEquals("namespace prefix mismatch", prefix, qname.getPrefix());
+ assertThat(qname.getLocalPart()).isEqualTo(localName);
+ assertThat(qname.getNamespaceURI()).isEqualTo(namespace);
+ assertThat(qname.getPrefix()).isEqualTo(prefix);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetQNameWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetQNameWithoutNamespace.java
index 227e38414..a82f80b9e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetQNameWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetQNameWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -36,8 +38,8 @@ public class TestGetQNameWithoutNamespace extends AxiomTestCase {
protected void runTest() throws Throwable {
OMElement element = metaFactory.getOMFactory().createOMElement("name", null);
QName qname = element.getQName();
- assertEquals("name", qname.getLocalPart());
- assertEquals("", qname.getNamespaceURI());
- assertEquals("", qname.getPrefix());
+ assertThat(qname.getLocalPart()).isEqualTo("name");
+ assertThat(qname.getNamespaceURI()).isEqualTo("");
+ assertThat(qname.getPrefix()).isEqualTo("");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXResultWithDTD.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXResultWithDTD.java
index d3ee48f7f..b9d6c9fec 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXResultWithDTD.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXResultWithDTD.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.transform.sax.SAXResult;
import org.apache.axiom.om.OMContainer;
@@ -55,7 +57,7 @@ public class TestGetSAXResultWithDTD extends AxiomTestCase {
contentHandler.endElement("", "test", "test");
contentHandler.endDocument();
OMNode child = root.getFirstOMChild();
- assertTrue(child instanceof OMElement);
- assertEquals("test", ((OMElement) child).getLocalName());
+ assertThat(child).isInstanceOf(OMElement.class);
+ assertThat(((OMElement) child).getLocalName()).isEqualTo("test");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java
index c17a5aa72..afc17b53b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.InputStream;
import javax.xml.transform.Transformer;
@@ -91,8 +93,8 @@ public class TestGetSAXSourceIdentityTransformOnFragment extends AxiomTestCase {
transformer.transform(element.getSAXSource(cache), outputDocument.getSAXResult());
OMNamespace ns = outputDocument.getOMDocumentElement().findNamespaceURI("p");
- assertNotNull(ns);
- assertEquals("urn:some:namespace", ns.getNamespaceURI());
+ assertThat(ns).isNotNull();
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:some:namespace");
element.close(false);
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetText.java
index d789dc42d..5e5932f80 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetText.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -42,6 +44,6 @@ public class TestGetText extends AxiomTestCase {
OMElement element = factory.createOMElement("test", null);
String text = "The quick brown fox jumps over the lazy dog";
factory.createOMText(element, text);
- assertEquals("Text value mismatch", text, element.getText());
+ assertThat(element.getText()).isEqualTo(text);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQName.java
index 7a10ca556..4a18220c5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -42,7 +44,7 @@ public class TestGetTextAsQName extends AxiomTestCase {
OMElement child = factory.createOMElement("child", null, parent);
child.setText("p:value");
QName textAsQName = child.getTextAsQName();
- assertEquals(new QName("urn:ns", "value"), textAsQName);
- assertEquals("p", textAsQName.getPrefix());
+ assertThat(textAsQName).isEqualTo(new QName("urn:ns", "value"));
+ assertThat(textAsQName.getPrefix()).isEqualTo("p");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameEmpty.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameEmpty.java
index bbf035856..b94a9f8e7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameEmpty.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameEmpty.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -36,6 +38,6 @@ public class TestGetTextAsQNameEmpty extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement("test", null);
- assertNull(element.getTextAsQName());
+ assertThat(element.getTextAsQName()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameNoNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameNoNamespace.java
index 6a65aca0b..980bb7bcb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameNoNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameNoNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -42,6 +44,6 @@ public class TestGetTextAsQNameNoNamespace extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement omElement = factory.createOMElement("TestElement", null);
omElement.setText("value");
- assertEquals(new QName("value"), omElement.getTextAsQName());
+ assertThat(omElement.getTextAsQName()).isEqualTo(new QName("value"));
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameWithExtraWhitespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameWithExtraWhitespace.java
index a80b07c6d..20f42103c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameWithExtraWhitespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsQNameWithExtraWhitespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -43,6 +45,6 @@ public class TestGetTextAsQNameWithExtraWhitespace extends AxiomTestCase {
OMElement element = factory.createOMElement("test", null);
element.declareNamespace("urn:test", "ns1");
element.setText(" ns1:test ");
- assertEquals(new QName("urn:test", "test"), element.getTextAsQName());
+ assertThat(element.getTextAsQName()).isEqualTo(new QName("urn:test", "test"));
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithNonTextChildren.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithNonTextChildren.java
index 05e7844c6..602b85d78 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithNonTextChildren.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithNonTextChildren.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.Reader;
import org.apache.axiom.om.OMElement;
@@ -38,6 +40,6 @@ public class TestGetTextAsStreamWithNonTextChildren extends AxiomTestCase {
protected void runTest() throws Throwable {
OMElement element = AXIOMUtil.stringToOM(metaFactory.getOMFactory(), "<a>A<b>B</b>C</a>");
Reader in = element.getTextAsStream(true);
- assertEquals(element.getText(), IOUtils.toString(in));
+ assertThat(IOUtils.toString(in)).isEqualTo(element.getText());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithSingleTextNode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithSingleTextNode.java
index 04a9dabec..917132ab7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithSingleTextNode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithSingleTextNode.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.Reader;
import java.io.StringReader;
@@ -43,7 +45,7 @@ public class TestGetTextAsStreamWithSingleTextNode extends AxiomTestCase {
OMElement element = factory.createOMElement(new QName("a"));
factory.createOMText(element, "test");
Reader in = element.getTextAsStream(true);
- assertTrue(in instanceof StringReader);
- assertEquals(element.getText(), IOUtils.toString(in));
+ assertThat(in).isInstanceOf(StringReader.class);
+ assertThat(IOUtils.toString(in)).isEqualTo(element.getText());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextWithCDATASectionChild.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextWithCDATASectionChild.java
index 2df7df95d..973a7160f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextWithCDATASectionChild.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextWithCDATASectionChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamConstants;
import org.apache.axiom.om.OMElement;
@@ -43,6 +45,6 @@ public class TestGetTextWithCDATASectionChild extends AxiomTestCase {
OMElement omElement = factory.createOMElement("TestElement", null);
final String text = "this is <some> text in a CDATA";
factory.createOMText(omElement, text, XMLStreamConstants.CDATA);
- assertEquals(text, omElement.getText());
+ assertThat(omElement.getText()).isEqualTo(text);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextWithMixedOMTextChildren.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextWithMixedOMTextChildren.java
index f86b1a80b..9883aa680 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextWithMixedOMTextChildren.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextWithMixedOMTextChildren.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamConstants;
import org.apache.axiom.om.OMElement;
@@ -45,6 +47,6 @@ public class TestGetTextWithMixedOMTextChildren extends AxiomTestCase {
final String text = "this is <some> text in a CDATA";
factory.createOMText(omElement, normalText);
factory.createOMText(omElement, text, XMLStreamConstants.CDATA);
- assertEquals(normalText + text, omElement.getText());
+ assertThat(omElement.getText()).isEqualTo(normalText + text);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromElement.java
index f9338c01c..2f266845d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromElement.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import java.util.Arrays;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.stream.XMLStreamReader;
@@ -48,17 +48,15 @@ public class TestGetXMLStreamReaderCDATAEventFromElement extends AxiomTestCase {
XMLStreamReader reader2 = element.getXMLStreamReader();
// Check the sequence of events
int event = reader2.next();
- assertEquals(XMLStreamReader.START_ELEMENT, event);
+ assertThat(event).isEqualTo(XMLStreamReader.START_ELEMENT);
while (reader2.hasNext() && event != XMLStreamReader.CDATA) {
event = reader2.next();
}
- assertEquals(XMLStreamReader.CDATA, event);
- assertEquals("hello world", reader2.getText()); // AXIOM-146
- assertTrue(
- Arrays.equals(
- "hello world".toCharArray(), reader2.getTextCharacters())); // AXIOM-144
- assertEquals(XMLStreamReader.END_ELEMENT, reader2.next());
+ assertThat(event).isEqualTo(XMLStreamReader.CDATA);
+ assertThat(reader2.getText()).isEqualTo("hello world"); // AXIOM-146
+ assertThat(reader2.getTextCharacters()).isEqualTo("hello world".toCharArray()); // AXIOM-144
+ assertThat(reader2.next()).isEqualTo(XMLStreamReader.END_ELEMENT);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromParser.java
index 96d3f54e0..bd6922bf9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromParser.java
@@ -18,10 +18,10 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import java.util.Arrays;
-
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.OMElement;
@@ -61,7 +61,7 @@ public class TestGetXMLStreamReaderCDATAEventFromParser extends AxiomTestCase {
XMLStreamReader reader2 = element.getXMLStreamReader();
// Check the sequence of events
int event = reader2.next();
- assertEquals(XMLStreamReader.START_ELEMENT, event);
+ assertThat(event).isEqualTo(XMLStreamReader.START_ELEMENT);
while (reader2.hasNext() && event != XMLStreamReader.CDATA) {
event = reader2.next();
@@ -70,12 +70,11 @@ public class TestGetXMLStreamReaderCDATAEventFromParser extends AxiomTestCase {
// Only woodstox is guaranteed to generate CDATA events if
// javax.xml.stream.isCoalescing=false
if (reader.toString().indexOf("wstx") != -1) {
- assertEquals(XMLStreamReader.CDATA, event);
- assertEquals("hello world", reader2.getText()); // AXIOM-146
- assertTrue(
- Arrays.equals(
- "hello world".toCharArray(), reader2.getTextCharacters())); // AXIOM-144
- assertEquals(XMLStreamReader.END_ELEMENT, reader2.next());
+ assertThat(event).isEqualTo(XMLStreamReader.CDATA);
+ assertThat(reader2.getText()).isEqualTo("hello world"); // AXIOM-146
+ assertThat(reader2.getTextCharacters())
+ .isEqualTo("hello world".toCharArray()); // AXIOM-144
+ assertThat(reader2.next()).isEqualTo(XMLStreamReader.END_ELEMENT);
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java
index 45d7d9fd1..61801f534 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.OMContainer;
@@ -54,16 +56,16 @@ public class TestGetXMLStreamReaderOnNonRootElement extends AxiomTestCase {
metaFactory.getOMFactory(), "<a><b><c/></b><d>content</d></a>");
OMElement b = (OMElement) root.getFirstOMChild();
XMLStreamReader stream = b.getXMLStreamReader(cache);
- assertEquals(XMLStreamReader.START_DOCUMENT, stream.getEventType());
- assertEquals(XMLStreamReader.START_ELEMENT, stream.next());
- assertEquals("b", stream.getLocalName());
- assertEquals(XMLStreamReader.START_ELEMENT, stream.next());
- assertEquals("c", stream.getLocalName());
- assertEquals(XMLStreamReader.END_ELEMENT, stream.next());
- assertEquals(XMLStreamReader.END_ELEMENT, stream.next());
- assertEquals(XMLStreamReader.END_DOCUMENT, stream.next());
+ assertThat(stream.getEventType()).isEqualTo(XMLStreamReader.START_DOCUMENT);
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(stream.getLocalName()).isEqualTo("b");
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(stream.getLocalName()).isEqualTo("c");
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.END_ELEMENT);
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.END_ELEMENT);
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.END_DOCUMENT);
OMElement d = (OMElement) b.getNextOMSibling();
- assertEquals("content", d.getText());
+ assertThat(d.getText()).isEqualTo("content");
root.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java
index 40ededb6b..894f5ccd7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.stream.XMLStreamReader;
@@ -68,7 +70,7 @@ public class TestGetXMLStreamReaderWithCaching extends AxiomTestCase {
count++;
}
- assertEquals("Number of elements need to be 2", count, 2);
+ assertThat(count).isEqualTo(2);
documentElement.close(false);
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java
index f653d2e2c..3922f7d5d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.namespace.QName;
@@ -61,19 +63,19 @@ public class TestGetXMLStreamReaderWithIncompleteDescendant extends AxiomTestCas
OMXMLBuilderFactory.createOMBuilder(factory, new StringReader("<a>test</a>"))
.getDocumentElement(true);
root.addChild(child);
- assertFalse(child.isComplete());
+ assertThat(child.isComplete()).isFalse();
XMLStreamReader stream = root.getXMLStreamReader(cache);
- assertEquals(XMLStreamReader.START_ELEMENT, stream.next());
- assertEquals("root", stream.getLocalName());
- assertEquals(XMLStreamReader.START_ELEMENT, stream.next());
- assertEquals("a", stream.getLocalName());
- assertEquals(XMLStreamReader.CHARACTERS, stream.next());
- assertEquals("test", stream.getText());
- assertEquals(XMLStreamReader.END_ELEMENT, stream.next());
- assertEquals("a", stream.getLocalName());
- assertEquals(XMLStreamReader.END_ELEMENT, stream.next());
- assertEquals("root", stream.getLocalName());
- assertEquals(XMLStreamReader.END_DOCUMENT, stream.next());
- assertEquals(cache, child.isComplete());
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(stream.getLocalName()).isEqualTo("root");
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(stream.getLocalName()).isEqualTo("a");
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.CHARACTERS);
+ assertThat(stream.getText()).isEqualTo("test");
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.END_ELEMENT);
+ assertThat(stream.getLocalName()).isEqualTo("a");
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.END_ELEMENT);
+ assertThat(stream.getLocalName()).isEqualTo("root");
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.END_DOCUMENT);
+ assertThat(child.isComplete()).isEqualTo(cache);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithNamespaceURIInterning.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithNamespaceURIInterning.java
index 6ef93c841..86b10b825 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithNamespaceURIInterning.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithNamespaceURIInterning.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamReader;
@@ -67,6 +69,6 @@ public class TestGetXMLStreamReaderWithNamespaceURIInterning extends AxiomTestCa
}
private static void assertInterned(String s) {
- assertSame("String not interned", s.intern(), s);
+ assertThat(s).isSameAs(s.intern());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithoutCachingPartiallyBuilt.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithoutCachingPartiallyBuilt.java
index 110eb1bdf..ff7d88dec 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithoutCachingPartiallyBuilt.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithoutCachingPartiallyBuilt.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLStreamReader;
@@ -64,6 +66,6 @@ public class TestGetXMLStreamReaderWithoutCachingPartiallyBuilt extends AxiomTes
depth--;
}
}
- assertEquals(0, depth);
+ assertThat(depth).isEqualTo(0);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithoutCachingPartiallyBuiltModified.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithoutCachingPartiallyBuiltModified.java
index ff823d034..f3a220bd3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithoutCachingPartiallyBuiltModified.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithoutCachingPartiallyBuiltModified.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.namespace.QName;
@@ -53,7 +55,7 @@ public class TestGetXMLStreamReaderWithoutCachingPartiallyBuiltModified extends
OMElement b = root.getFirstChildWithName(new QName("b"));
b.addAttribute("att", "value", null);
- assertFalse(b.isComplete());
+ assertThat(b.isComplete()).isFalse();
XMLStreamReader reader = root.getXMLStreamReaderWithoutCaching();
@@ -61,12 +63,12 @@ public class TestGetXMLStreamReaderWithoutCachingPartiallyBuiltModified extends
for (int i = 0; i < 4; i++) {
reader.next();
}
- assertEquals(XMLStreamReader.START_ELEMENT, reader.getEventType());
- assertEquals("b", reader.getLocalName());
+ assertThat(reader.getEventType()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(reader.getLocalName()).isEqualTo("b");
// The previously added attribute must be visible
- assertEquals(1, reader.getAttributeCount());
- assertEquals("att", reader.getAttributeLocalName(0));
- assertEquals("value", reader.getAttributeValue(0));
+ assertThat(reader.getAttributeCount()).isEqualTo(1);
+ assertThat(reader.getAttributeLocalName(0)).isEqualTo("att");
+ assertThat(reader.getAttributeValue(0)).isEqualTo("value");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestHasNameWithNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestHasNameWithNamespace.java
index c15ea4f8d..a9f9b5112 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestHasNameWithNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestHasNameWithNamespace.java
@@ -19,6 +19,8 @@
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -41,9 +43,10 @@ public class TestHasNameWithNamespace extends AxiomTestCase {
String namespace = "http://ws.apache.org/axis2/ns";
String prefix = "axis2";
OMElement element = factory.createOMElement(localName, namespace, prefix);
- assertTrue(element.hasName(new QName(namespace, localName, prefix)));
- assertTrue(element.hasName(new QName(namespace, localName, "otherPrefix")));
- assertFalse(element.hasName(new QName("http://some.other.org/", localName, prefix)));
- assertFalse(element.hasName(new QName(namespace, "otherName", prefix)));
+ assertThat(element.hasName(new QName(namespace, localName, prefix))).isTrue();
+ assertThat(element.hasName(new QName(namespace, localName, "otherPrefix"))).isTrue();
+ assertThat(element.hasName(new QName("http://some.other.org/", localName, prefix)))
+ .isFalse();
+ assertThat(element.hasName(new QName(namespace, "otherName", prefix))).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestHasNameWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestHasNameWithoutNamespace.java
index 9055c05dc..9dbe5abba 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestHasNameWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestHasNameWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -35,7 +37,7 @@ public class TestHasNameWithoutNamespace extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
OMElement element = metaFactory.getOMFactory().createOMElement("name", null);
- assertTrue(element.hasName(new QName("name")));
- assertFalse(element.hasName(new QName("urn:test", "name")));
+ assertThat(element.hasName(new QName("name"))).isTrue();
+ assertThat(element.hasName(new QName("urn:test", "name"))).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestIsCompleteAfterAddingIncompleteChild.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestIsCompleteAfterAddingIncompleteChild.java
index 4412b98d6..d3d239d97 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestIsCompleteAfterAddingIncompleteChild.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestIsCompleteAfterAddingIncompleteChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMElement;
@@ -46,8 +48,8 @@ public class TestIsCompleteAfterAddingIncompleteChild extends AxiomTestCase {
OMXMLBuilderFactory.createOMBuilder(factory, new StringReader("<elem>text</elem>"))
.getDocumentElement(true);
OMElement root = factory.createOMElement("root", null);
- assertTrue(root.isComplete());
+ assertThat(root.isComplete()).isTrue();
root.addChild(incompleteElement);
- assertFalse(root.isComplete());
+ assertThat(root.isComplete()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestIsCompleteWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestIsCompleteWithParser.java
index 1b728e6cc..96942197c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestIsCompleteWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestIsCompleteWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMElement;
@@ -44,10 +46,10 @@ public class TestIsCompleteWithParser extends AxiomTestCase {
OMXMLBuilderFactory.createOMBuilder(
metaFactory.getOMFactory(), new StringReader("<a><b/></a>"))
.getDocumentElement();
- assertFalse(element.isComplete());
+ assertThat(element.isComplete()).isFalse();
element.getFirstElement().getNextOMSibling();
- assertTrue(element.isComplete());
+ assertThat(element.isComplete()).isTrue();
element.getNextOMSibling();
- assertTrue(element.isComplete());
+ assertThat(element.isComplete()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestMultipleDefaultNS.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestMultipleDefaultNS.java
index ef9fefd4c..67ba17d05 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestMultipleDefaultNS.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestMultipleDefaultNS.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -55,7 +57,13 @@ public class TestMultipleDefaultNS extends AxiomTestCase {
OMNamespace omElementTwoChildNS = omElementTwoChild.getNamespace();
// TODO: LLOM's and DOOM's behaviors are slightly different here; need to check if both are
// allowed
- assertTrue(omElementOneChildNS == null || "".equals(omElementOneChildNS.getNamespaceURI()));
- assertTrue(omElementTwoChildNS == null || "".equals(omElementTwoChildNS.getNamespaceURI()));
+ assertThat(omElementOneChildNS)
+ .satisfiesAnyOf(
+ ns -> assertThat(ns).isNull(),
+ ns -> assertThat(ns.getNamespaceURI()).isEmpty());
+ assertThat(omElementTwoChildNS)
+ .satisfiesAnyOf(
+ ns -> assertThat(ns).isNull(),
+ ns -> assertThat(ns.getNamespaceURI()).isEmpty());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttribute.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttribute.java
index 038cee15a..07ce907b9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttribute.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttribute.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMAttribute;
@@ -42,10 +44,10 @@ public class TestRemoveAttribute extends AxiomTestCase {
OMAttribute attr1 = element.addAttribute("attr1", "value1", null);
OMAttribute attr2 = element.addAttribute("attr2", "value2", null);
element.removeAttribute(attr1);
- assertNull(attr1.getOwner());
+ assertThat(attr1.getOwner()).isNull();
Iterator<OMAttribute> it = element.getAllAttributes();
- assertTrue(it.hasNext());
- assertSame(attr2, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isSameAs(attr2);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
index fd70194fc..a2ef16197 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.om.element;
import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
import org.apache.axiom.om.OMContainer;
@@ -54,18 +55,18 @@ public class TestRemoveChildren extends AxiomTestCase {
element.build();
}
OMElement firstChild = (OMElement) element.getFirstOMChild();
- assertEquals(complete, element.isComplete());
- assertEquals(complete, firstChild.isComplete());
+ assertThat(element.isComplete()).isEqualTo(complete);
+ assertThat(firstChild.isComplete()).isEqualTo(complete);
element.removeChildren();
// We still need to be able to get the content of the child we retrieved before
// calling removeChildren.
- assertEquals("A", firstChild.getText());
+ assertThat(firstChild.getText()).isEqualTo("A");
// Test that the child has been detached correctly.
- assertNull(firstChild.getParent());
- assertNull(firstChild.getPreviousOMSibling());
- assertNull(firstChild.getNextOMSibling());
+ assertThat(firstChild.getParent()).isNull();
+ assertThat(firstChild.getPreviousOMSibling()).isNull();
+ assertThat(firstChild.getNextOMSibling()).isNull();
// Test that the element is now empty.
- assertNull(element.getFirstOMChild());
+ assertThat(element.getFirstOMChild()).isNull();
// Check that the element is in a clean state and that we are able to add
// new children.
element.addChild(factory.createOMElement("c", null));
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithDefaultNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithDefaultNamespace.java
index 90fdf53ec..a66d326c9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithDefaultNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -39,8 +41,8 @@ public class TestResolveQNameWithDefaultNamespace extends AxiomTestCase {
AXIOMUtil.stringToOM(
metaFactory.getOMFactory(), "<p:root xmlns:p='urn:ns1' xmlns='urn:ns2'/>");
QName qname = element.resolveQName("test");
- assertEquals("", qname.getPrefix());
- assertEquals("urn:ns2", qname.getNamespaceURI());
- assertEquals("test", qname.getLocalPart());
+ assertThat(qname.getPrefix()).isEqualTo("");
+ assertThat(qname.getNamespaceURI()).isEqualTo("urn:ns2");
+ assertThat(qname.getLocalPart()).isEqualTo("test");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithNonDefaultNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithNonDefaultNamespace.java
index 19e7fc742..cedc93de1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithNonDefaultNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithNonDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -38,8 +40,8 @@ public class TestResolveQNameWithNonDefaultNamespace extends AxiomTestCase {
OMElement element =
AXIOMUtil.stringToOM(metaFactory.getOMFactory(), "<root xmlns:p='urn:ns'/>");
QName qname = element.resolveQName("p:test");
- assertEquals("p", qname.getPrefix());
- assertEquals("urn:ns", qname.getNamespaceURI());
- assertEquals("test", qname.getLocalPart());
+ assertThat(qname.getPrefix()).isEqualTo("p");
+ assertThat(qname.getNamespaceURI()).isEqualTo("urn:ns");
+ assertThat(qname.getLocalPart()).isEqualTo("test");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithUnboundPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithUnboundPrefix.java
index 1923b5c60..e952500ab 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithUnboundPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithUnboundPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.util.AXIOMUtil;
@@ -40,6 +42,6 @@ public class TestResolveQNameWithUnboundPrefix extends AxiomTestCase {
OMElement element =
AXIOMUtil.stringToOM(
metaFactory.getOMFactory(), "<p:root xmlns:p='urn:ns1' xmlns='urn:ns2'/>");
- assertNull(element.resolveQName("ns:test"));
+ assertThat(element.resolveQName("ns:test")).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithoutNamespace.java
index 78fc03a55..70ebf5a4f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestResolveQNameWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -38,8 +40,8 @@ public class TestResolveQNameWithoutNamespace extends AxiomTestCase {
OMElement element =
AXIOMUtil.stringToOM(metaFactory.getOMFactory(), "<p:root xmlns:p='urn:ns1'/>");
QName qname = element.resolveQName("test");
- assertEquals("", qname.getPrefix());
- assertEquals("", qname.getNamespaceURI());
- assertEquals("test", qname.getLocalPart());
+ assertThat(qname.getPrefix()).isEqualTo("");
+ assertThat(qname.getNamespaceURI()).isEqualTo("");
+ assertThat(qname.getLocalPart()).isEqualTo("test");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
index 579abe0a3..00fbee33d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -133,6 +135,6 @@ public class TestSerialization extends AxiomTestCase {
personElem.addChild(ageElem);
personElem.addChild(weightElem);
- assertEquals(params.expected(), personElem.toString());
+ assertThat(personElem.toString()).isEqualTo(params.expected());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializationWithTwoNonBuiltOMElements.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializationWithTwoNonBuiltOMElements.java
index 25989dd4e..c6c5df742 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializationWithTwoNonBuiltOMElements.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializationWithTwoNonBuiltOMElements.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMElement;
@@ -54,7 +56,7 @@ public class TestSerializationWithTwoNonBuiltOMElements extends AxiomTestCase {
.getDocumentElement(true);
rootElement.addChild(childTwo);
- assertTrue(expectedXML.equals(rootElement.toString()));
+ assertThat(expectedXML.equals(rootElement.toString())).isTrue();
childOne.close(false);
childTwo.close(false);
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumePartiallyBuilt.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumePartiallyBuilt.java
index 9280a3993..626ab6e69 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumePartiallyBuilt.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumePartiallyBuilt.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.io.StringWriter;
@@ -53,6 +55,6 @@ public class TestSerializeAndConsumePartiallyBuilt extends AxiomTestCase {
StringWriter out = new StringWriter();
root.serializeAndConsume(out);
- assertEquals(xml, out.toString());
+ assertThat(out.toString()).isEqualTo(xml);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeWithIncompleteDescendant.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeWithIncompleteDescendant.java
index 743f2e7ab..eda8694ed 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeWithIncompleteDescendant.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeWithIncompleteDescendant.java
@@ -20,6 +20,7 @@ package org.apache.axiom.ts.om.element;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
import java.io.StringWriter;
@@ -56,7 +57,7 @@ public class TestSerializeAndConsumeWithIncompleteDescendant extends AxiomTestCa
child.addChild(incompleteElement);
StringWriter out = new StringWriter();
root.serializeAndConsume(out);
- assertEquals("<root><child><elem>text</elem></child></root>", out.toString());
+ assertThat(out.toString()).isEqualTo("<root><child><elem>text</elem></child></root>");
assertThatThrownBy(incompleteElement::getFirstOMChild)
.isInstanceOf(NodeUnavailableException.class);
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetText.java
index c33a40681..c9e0d6ec1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetText.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -40,13 +42,13 @@ public class TestSetText extends AxiomTestCase {
element.setText(text);
// Check that OMElement#getText() returns a matching value
- assertEquals("Text value mismatch", text, element.getText());
+ assertThat(element.getText()).isEqualTo(text);
// Check that OMElement#setText() has created the expected nodes
OMNode child = element.getFirstOMChild();
- assertTrue(child instanceof OMText);
- assertSame(element, child.getParent());
- assertEquals(text, ((OMText) child).getText());
- assertNull(child.getNextOMSibling());
+ assertThat(child).isInstanceOf(OMText.class);
+ assertThat(child.getParent()).isSameAs(element);
+ assertThat(((OMText) child).getText()).isEqualTo(text);
+ assertThat(child.getNextOMSibling()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextEmptyString.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextEmptyString.java
index 749b1e08b..6092edc39 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextEmptyString.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextEmptyString.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -39,6 +41,6 @@ public class TestSetTextEmptyString extends AxiomTestCase {
OMElement element = metaFactory.getOMFactory().createOMElement("test", null);
element.setText("some text");
element.setText("");
- assertNull(element.getFirstOMChild());
+ assertThat(element.getFirstOMChild()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextNull.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextNull.java
index e0b383344..4aed06d0a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextNull.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextNull.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -39,6 +41,6 @@ public class TestSetTextNull extends AxiomTestCase {
OMElement element = metaFactory.getOMFactory().createOMElement("test", null);
element.setText("some text");
element.setText((String) null);
- assertNull(element.getFirstOMChild());
+ assertThat(element.getFirstOMChild()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQName.java
index 857562c35..e89f9511c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -53,10 +55,10 @@ public class TestSetTextQName extends AxiomTestCase {
foundNamespace = true;
}
}
- assertTrue("Namespace of the text is not defined in the parent element", foundNamespace);
+ assertThat(foundNamespace).isTrue();
- assertTrue(element.toString().contains("ns:test"));
- assertEquals("ns:test", element.getText());
- assertEquals(qname, element.getTextAsQName());
+ assertThat(element.toString()).contains("ns:test");
+ assertThat(element.getText()).isEqualTo("ns:test");
+ assertThat(element.getTextAsQName()).isEqualTo(qname);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameNull.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameNull.java
index 10d53ed70..be66cb515 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameNull.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameNull.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -41,6 +43,6 @@ public class TestSetTextQNameNull extends AxiomTestCase {
OMElement element = metaFactory.getOMFactory().createOMElement("test", null);
element.setText("some text");
element.setText((QName) null);
- assertNull(element.getFirstOMChild());
+ assertThat(element.getFirstOMChild()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithEmptyPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithEmptyPrefix.java
index 3a2297fc0..bcf252fcb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithEmptyPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithEmptyPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -47,12 +49,12 @@ public class TestSetTextQNameWithEmptyPrefix extends AxiomTestCase {
QName qname = new QName("urn:test", "test");
element.setText(qname);
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns = it.next();
- assertEquals("urn:test", ns.getNamespaceURI());
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:test");
String prefix = ns.getPrefix();
- assertTrue(prefix.length() > 0);
- assertEquals(prefix + ":test", element.getText());
- assertFalse(it.hasNext());
+ assertThat(prefix).isNotEmpty();
+ assertThat(element.getText()).isEqualTo(prefix + ":test");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithExistingChildren.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithExistingChildren.java
index 75d3ff1c0..814fa46ce 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithExistingChildren.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithExistingChildren.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -54,13 +56,13 @@ public class TestSetTextQNameWithExistingChildren extends AxiomTestCase {
QName qname = new QName("urn:ns1", "test", "ns");
element.setText(qname);
- assertEquals("ns:test", element.getText());
+ assertThat(element.getText()).isEqualTo("ns:test");
// Check that OMElement#setText() has created the expected nodes
OMNode child = element.getFirstOMChild();
- assertTrue(child instanceof OMText);
- assertSame(element, child.getParent());
- assertEquals("ns:test", ((OMText) child).getText());
- assertNull(child.getNextOMSibling());
+ assertThat(child).isInstanceOf(OMText.class);
+ assertThat(child.getParent()).isSameAs(element);
+ assertThat(((OMText) child).getText()).isEqualTo("ns:test");
+ assertThat(child.getNextOMSibling()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithoutNamespace.java
index 591b545aa..5cc734873 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -44,7 +46,7 @@ public class TestSetTextQNameWithoutNamespace extends AxiomTestCase {
OMElement element = factory.createOMElement("test", null);
QName qname = new QName("test");
element.setText(qname);
- assertFalse(element.getAllDeclaredNamespaces().hasNext());
- assertEquals("test", element.getText());
+ assertThat(element.getAllDeclaredNamespaces().hasNext()).isFalse();
+ assertThat(element.getText()).isEqualTo("test");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextWithExistingChildren.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextWithExistingChildren.java
index 382a3e24e..36015d3ca 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextWithExistingChildren.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextWithExistingChildren.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -53,13 +55,13 @@ public class TestSetTextWithExistingChildren extends AxiomTestCase {
element.setText("test");
// Check that OMElement#getText() returns a matching value
- assertEquals("Text value mismatch", "test", element.getText());
+ assertThat(element.getText()).isEqualTo("test");
// Check that OMElement#setText() has created the expected nodes
OMNode child = element.getFirstOMChild();
- assertTrue(child instanceof OMText);
- assertSame(element, child.getParent());
- assertEquals("test", ((OMText) child).getText());
- assertNull(child.getNextOMSibling());
+ assertThat(child).isInstanceOf(OMText.class);
+ assertThat(child.getParent()).isSameAs(element);
+ assertThat(((OMText) child).getText()).isEqualTo("test");
+ assertThat(child.getNextOMSibling()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUndeclarePrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUndeclarePrefix.java
index eda0a7a9a..5acc5ffec 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUndeclarePrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUndeclarePrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -40,10 +42,10 @@ public class TestUndeclarePrefix extends AxiomTestCase {
OMElement element = metaFactory.getOMFactory().createOMElement(new QName("test"));
element.undeclarePrefix("p");
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns = it.next();
- assertEquals("", ns.getNamespaceURI());
- assertEquals("p", ns.getPrefix());
- assertFalse(it.hasNext());
+ assertThat(ns.getNamespaceURI()).isEqualTo("");
+ assertThat(ns.getPrefix()).isEqualTo("p");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestWriteTextTo.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestWriteTextTo.java
index 6ea58a8ec..1da19dc53 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestWriteTextTo.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestWriteTextTo.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import java.io.Writer;
@@ -51,7 +53,7 @@ public class TestWriteTextTo extends AxiomTestCase {
StringWriter sw = new StringWriter();
InstrumentedWriter out = new InstrumentedWriter(sw);
element.writeTextTo(out, true);
- assertEquals(element.getText(), sw.toString());
- assertFalse(out.isClosed());
+ assertThat(sw.toString()).isEqualTo(element.getText());
+ assertThat(out.isClosed()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestWriteTextToWithNonTextNodes.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestWriteTextToWithNonTextNodes.java
index 8b1d9fcc7..9add0e7b7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestWriteTextToWithNonTextNodes.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestWriteTextToWithNonTextNodes.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -38,6 +40,6 @@ public class TestWriteTextToWithNonTextNodes extends AxiomTestCase {
OMElement element = AXIOMUtil.stringToOM(metaFactory.getOMFactory(), "<a>A<b>B</b>C</a>");
StringWriter out = new StringWriter();
element.writeTextTo(out, true);
- assertEquals(element.getText(), out.toString());
+ assertThat(out.toString()).isEqualTo(element.getText());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCloseAndContinueBuilding.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCloseAndContinueBuilding.java
index 0a9c55854..f951b695f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCloseAndContinueBuilding.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCloseAndContinueBuilding.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.namespace.QName;
@@ -59,12 +61,12 @@ public class TestCloseAndContinueBuilding extends AxiomTestCase {
.getDocumentElement();
OMElement a = (OMElement) root.getFirstOMChild();
XMLStreamReader reader = a.getXMLStreamReader(cache);
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals(new QName("b"), reader.getName());
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(reader.getName()).isEqualTo(new QName("b"));
reader.close();
- assertFalse(root.isComplete());
+ assertThat(root.isComplete()).isFalse();
OMElement c = (OMElement) a.getNextOMSibling();
- assertEquals("content", c.getText());
+ assertThat(c.getText()).isEqualTo("content");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCommentEvent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCommentEvent.java
index 1426adbf0..990afcee5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCommentEvent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestCommentEvent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.stream.XMLStreamReader;
@@ -54,13 +56,15 @@ public class TestCommentEvent extends AxiomTestCase {
new InputSource(new StringReader("<a><!--comment text--></a>")));
OMElement element = builder.getDocumentElement();
XMLStreamReader reader = element.getXMLStreamReader(cache);
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals(XMLStreamReader.COMMENT, reader.next());
- assertEquals("comment text", reader.getText());
- assertEquals(
- "comment text",
- new String(
- reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength()));
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.COMMENT);
+ assertThat(reader.getText()).isEqualTo("comment text");
+ assertThat(
+ new String(
+ reader.getTextCharacters(),
+ reader.getTextStart(),
+ reader.getTextLength()))
+ .isEqualTo("comment text");
StringBuffer text = new StringBuffer();
char[] buf = new char[5];
for (int sourceStart = 0; ; sourceStart += buf.length) {
@@ -70,7 +74,7 @@ public class TestCommentEvent extends AxiomTestCase {
break;
}
}
- assertEquals("comment text", text.toString());
+ assertThat(text.toString()).isEqualTo("comment text");
element.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
index ba79c6bff..c3194cfe3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.namespace.QName;
@@ -60,8 +62,8 @@ public class TestGetBlobFromElement extends AxiomTestCase {
OMXMLBuilderFactory.createOMBuilder(factory, new StringReader(orgRoot.toString()))
.getDocumentElement();
XMLStreamReader reader = root.getXMLStreamReader(cache);
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
Blob blob = XMLStreamReaderUtils.getBlobFromElement(reader);
IOTestUtils.compareStreams(orgBlob.getInputStream(), blob.getInputStream());
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementText.java
index ceb6ea7ae..ebe1133e2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementText.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.OMElement;
@@ -51,6 +53,6 @@ public class TestGetElementText extends AxiomTestCase {
}
String elementText = xmlStreamReader.getElementText();
- assertEquals("this is a TEXTthis is a TEXT block 2", elementText);
+ assertThat(elementText).isEqualTo("this is a TEXTthis is a TEXT block 2");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementTextFromParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementTextFromParser.java
index 3d018b13e..2a4796f1a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementTextFromParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetElementTextFromParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Iterator;
@@ -82,9 +84,9 @@ public class TestGetElementTextFromParser extends AxiomTestCase {
}
XMLStreamReader reader = element.getXMLStreamReader(cache);
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
- assertEquals("ABCD", reader.getElementText());
+ assertThat(reader.getElementText()).isEqualTo("ABCD");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetNamespaceContext.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetNamespaceContext.java
index 7fabe384e..6c0c3d6b6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetNamespaceContext.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetNamespaceContext.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamReader;
@@ -47,13 +49,13 @@ public class TestGetNamespaceContext extends AxiomTestCase {
XMLStreamReader stream =
cache ? element.getXMLStreamReader() : element.getXMLStreamReaderWithoutCaching();
stream.next();
- assertEquals(XMLStreamReader.START_ELEMENT, stream.next());
- assertEquals("b", stream.getLocalName());
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(stream.getLocalName()).isEqualTo("b");
NamespaceContext context = stream.getNamespaceContext();
- assertEquals("urn:ns1", context.getNamespaceURI(""));
- assertEquals("urn:ns2", context.getNamespaceURI("ns2"));
- assertEquals("urn:ns3", context.getNamespaceURI("ns3"));
- assertEquals("ns2", context.getPrefix("urn:ns2"));
+ assertThat(context.getNamespaceURI("")).isEqualTo("urn:ns1");
+ assertThat(context.getNamespaceURI("ns2")).isEqualTo("urn:ns2");
+ assertThat(context.getNamespaceURI("ns3")).isEqualTo("urn:ns3");
+ assertThat(context.getPrefix("urn:ns2")).isEqualTo("ns2");
element.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestNextTag.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestNextTag.java
index 6eac60b6d..1e622601c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestNextTag.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestNextTag.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.OMElement;
@@ -39,15 +41,15 @@ public class TestNextTag extends AxiomTestCase {
AXIOMUtil.stringToOM(
metaFactory.getOMFactory(), "<a> <b> </b> <?pi?> <!--comment--> <c/> </a>");
XMLStreamReader stream = element.getXMLStreamReaderWithoutCaching();
- assertEquals(XMLStreamReader.START_ELEMENT, stream.next());
+ assertThat(stream.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
stream.nextTag();
- assertEquals(XMLStreamReader.START_ELEMENT, stream.getEventType());
- assertEquals("b", stream.getLocalName());
+ assertThat(stream.getEventType()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(stream.getLocalName()).isEqualTo("b");
stream.nextTag();
- assertEquals(XMLStreamReader.END_ELEMENT, stream.getEventType());
+ assertThat(stream.getEventType()).isEqualTo(XMLStreamReader.END_ELEMENT);
stream.nextTag();
- assertEquals(XMLStreamReader.START_ELEMENT, stream.getEventType());
- assertEquals("c", stream.getLocalName());
+ assertThat(stream.getEventType()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(stream.getLocalName()).isEqualTo("c");
element.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeGeneratedPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeGeneratedPrefix.java
index ea3b2232f..38935e09a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeGeneratedPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeGeneratedPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -43,8 +45,8 @@ public class TestCreateOMAttributeGeneratedPrefix extends AxiomTestCase {
factory.createOMAttribute(
"attr", factory.createOMNamespace("urn:ns", null), "value");
OMNamespace ns = attr.getNamespace();
- assertEquals("urn:ns", ns.getNamespaceURI());
- assertNotNull(ns.getPrefix());
- assertTrue(ns.getPrefix().length() > 0);
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns");
+ assertThat(ns.getPrefix()).isNotNull();
+ assertThat(ns.getPrefix()).isNotEmpty();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeInterfaces.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeInterfaces.java
index 16e0784f3..19a840fe5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeInterfaces.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeInterfaces.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMFactory;
@@ -50,6 +52,6 @@ public class TestCreateOMAttributeInterfaces extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("urn:test", "p");
OMAttribute attr = factory.createOMAttribute("attr", ns, "value");
- assertFalse(attr instanceof OMSerializable);
+ assertThat(attr).isNotInstanceOf(OMSerializable.class);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeNullPrefixNoNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeNullPrefixNoNamespace.java
index 87597d2e1..b6b42d8ab 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeNullPrefixNoNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeNullPrefixNoNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -43,6 +45,6 @@ public class TestCreateOMAttributeNullPrefixNoNamespace extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("", null);
OMAttribute attr = factory.createOMAttribute("attr", ns, "value");
- assertNull(attr.getNamespace());
+ assertThat(attr.getNamespace()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMCommentWithoutParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMCommentWithoutParent.java
index 32f4184ce..6e90a61ff 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMCommentWithoutParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMCommentWithoutParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMComment;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -33,7 +35,7 @@ public class TestCreateOMCommentWithoutParent extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
OMComment comment = metaFactory.getOMFactory().createOMComment(null, "my comment");
- assertNull(comment.getParent());
- assertEquals("my comment", comment.getValue());
+ assertThat(comment.getParent()).isNull();
+ assertThat(comment.getValue()).isEqualTo("my comment");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMDocTypeWithoutParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMDocTypeWithoutParent.java
index 89baf96ee..6819d1cb1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMDocTypeWithoutParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMDocTypeWithoutParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMDocType;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -36,10 +38,10 @@ public class TestCreateOMDocTypeWithoutParent extends AxiomTestCase {
metaFactory
.getOMFactory()
.createOMDocType(null, "root", "publicId", "systemId", "internalSubset");
- assertNull(dtd.getParent());
- assertEquals("root", dtd.getRootName());
- assertEquals("publicId", dtd.getPublicId());
- assertEquals("systemId", dtd.getSystemId());
- assertEquals("internalSubset", dtd.getInternalSubset());
+ assertThat(dtd.getParent()).isNull();
+ assertThat(dtd.getRootName()).isEqualTo("root");
+ assertThat(dtd.getPublicId()).isEqualTo("publicId");
+ assertThat(dtd.getSystemId()).isEqualTo("systemId");
+ assertThat(dtd.getInternalSubset()).isEqualTo("internalSubset");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMDocument.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMDocument.java
index d86c2bdde..e6bbec055 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMDocument.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMDocument.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -34,11 +36,11 @@ public class TestCreateOMDocument extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
OMDocument document = metaFactory.getOMFactory().createOMDocument();
- assertNotNull(document);
- assertNull(document.getFirstOMChild());
+ assertThat(document).isNotNull();
+ assertThat(document.getFirstOMChild()).isNull();
// OMDocument doesn't extend OMNode. Therefore, the OMDocument implementation
// should not implement OMNode either. This is a regression test for AXIOM-385.
- assertFalse(document instanceof OMNode);
+ assertThat(document).isNotInstanceOf(OMNode.class);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithDefaultNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithDefaultNamespace.java
index c17a880e5..4bfdd3c09 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithDefaultNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -42,13 +44,13 @@ public class TestCreateOMElementWithDefaultNamespace extends CreateOMElementTest
OMElement element =
variant.createOMElement(
factory, parentSupplier.createParent(factory), "test", "urn:ns", "");
- assertTrue(element.isComplete());
- assertEquals("test", element.getLocalName());
+ assertThat(element.isComplete()).isTrue();
+ assertThat(element.getLocalName()).isEqualTo("test");
OMNamespace ns = factory.createOMNamespace("urn:ns", "");
- assertEquals(ns, element.getNamespace());
+ assertThat(element.getNamespace()).isEqualTo(ns);
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
- assertEquals(ns, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithGeneratedPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithGeneratedPrefix.java
index 731e2bb1a..5a0d24a69 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithGeneratedPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithGeneratedPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -48,15 +50,15 @@ public class TestCreateOMElementWithGeneratedPrefix extends CreateOMElementTestC
OMElement element =
variant.createOMElement(
factory, parentSupplier.createParent(factory), "test", "urn:test", null);
- assertEquals("test", element.getLocalName());
+ assertThat(element.getLocalName()).isEqualTo("test");
OMNamespace ns = element.getNamespace();
- assertNotNull(ns);
- assertEquals("urn:test", ns.getNamespaceURI());
+ assertThat(ns).isNotNull();
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:test");
// Axiom auto-generates a prefix here
- assertTrue(ns.getPrefix().length() != 0);
+ assertThat(ns.getPrefix()).isNotEmpty();
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
- assertEquals(ns, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope1.java
index 6850bcb15..4bc972248 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -45,11 +47,11 @@ public class TestCreateOMElementWithNamespaceInScope1 extends CreateOMElementTes
OMFactory factory = metaFactory.getOMFactory();
OMElement parent = factory.createOMElement("parent", "urn:test", "p");
OMElement child = variant.createOMElement(factory, parent, "child", "urn:test", null);
- assertTrue(child.isComplete());
- assertEquals("child", child.getLocalName());
+ assertThat(child.isComplete()).isTrue();
+ assertThat(child.getLocalName()).isEqualTo("child");
OMNamespace ns = factory.createOMNamespace("urn:test", "p");
- assertEquals(ns, child.getNamespace());
+ assertThat(child.getNamespace()).isEqualTo(ns);
Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope2.java
index 7434f5035..5f78db2b3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -46,8 +48,8 @@ public class TestCreateOMElementWithNamespaceInScope2 extends CreateOMElementTes
OMElement parent = factory.createOMElement("parent", "urn:test", "p1");
OMElement child = variant.createOMElement(factory, parent, "child", "urn:test", "p2");
OMNamespace ns = factory.createOMNamespace("urn:test", "p2");
- assertEquals(ns, child.getNamespace());
+ assertThat(child.getNamespace()).isEqualTo(ns);
Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope3.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope3.java
index 8c2b428de..2618f1386 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope3.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope3.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -46,8 +48,8 @@ public class TestCreateOMElementWithNamespaceInScope3 extends CreateOMElementTes
OMElement parent = factory.createOMElement("parent", "urn:test", "p");
OMElement child = variant.createOMElement(factory, parent, "child", "urn:test", "");
OMNamespace ns = factory.createOMNamespace("urn:test", "");
- assertEquals(ns, child.getNamespace());
+ assertThat(child.getNamespace()).isEqualTo(ns);
Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNonDefaultNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNonDefaultNamespace.java
index 459840b0d..291409382 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNonDefaultNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNonDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -42,13 +44,13 @@ public class TestCreateOMElementWithNonDefaultNamespace extends CreateOMElementT
OMElement element =
variant.createOMElement(
factory, parentSupplier.createParent(factory), "test", "urn:ns", "ns");
- assertTrue(element.isComplete());
- assertEquals("test", element.getLocalName());
+ assertThat(element.isComplete()).isTrue();
+ assertThat(element.getLocalName()).isEqualTo("test");
OMNamespace ns = factory.createOMNamespace("urn:ns", "ns");
- assertEquals(ns, element.getNamespace());
+ assertThat(element.getNamespace()).isEqualTo(ns);
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
- assertEquals(ns, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace.java
index a15506245..b4603d057 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -44,8 +46,8 @@ public class TestCreateOMElementWithoutNamespace extends CreateOMElementTestCase
OMElement element =
variant.createOMElement(
factory, parentSupplier.createParent(factory), "test", "", "");
- assertEquals("test", element.getLocalName());
- assertNull(element.getNamespace());
- assertFalse(element.getAllDeclaredNamespaces().hasNext());
+ assertThat(element.getLocalName()).isEqualTo("test");
+ assertThat(element.getNamespace()).isNull();
+ assertThat(element.getAllDeclaredNamespaces().hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace2.java
index e60e6987f..051f1eb0a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -49,13 +51,13 @@ public class TestCreateOMElementWithoutNamespace2 extends CreateOMElementTestCas
OMElement parent =
factory.createOMElement("parent", factory.createOMNamespace("urn:test", ""));
OMElement child = variant.createOMElement(factory, parent, "test", "", "");
- assertEquals("test", child.getLocalName());
- assertNull(child.getNamespace());
+ assertThat(child.getLocalName()).isEqualTo("test");
+ assertThat(child.getNamespace()).isNull();
Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace decl = it.next();
- assertEquals("", decl.getPrefix());
- assertEquals("", decl.getNamespaceURI());
- assertFalse(it.hasNext());
+ assertThat(decl.getPrefix()).isEqualTo("");
+ assertThat(decl.getNamespaceURI()).isEqualTo("");
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java
index 92a5ee9b7..43a38cb9a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -49,9 +51,9 @@ public class TestCreateOMElementWithoutNamespace3 extends CreateOMElementTestCas
"parent", factory.createOMNamespace("urn:ns2", "p"), grandparent);
parent.declareDefaultNamespace("");
OMElement child = variant.createOMElement(factory, parent, "test", "", "");
- assertEquals("test", child.getLocalName());
- assertNull(child.getNamespace());
+ assertThat(child.getLocalName()).isEqualTo("test");
+ assertThat(child.getNamespace()).isNull();
Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespaceNullPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespaceNullPrefix.java
index 308b3d6b4..b65ae9ace 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespaceNullPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespaceNullPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -48,9 +50,9 @@ public class TestCreateOMElementWithoutNamespaceNullPrefix extends CreateOMEleme
OMElement element =
variant.createOMElement(
factory, parentSupplier.createParent(factory), "test", "", null);
- assertEquals("test", element.getLocalName());
- assertNull(element.getNamespace());
+ assertThat(element.getLocalName()).isEqualTo("test");
+ assertThat(element.getNamespace()).isNull();
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMEntityReference.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMEntityReference.java
index 5d00b3dc7..60f2aaea1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMEntityReference.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMEntityReference.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMEntityReference;
import org.apache.axiom.om.OMFactory;
@@ -37,8 +39,8 @@ public class TestCreateOMEntityReference extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement parent = factory.createOMElement("test", null);
OMEntityReference entref = factory.createOMEntityReference(parent, "testref");
- assertSame(parent, entref.getParent());
- assertEquals("testref", entref.getName());
- assertNull(entref.getReplacementText());
+ assertThat(entref.getParent()).isSameAs(parent);
+ assertThat(entref.getName()).isEqualTo("testref");
+ assertThat(entref.getReplacementText()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMEntityReferenceWithNullParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMEntityReferenceWithNullParent.java
index 5df4f3c75..771a67331 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMEntityReferenceWithNullParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMEntityReferenceWithNullParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMEntityReference;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -35,8 +37,8 @@ public class TestCreateOMEntityReferenceWithNullParent extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMEntityReference entref = factory.createOMEntityReference(null, "testref");
- assertNull(entref.getParent());
- assertEquals("testref", entref.getName());
- assertNull(entref.getReplacementText());
+ assertThat(entref.getParent()).isNull();
+ assertThat(entref.getName()).isEqualTo("testref");
+ assertThat(entref.getReplacementText()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMNamespace.java
index 915a21747..a5e95b2bc 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.ts.AxiomTestCase;
@@ -33,7 +35,7 @@ public class TestCreateOMNamespace extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
OMNamespace ns = metaFactory.getOMFactory().createOMNamespace("urn:test", "t");
- assertEquals("urn:test", ns.getNamespaceURI());
- assertEquals("t", ns.getPrefix());
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(ns.getPrefix()).isEqualTo("t");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMProcessingInstructionWithoutParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMProcessingInstructionWithoutParent.java
index 8bec045aa..d6ed1551b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMProcessingInstructionWithoutParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMProcessingInstructionWithoutParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMProcessingInstruction;
import org.apache.axiom.ts.AxiomTestCase;
@@ -34,8 +36,8 @@ public class TestCreateOMProcessingInstructionWithoutParent extends AxiomTestCas
protected void runTest() throws Throwable {
OMProcessingInstruction pi =
metaFactory.getOMFactory().createOMProcessingInstruction(null, "mypi", "data");
- assertNull(pi.getParent());
- assertEquals("mypi", pi.getTarget());
- assertEquals("data", pi.getValue());
+ assertThat(pi.getParent()).isNull();
+ assertThat(pi.getTarget()).isEqualTo("mypi");
+ assertThat(pi.getValue()).isEqualTo("data");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMText.java
index 113fd123c..b0fefb950 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMText.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -41,9 +43,7 @@ public class TestCreateOMText extends AxiomTestCase {
OMElement omElement = factory.createOMElement("chinthaka", namespace);
String text = "sampleText";
OMText omText = factory.createOMText(omElement, text);
- assertTrue("Programatically created OMText should have done = true ", omText.isComplete());
- assertTrue(
- "Programatically created OMText should have correct text value ",
- text.equals(omText.getText()));
+ assertThat(omText.isComplete()).isTrue();
+ assertThat(omText.getText()).isEqualTo(text);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java
index b458c4b7f..1e86d3f23 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java
@@ -66,11 +66,11 @@ public class TestCreateOMTextFromBlobProvider extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
String contentID = nullContentID ? null : UIDGenerator.generateContentId();
OMText text = factory.createOMText(contentID, prov, true);
- assertFalse(prov.isBlobCreated());
+ assertThat(prov.isBlobCreated()).isFalse();
assertThat(text.getBlob().getInputStream())
.asString(StandardCharsets.UTF_8)
.isEqualTo("Data");
- assertTrue(prov.isBlobCreated());
+ assertThat(prov.isBlobCreated()).isTrue();
if (contentID == null) {
assertThat(text.getContentID()).isNotNull();
} else {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromOMText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromOMText.java
index c7dddfdd9..c22e80fe3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromOMText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromOMText.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -40,7 +42,7 @@ public class TestCreateOMTextFromOMText extends AxiomTestCase {
OMText orgText = factory.createOMText("text");
OMElement parent = factory.createOMElement("test", null);
OMText text = factory.createOMText(parent, orgText);
- assertEquals("text", text.getText());
- assertSame(parent, text.getParent());
+ assertThat(text.getText()).isEqualTo("text");
+ assertThat(text.getParent()).isSameAs(parent);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextWithNullParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextWithNullParent.java
index 6b547eaf1..d8f4389d2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextWithNullParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextWithNullParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -39,6 +41,6 @@ public class TestCreateOMTextWithNullParent extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
OMText text = metaFactory.getOMFactory().createOMText(null, "text");
- assertNull(text.getParent());
+ assertThat(text.getParent()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestFactoryIsSingleton.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestFactoryIsSingleton.java
index b47b69a56..1b3373be5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestFactoryIsSingleton.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestFactoryIsSingleton.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -37,6 +39,6 @@ public class TestFactoryIsSingleton extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
- assertSame(metaFactory.getOMFactory(), metaFactory.getOMFactory());
+ assertThat(metaFactory.getOMFactory()).isSameAs(metaFactory.getOMFactory());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestGetMetaFactory.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestGetMetaFactory.java
index 1d8e9471e..8f662a5ab 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestGetMetaFactory.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestGetMetaFactory.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -36,6 +38,6 @@ public class TestGetMetaFactory extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
- assertSame(metaFactory, metaFactory.getOMFactory().getMetaFactory());
+ assertThat(metaFactory.getOMFactory().getMetaFactory()).isSameAs(metaFactory);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestAxiom95.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestAxiom95.java
index cd0e322cc..1903ed3a6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestAxiom95.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestAxiom95.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.misc;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
@@ -43,6 +45,6 @@ public class TestAxiom95 extends AxiomTestCase {
// System.out.println("serializedXML = " + serializedXML);
- assertTrue(serializedXML.indexOf("xmlns=\"\"") == -1);
+ assertThat(serializedXML).doesNotContain("xmlns=\"\"");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEquals.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEquals.java
index e482cdf28..fc9a64d63 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEquals.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEquals.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.namespace;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -39,13 +41,13 @@ public class TestEquals extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("http://www.w3.org/XML/1998/namespace", "xml");
- assertTrue(ns.equals("http://www.w3.org/XML/1998/namespace", "xml"));
+ assertThat(ns.equals("http://www.w3.org/XML/1998/namespace", "xml")).isTrue();
// The implementation must not assume that namespace URI or prefixes are interned
- assertTrue(
- ns.equals(new String("http://www.w3.org/XML/1998/namespace"), new String("xml")));
- assertFalse(ns.equals("http://www.w3.org/XML/1998/namespace", "xml2"));
- assertFalse(ns.equals("http://www.w3.org/XML/1998/namespace", null));
- assertFalse(ns.equals("http://www.w3.org/XML/2001/namespace", "xml"));
- assertFalse(ns.equals(null, "xml"));
+ assertThat(ns.equals(new String("http://www.w3.org/XML/1998/namespace"), new String("xml")))
+ .isTrue();
+ assertThat(ns.equals("http://www.w3.org/XML/1998/namespace", "xml2")).isFalse();
+ assertThat(ns.equals("http://www.w3.org/XML/1998/namespace", null)).isFalse();
+ assertThat(ns.equals("http://www.w3.org/XML/2001/namespace", "xml")).isFalse();
+ assertThat(ns.equals(null, "xml")).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEqualsWithNullPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEqualsWithNullPrefix.java
index 5c078165a..46915effb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEqualsWithNullPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEqualsWithNullPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.namespace;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -39,6 +41,6 @@ public class TestEqualsWithNullPrefix extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("http://www.w3.org/XML/1998/namespace", null);
- assertTrue(ns.equals("http://www.w3.org/XML/1998/namespace", null));
+ assertThat(ns.equals("http://www.w3.org/XML/1998/namespace", null)).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestGetNamespaceURI.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestGetNamespaceURI.java
index 6ee9dff34..5387b3a51 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestGetNamespaceURI.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestGetNamespaceURI.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.namespace;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -36,6 +38,6 @@ public class TestGetNamespaceURI extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("http://www.w3.org/XML/1998/namespace", "xml");
- assertEquals("http://www.w3.org/XML/1998/namespace", ns.getNamespaceURI());
+ assertThat(ns.getNamespaceURI()).isEqualTo("http://www.w3.org/XML/1998/namespace");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestGetPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestGetPrefix.java
index c2c5ebdfc..2827b78f6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestGetPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestGetPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.namespace;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -35,8 +37,8 @@ public class TestGetPrefix extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("http://www.w3.org/XML/1998/namespace", "xml");
- assertEquals("xml", ns.getPrefix());
+ assertThat(ns.getPrefix()).isEqualTo("xml");
ns = factory.createOMNamespace("", null);
- assertNull(ns.getPrefix());
+ assertThat(ns.getPrefix()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestHashCode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestHashCode.java
index 4ce0b199a..28372032e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestHashCode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestHashCode.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.namespace;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -37,6 +39,6 @@ public class TestHashCode extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns1 = factory.createOMNamespace("urn:ns", "ns");
OMNamespace ns2 = factory.createOMNamespace("urn:ns", "ns");
- assertEquals(ns1.hashCode(), ns2.hashCode());
+ assertThat(ns2.hashCode()).isEqualTo(ns1.hashCode());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEquals.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEquals.java
index baeca41c2..20f41a361 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEquals.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEquals.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.namespace;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -42,6 +44,6 @@ public class TestObjectEquals extends AxiomTestCase {
// Therefore we use new String(String).
OMNamespace ns1 = factory.createOMNamespace(new String("urn:ns"), new String("ns"));
OMNamespace ns2 = factory.createOMNamespace(new String("urn:ns"), new String("ns"));
- assertTrue(ns1.equals(ns2));
+ assertThat(ns1.equals(ns2)).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEqualsWithDifferentPrefixes.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEqualsWithDifferentPrefixes.java
index 912e9209f..d7382ec9e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEqualsWithDifferentPrefixes.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEqualsWithDifferentPrefixes.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.namespace;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -40,6 +42,6 @@ public class TestObjectEqualsWithDifferentPrefixes extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns1 = factory.createOMNamespace("urn:ns", "ns1");
OMNamespace ns2 = factory.createOMNamespace("urn:ns", "ns2");
- assertFalse(ns1.equals(ns2));
+ assertThat(ns1.equals(ns2)).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEqualsWithDifferentURIs.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEqualsWithDifferentURIs.java
index da6f590e6..009c14595 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEqualsWithDifferentURIs.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEqualsWithDifferentURIs.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.namespace;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -40,6 +42,6 @@ public class TestObjectEqualsWithDifferentURIs extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns1 = factory.createOMNamespace("urn:ns1", "ns");
OMNamespace ns2 = factory.createOMNamespace("urn:ns2", "ns");
- assertFalse(ns1.equals(ns2));
+ assertThat(ns1.equals(ns2)).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java
index aa84e9ebf..784ea70ed 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMComment;
@@ -65,21 +67,21 @@ public class TestDetach extends AxiomTestCase {
if (build) {
root.build();
} else {
- assertFalse(root.isComplete());
+ assertThat(root.isComplete()).isFalse();
}
OMComment a = (OMComment) root.getFirstOMChild();
- assertEquals("a", a.getValue());
+ assertThat(a.getValue()).isEqualTo("a");
OMElement b = (OMElement) a.getNextOMSibling();
- assertEquals("b", b.getLocalName());
+ assertThat(b.getLocalName()).isEqualTo("b");
OMNode returnValue = b.detach();
- assertSame(b, returnValue); // Detach is expected to do a "return this"
- assertNull(b.getParent());
- assertNull(b.getPreviousOMSibling());
- assertNull(b.getNextOMSibling());
+ assertThat(returnValue).isSameAs(b); // Detach is expected to do a "return this"
+ assertThat(b.getParent()).isNull();
+ assertThat(b.getPreviousOMSibling()).isNull();
+ assertThat(b.getNextOMSibling()).isNull();
OMComment c = (OMComment) a.getNextOMSibling();
- assertEquals("c", c.getValue());
- assertSame(c, a.getNextOMSibling());
- assertSame(a, c.getPreviousOMSibling());
+ assertThat(c.getValue()).isEqualTo("c");
+ assertThat(a.getNextOMSibling()).isSameAs(c);
+ assertThat(c.getPreviousOMSibling()).isSameAs(a);
root.close(false);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java
index bcc3fa994..8e240d311 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -43,13 +45,13 @@ public class TestDetachFirstChild extends AxiomTestCase {
if (build) {
root.build();
} else {
- assertFalse(root.isComplete());
+ assertThat(root.isComplete()).isFalse();
}
OMNode oldFirstChild = root.getFirstOMChild();
- assertNotNull(oldFirstChild);
+ assertThat(oldFirstChild).isNotNull();
oldFirstChild.detach();
OMNode newFirstChild = root.getFirstOMChild();
- assertNotNull(newFirstChild);
- assertNotSame(oldFirstChild, newFirstChild);
+ assertThat(newFirstChild).isNotNull();
+ assertThat(newFirstChild).isNotSameAs(oldFirstChild);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfter.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfter.java
index 92da60b20..5868b60f1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfter.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfter.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -42,6 +44,6 @@ public class TestInsertSiblingAfter extends AxiomTestCase {
OMText text2 = fac.createOMText("text2");
parent.addChild(text1);
text1.insertSiblingAfter(text2);
- assertSame(parent, text2.getParent());
+ assertThat(text2.getParent()).isSameAs(parent);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterSameParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterSameParent.java
index f3a9cd782..f07d4de52 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterSameParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterSameParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -49,11 +51,11 @@ public class TestInsertSiblingAfterSameParent extends AxiomTestCase {
parent.addChild(text2);
parent.addChild(text3);
text1.insertSiblingAfter(text3);
- assertSame(parent, text3.getParent());
+ assertThat(text3.getParent()).isSameAs(parent);
Iterator<OMNode> it = parent.getChildren();
- assertSame(text1, it.next());
- assertSame(text3, it.next());
- assertSame(text2, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.next()).isSameAs(text1);
+ assertThat(it.next()).isSameAs(text3);
+ assertThat(it.next()).isSameAs(text2);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBefore.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBefore.java
index 7e9d6c123..9b9e57bcd 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBefore.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBefore.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -42,7 +44,7 @@ public class TestInsertSiblingBefore extends AxiomTestCase {
OMText text2 = fac.createOMText("text2");
parent.addChild(text1);
text1.insertSiblingBefore(text2);
- assertSame(parent, text2.getParent());
- assertSame(text2, parent.getFirstOMChild());
+ assertThat(text2.getParent()).isSameAs(parent);
+ assertThat(parent.getFirstOMChild()).isSameAs(text2);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeSameParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeSameParent.java
index a98d6a6db..71d4d55ea 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeSameParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeSameParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -50,11 +52,11 @@ public class TestInsertSiblingBeforeSameParent extends AxiomTestCase {
parent.addChild(text2);
parent.addChild(text3);
text2.insertSiblingBefore(text3);
- assertSame(parent, text3.getParent());
+ assertThat(text3.getParent()).isSameAs(parent);
Iterator<OMNode> it = parent.getChildren();
- assertSame(text1, it.next());
- assertSame(text3, it.next());
- assertSame(text2, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.next()).isSameAs(text1);
+ assertThat(it.next()).isSameAs(text3);
+ assertThat(it.next()).isSameAs(text2);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestBlobOMDataSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestBlobOMDataSource.java
index 9590462c1..dd11080e0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestBlobOMDataSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestBlobOMDataSource.java
@@ -56,9 +56,9 @@ public class TestBlobOMDataSource extends AxiomTestCase {
OMSourcedElement omse = factory.createOMElement(ds, localName, ns);
parent.addChild(omse);
OMNode firstChild = parent.getFirstOMChild();
- assertTrue("Expected OMSourcedElement child", firstChild instanceof OMSourcedElement);
+ assertThat(firstChild).isInstanceOf(OMSourcedElement.class);
OMSourcedElement child = (OMSourcedElement) firstChild;
- assertTrue("OMSourcedElement is expanded. This is unexpected", !child.isExpanded());
+ assertThat(child.isExpanded()).isFalse();
assertThat(child.getDataSource()).isSameAs(ds);
// A BlobOMDataSource does not consume the backing object when read.
@@ -66,26 +66,20 @@ public class TestBlobOMDataSource extends AxiomTestCase {
// cause expansion of the OMSourcedElement.
XMLStreamReader reader = child.getXMLStreamReader();
reader.next();
- assertTrue("OMSourcedElement is expanded. This is unexpected", !child.isExpanded());
+ assertThat(child.isExpanded()).isFalse();
// Likewise, a BlobOMDataSource does not consume the backing object when
// written. Thus serializing the OMSourcedElement should not cause the expansion
// of the OMSourcedElement.
- assertTrue(
- "The payload was not present in the output",
- parent.toString().indexOf(payload) > 0);
- assertTrue("OMSourcedElement is expanded. This is unexpected", !child.isExpanded());
+ assertThat(parent.toString()).contains(payload);
+ assertThat(child.isExpanded()).isFalse();
// If a consumer calls build or buildWithAttachments on the tree, the
// tree should not be expanded.
parent.build();
- assertTrue(
- "OMSourcedElement is expanded after build(). This is unexpected",
- !child.isExpanded());
+ assertThat(child.isExpanded()).isFalse();
parent.buildWithAttachments();
- assertTrue(
- "OMSourcedElement is expanded after buildWithAttachments(). This is unexpected",
- !child.isExpanded());
+ assertThat(child.isExpanded()).isFalse();
// Test getting the raw bytes from the BlobOMDataSource.
assertThat(child.getDataSource()).isSameAs(ds);
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java
index 115e78553..818dd55ac 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.nio.charset.StandardCharsets;
import javax.xml.namespace.QName;
@@ -58,13 +60,13 @@ public class TestCloneNonDestructive extends AxiomTestCase {
options.setCopyOMDataSources(copyOMDataSources);
OMElement clone = (OMElement) element.clone(options);
if (copyOMDataSources) {
- assertTrue(clone instanceof OMSourcedElement);
- assertFalse(element.isExpanded());
+ assertThat(clone).isInstanceOf(OMSourcedElement.class);
+ assertThat(element.isExpanded()).isFalse();
} else {
- assertFalse(clone instanceof OMSourcedElement);
- assertTrue(clone.isComplete());
+ assertThat(clone).isNotInstanceOf(OMSourcedElement.class);
+ assertThat(clone.isComplete()).isTrue();
}
- assertEquals("test", clone.getText());
- assertEquals("wrapper", clone.getLocalName());
+ assertThat(clone.getText()).isEqualTo("test");
+ assertThat(clone.getLocalName()).isEqualTo("wrapper");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneUnknownName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneUnknownName.java
index 3d8e96dcd..532b2c519 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneUnknownName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneUnknownName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
@@ -52,12 +54,12 @@ public class TestCloneUnknownName extends AxiomTestCase {
OMCloneOptions options = new OMCloneOptions();
options.setCopyOMDataSources(true);
OMElement clone = (OMElement) element.clone(options);
- assertTrue(clone instanceof OMSourcedElement);
- assertFalse(element.isExpanded());
+ assertThat(clone).isInstanceOf(OMSourcedElement.class);
+ assertThat(element.isExpanded()).isFalse();
OMNamespace expectedNS = factory.createOMNamespace("urn:ns", "p");
- assertEquals("element", element.getLocalName());
- assertEquals("element", clone.getLocalName());
- assertEquals(expectedNS, element.getNamespace());
- assertEquals(expectedNS, clone.getNamespace());
+ assertThat(element.getLocalName()).isEqualTo("element");
+ assertThat(clone.getLocalName()).isEqualTo("element");
+ assertThat(element.getNamespace()).isEqualTo(expectedNS);
+ assertThat(clone.getNamespace()).isEqualTo(expectedNS);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloseOnComplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloseOnComplete.java
index 307e3352f..bac099822 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloseOnComplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloseOnComplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.OMDataSource;
@@ -45,10 +47,10 @@ public class TestCloseOnComplete extends AxiomTestCase {
PullOMDataSource ds = new PullOMDataSource("<root><a/></root>");
OMSourcedElement element = metaFactory.getOMFactory().createOMElement(ds);
OMNode child = element.getFirstOMChild();
- assertFalse(element.isComplete());
- assertTrue(ds.hasUnclosedReaders());
+ assertThat(element.isComplete()).isFalse();
+ assertThat(ds.hasUnclosedReaders()).isTrue();
child.getNextOMSibling();
- assertTrue(element.isComplete());
- assertFalse(ds.hasUnclosedReaders());
+ assertThat(element.isComplete()).isTrue();
+ assertThat(ds.hasUnclosedReaders()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestComplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestComplete.java
index 7d428f03d..35c16c8bb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestComplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestComplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -56,8 +58,8 @@ public class TestComplete extends AxiomTestCase {
// cause the parent to be marked as incomplete.
// But OMSE's are self-contained...therefore the root
// should still be complete
- assertTrue(!child.isComplete());
- assertTrue(root.isComplete());
+ assertThat(!child.isComplete()).isTrue();
+ assertThat(root.isComplete()).isTrue();
// Now repeat the test, but this time trigger the
// partial parsing of the child after adding it to the root.
@@ -69,7 +71,7 @@ public class TestComplete extends AxiomTestCase {
root.addChild(child);
child.getFirstOMChild(); // causes partial parsing...i.e. incomplete child
- assertTrue(!child.isComplete());
- assertTrue(root.isComplete());
+ assertThat(!child.isComplete()).isTrue();
+ assertThat(root.isComplete()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestExpand.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestExpand.java
index 4c425770c..11a1de560 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestExpand.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestExpand.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -43,32 +45,22 @@ public class TestExpand extends AxiomTestCase {
TestDocument.DOCUMENT1.createOMSourcedElement(
metaFactory.getOMFactory(), false, true);
element.getAllDeclaredNamespaces();
- assertEquals(
- "Expanded namespace count error",
- 1,
- countItems(element.getAllDeclaredNamespaces()));
- assertEquals("Expanded attribute count error", 1, countItems(element.getAllAttributes()));
- assertEquals(
- "Expanded attribute value error",
- "1",
- element.getAttributeValue(new QName("books")));
+ assertThat(countItems(element.getAllDeclaredNamespaces())).isEqualTo(1);
+ assertThat(countItems(element.getAllAttributes())).isEqualTo(1);
+ assertThat(element.getAttributeValue(new QName("books"))).isEqualTo("1");
OMElement child = element.getFirstElement();
- assertEquals("Child element name", "type", child.getLocalName());
- assertEquals(
- "Child element namespace",
- "http://www.sosnoski.com/uwjws/library",
- child.getNamespace().getNamespaceURI());
+ assertThat(child.getLocalName()).isEqualTo("type");
+ assertThat(child.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
OMNode next = child.getNextOMSibling();
- assertTrue("Expected child element", next instanceof OMElement);
+ assertThat(next).isInstanceOf(OMElement.class);
next = next.getNextOMSibling();
- assertTrue("Expected child element", next instanceof OMElement);
+ assertThat(next).isInstanceOf(OMElement.class);
child = (OMElement) next;
- assertEquals("Child element name", "book", child.getLocalName());
- assertEquals(
- "Child element namespace",
- "http://www.sosnoski.com/uwjws/library",
- child.getNamespace().getNamespaceURI());
- assertEquals("Attribute value error", "xml", child.getAttributeValue(new QName("type")));
+ assertThat(child.getLocalName()).isEqualTo("book");
+ assertThat(child.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(child.getAttributeValue(new QName("type"))).isEqualTo("xml");
}
private int countItems(Iterator iter) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetLocalName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetLocalName.java
index 5ac2af9b8..35e7c8816 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetLocalName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetLocalName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
@@ -34,11 +36,11 @@ public class TestGetLocalName extends LazyNameTestCase {
@Override
protected void runTest(OMSourcedElement element) throws Throwable {
- assertEquals(qname.getLocalPart(), element.getLocalName());
+ assertThat(element.getLocalName()).isEqualTo(qname.getLocalPart());
if (variant.isLocalNameRequiresExpansion()) {
- assertTrue(element.isExpanded());
+ assertThat(element.isExpanded()).isTrue();
} else {
- assertFalse(element.isExpanded());
+ assertThat(element.isExpanded()).isFalse();
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespace.java
index 70457fb28..d92416405 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
@@ -37,15 +39,15 @@ public class TestGetNamespace extends LazyNameTestCase {
protected void runTest(OMSourcedElement element) throws Throwable {
OMNamespace ns = element.getNamespace();
if (qname.getNamespaceURI().length() == 0) {
- assertNull(ns);
+ assertThat(ns).isNull();
} else {
- assertEquals(qname.getNamespaceURI(), ns.getNamespaceURI());
- assertEquals(qname.getPrefix(), ns.getPrefix());
+ assertThat(ns.getNamespaceURI()).isEqualTo(qname.getNamespaceURI());
+ assertThat(ns.getPrefix()).isEqualTo(qname.getPrefix());
}
if (variant.isNamespaceURIRequiresExpansion() || variant.isPrefixRequiresExpansion(qname)) {
- assertTrue(element.isExpanded());
+ assertThat(element.isExpanded()).isTrue();
} else {
- assertFalse(element.isExpanded());
+ assertThat(element.isExpanded()).isFalse();
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceNormalized.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceNormalized.java
index 28db56954..2b7a589cc 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceNormalized.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceNormalized.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -52,9 +54,9 @@ public class TestGetNamespaceNormalized extends AxiomTestCase {
new StringOMDataSource("<element>content</element>"), "element", ns);
// This actually returns the "declared" namespace because the sourced element is not
// expanded yet. Nevertheless the value should have been normalized to null.
- assertNull(element.getNamespace());
+ assertThat(element.getNamespace()).isNull();
// Now expand the element and check getNamespace() again
element.getFirstOMChild();
- assertNull(element.getNamespace());
+ assertThat(element.getNamespace()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceNormalized2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceNormalized2.java
index 0a5cc60fe..1befe2be9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceNormalized2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceNormalized2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMDataSource;
@@ -50,9 +52,9 @@ public class TestGetNamespaceNormalized2 extends AxiomTestCase {
OMSourcedElement element =
factory.createOMElement(
new StringOMDataSource("<element>content</element>"), new QName("element"));
- assertNull(element.getNamespace());
+ assertThat(element.getNamespace()).isNull();
// Expand the element
element.getFirstOMChild();
- assertNull(element.getNamespace());
+ assertThat(element.getNamespace()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceURI.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceURI.java
index 4b7508e08..ee7fc9393 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceURI.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNamespaceURI.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
@@ -36,14 +38,14 @@ public class TestGetNamespaceURI extends LazyNameTestCase {
protected void runTest(OMSourcedElement element) throws Throwable {
String uri = qname.getNamespaceURI();
if (uri.length() == 0) {
- assertNull(element.getNamespaceURI());
+ assertThat(element.getNamespaceURI()).isNull();
} else {
- assertEquals(uri, element.getNamespaceURI());
+ assertThat(element.getNamespaceURI()).isEqualTo(uri);
}
if (variant.isNamespaceURIRequiresExpansion()) {
- assertTrue(element.isExpanded());
+ assertThat(element.isExpanded()).isTrue();
} else {
- assertFalse(element.isExpanded());
+ assertThat(element.isExpanded()).isFalse();
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNextOMSiblingIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNextOMSiblingIncomplete.java
index 65eb8d88d..a90928bc3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNextOMSiblingIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetNextOMSiblingIncomplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -48,10 +50,10 @@ public class TestGetNextOMSiblingIncomplete extends AxiomTestCase {
parent.addChild(omse);
// Cause expansion of the sourced element without building it completely
omse.getLocalName();
- assertTrue(omse.isExpanded());
- assertFalse(omse.isComplete());
+ assertThat(omse.isExpanded()).isTrue();
+ assertThat(omse.isComplete()).isFalse();
// Call getNextOMSibling(); this should not build the element
omse.getNextOMSibling();
- assertFalse(omse.isComplete());
+ assertThat(omse.isComplete()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
index e62710aac..681eca166 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.nio.charset.StandardCharsets;
import javax.xml.namespace.QName;
@@ -49,12 +51,12 @@ public class TestGetObject extends AxiomTestCase {
new WrappedTextNodeOMDataSourceFromBlob(
new QName("wrapper"), blob, StandardCharsets.UTF_8));
// getObject returns null if the data source is not of the expected type
- assertNull(element.getObject(StringOMDataSource.class));
+ assertThat(element.getObject(StringOMDataSource.class)).isNull();
// Test with the right data source type
- assertSame(blob, element.getObject(WrappedTextNodeOMDataSourceFromBlob.class));
- assertSame(blob, element.getObject(WrappedTextNodeOMDataSource.class));
+ assertThat(element.getObject(WrappedTextNodeOMDataSourceFromBlob.class)).isSameAs(blob);
+ assertThat(element.getObject(WrappedTextNodeOMDataSource.class)).isSameAs(blob);
// Now modify the content of the element
factory.createOMComment(element, "comment");
- assertNull(element.getObject(WrappedTextNodeOMDataSourceFromBlob.class));
+ assertThat(element.getObject(WrappedTextNodeOMDataSourceFromBlob.class)).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetPrefix.java
index 1fea769e7..b41d252dd 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
@@ -35,14 +37,14 @@ public class TestGetPrefix extends LazyNameTestCase {
protected void runTest(OMSourcedElement element) throws Throwable {
String prefix = qname.getPrefix();
if (prefix.length() == 0) {
- assertNull(element.getPrefix());
+ assertThat(element.getPrefix()).isNull();
} else {
- assertEquals(prefix, element.getPrefix());
+ assertThat(element.getPrefix()).isEqualTo(prefix);
}
if (variant.isPrefixRequiresExpansion(qname)) {
- assertTrue(element.isExpanded());
+ assertThat(element.isExpanded()).isTrue();
} else {
- assertFalse(element.isExpanded());
+ assertThat(element.isExpanded()).isFalse();
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetTextAsStreamWithNonDestructiveOMDataSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetTextAsStreamWithNonDestructiveOMDataSource.java
index b66b1a28c..756da83a9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetTextAsStreamWithNonDestructiveOMDataSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetTextAsStreamWithNonDestructiveOMDataSource.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
@@ -53,8 +55,8 @@ public class TestGetTextAsStreamWithNonDestructiveOMDataSource extends AxiomTest
factory.createOMElement(
new WrappedTextNodeOMDataSourceFromBlob(qname, blob, cs), qname);
Reader in = element.getTextAsStream(true);
- assertFalse(in instanceof StringReader);
+ assertThat(in).isNotInstanceOf(StringReader.class);
IOTestUtils.compareStreams(new InputStreamReader(blob.getInputStream(), cs), in);
- assertFalse(element.isExpanded());
+ assertThat(element.isExpanded()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestHasName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestHasName.java
index cf391bcef..09ce20cbb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestHasName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestHasName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
@@ -33,12 +35,12 @@ public class TestHasName extends LazyNameTestCase {
@Override
protected void runTest(OMSourcedElement element) throws Throwable {
- assertTrue(element.hasName(qname));
- assertFalse(element.hasName(new QName("urn:other", "other")));
+ assertThat(element.hasName(qname)).isTrue();
+ assertThat(element.hasName(new QName("urn:other", "other"))).isFalse();
if (variant.isLocalNameRequiresExpansion() || variant.isNamespaceURIRequiresExpansion()) {
- assertTrue(element.isExpanded());
+ assertThat(element.isExpanded()).isTrue();
} else {
- assertFalse(element.isExpanded());
+ assertThat(element.isExpanded()).isFalse();
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java
index 612d5ffbd..fe8b3c26e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -54,11 +56,9 @@ public class TestName1DefaultPrefix extends AxiomTestCase {
root.addChild(element);
// Test getting the local name and namespace URI. This should used not result in expansion
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
// Serialize and cache. This should cause expansion. The prefix should be updated to match
// the testDocument string
@@ -66,27 +66,23 @@ public class TestName1DefaultPrefix extends AxiomTestCase {
root.serialize(writer);
String result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
- assertTrue(element.getDefaultNamespace() != null);
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
+ assertThat(element.getDefaultNamespace()).isNotNull();
+ assertThat(result).contains("1930110111");
// Serialize again
writer = new StringWriter();
root.serialize(writer);
result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
- assertTrue(element.getDefaultNamespace() != null);
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
+ assertThat(element.getDefaultNamespace()).isNotNull();
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java
index 74e6feb47..a7e83dd60 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -54,11 +56,9 @@ public class TestName1QualifiedPrefix extends AxiomTestCase {
root.addChild(element);
// Test getting the local name and namespace URI. This should used not result in expansion
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
// Serialize and cache. This should cause expansion and update the name to match the
// testDocument string
@@ -66,31 +66,27 @@ public class TestName1QualifiedPrefix extends AxiomTestCase {
root.serialize(writer);
String result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals("pre"));
- assertTrue(element.getDefaultNamespace() == null);
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("pre");
+ assertThat(element.getDefaultNamespace()).isNull();
// Make sure that the serialized string does not contain default prefix declaration
- assertTrue(result.indexOf("xmlns=") < 0);
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).doesNotContain("xmlns=");
+ assertThat(result).contains("1930110111");
// Serialize again
writer = new StringWriter();
root.serialize(writer);
result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals("pre"));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("pre");
// Make sure that the serialized string does not contain default prefix declaration
- assertTrue(result.indexOf("xmlns=") < 0);
- assertTrue(element.getDefaultNamespace() == null);
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).doesNotContain("xmlns=");
+ assertThat(element.getDefaultNamespace()).isNull();
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java
index acff80dd4..9c146e3d7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -56,8 +58,8 @@ public class TestName1Unqualified extends AxiomTestCase {
// Test getting the namespace, localpart and prefix. This should used not result in
// expansion
- assertTrue(element.getLocalName().equals("library"));
- assertNull(element.getNamespace());
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace()).isNull();
// Serialize and cache. This should cause expansion and update the name to match the
// testDocument string
@@ -65,25 +67,26 @@ public class TestName1Unqualified extends AxiomTestCase {
root.serialize(writer);
String result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertNull(element.getNamespace());
- assertNull(element.getDefaultNamespace());
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace()).isNull();
+ assertThat(element.getDefaultNamespace()).isNull();
// Make sure that the serialized string does not contain default prefix declaration
- assertTrue(result.indexOf("xmlns=") < 0);
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).doesNotContain("xmlns=");
+ assertThat(result).contains("1930110111");
// Serialize again
writer = new StringWriter();
root.serialize(writer);
result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertNull(element.getNamespace());
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace()).isNull();
// Make sure that the serialized string does not contain default prefix declaration
- assertTrue(result.indexOf("xmlns=") < 0);
- assertTrue(
- element.getDefaultNamespace() == null
- || element.getDefaultNamespace().getNamespaceURI().length() == 0);
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).doesNotContain("xmlns=");
+ assertThat(element.getDefaultNamespace())
+ .satisfiesAnyOf(
+ defaultNs -> assertThat(defaultNs).isNull(),
+ defaultNs -> assertThat(defaultNs.getNamespaceURI()).isEmpty());
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2DefaultPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2DefaultPrefix.java
index 43e2cf7e5..6cf1d295f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2DefaultPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2DefaultPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -57,12 +59,10 @@ public class TestName2DefaultPrefix extends AxiomTestCase {
// Test getting the namespace, localpart and prefix. This should used not result in
// expansion
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals("DUMMYPREFIX"));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("DUMMYPREFIX");
// Serialize and consume. This should not cause expansion and currently won't update
// the name of the element.
@@ -70,15 +70,13 @@ public class TestName2DefaultPrefix extends AxiomTestCase {
root.serializeAndConsume(writer);
String result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals("DUMMYPREFIX"));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("DUMMYPREFIX");
// Make sure that the serialized string does not contain DUMMYPREFIX
- assertTrue(result.indexOf("DUMMYPREFIX") < 0);
+ assertThat(result).doesNotContain("DUMMYPREFIX");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2QualifiedPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2QualifiedPrefix.java
index a1da5d040..1f9995df4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2QualifiedPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2QualifiedPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -56,12 +58,10 @@ public class TestName2QualifiedPrefix extends AxiomTestCase {
// Test getting the namespace, localpart and prefix. This should used not result in
// expansion
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Serialize and consume. This should not cause expansion and currently won't update
// the name of the element.
@@ -69,15 +69,13 @@ public class TestName2QualifiedPrefix extends AxiomTestCase {
root.serializeAndConsume(writer);
String result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Make sure that the serialized string does not contain default prefix declaration
- assertTrue(result.indexOf("xmlns=") < 0);
+ assertThat(result).doesNotContain("xmlns=");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2Unqualified.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2Unqualified.java
index 6f3c743bf..35d2ca527 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2Unqualified.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2Unqualified.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -56,8 +58,8 @@ public class TestName2Unqualified extends AxiomTestCase {
// Test getting the namespace, localpart and prefix. This should used not result in
// expansion
- assertTrue(element.getLocalName().equals("library"));
- assertNull(element.getNamespace());
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace()).isNull();
// Serialize and consume. This should not cause expansion and currently won't update
// the name of the element.
@@ -65,11 +67,11 @@ public class TestName2Unqualified extends AxiomTestCase {
root.serializeAndConsume(writer);
String result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertNull(element.getNamespace());
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace()).isNull();
// Make sure that the serialized string does not contain default prefix declaration
- assertTrue(result.indexOf("xmlns=") < 0);
+ assertThat(result).doesNotContain("xmlns=");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3DefaultPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3DefaultPrefix.java
index 5336300e2..1220a7af7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3DefaultPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3DefaultPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -56,9 +58,9 @@ public class TestName3DefaultPrefix extends AxiomTestCase {
// Test getting the namespace, localpart and prefix. This should used not result in
// expansion
- assertTrue(element.getLocalName().equals("DUMMYNAME"));
- assertTrue(element.getNamespace().getNamespaceURI().equals("http://DUMMYNS"));
- assertTrue(element.getNamespace().getPrefix().equals("DUMMYPREFIX"));
+ assertThat(element.getLocalName()).isEqualTo("DUMMYNAME");
+ assertThat(element.getNamespace().getNamespaceURI()).isEqualTo("http://DUMMYNS");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("DUMMYPREFIX");
// Serialize and cache. This should cause expansion and update the name to match the
// testDocument string
@@ -75,31 +77,27 @@ public class TestName3DefaultPrefix extends AxiomTestCase {
String result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Make sure that the serialized string does not contain the DUMMY values
- assertTrue(result.indexOf("DUMMY") < 0);
+ assertThat(result).doesNotContain("DUMMY");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
// Serialize again
writer = new StringWriter();
root.serialize(writer);
result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Make sure that the serialized string does not contain the DUMMY values
- assertTrue(result.indexOf("DUMMY") < 0);
+ assertThat(result).doesNotContain("DUMMY");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3QualifiedPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3QualifiedPrefix.java
index bc84b56a0..370ca06e2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3QualifiedPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3QualifiedPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -56,9 +58,9 @@ public class TestName3QualifiedPrefix extends AxiomTestCase {
// Test getting the namespace, localpart and prefix. This should used not result in
// expansion
- assertTrue(element.getLocalName().equals("DUMMYNAME"));
- assertTrue(element.getNamespace().getNamespaceURI().equals("http://DUMMYNS"));
- assertTrue(element.getNamespace().getPrefix().equals("DUMMYPREFIX"));
+ assertThat(element.getLocalName()).isEqualTo("DUMMYNAME");
+ assertThat(element.getNamespace().getNamespaceURI()).isEqualTo("http://DUMMYNS");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("DUMMYPREFIX");
// Serialize and cache. This should cause expansion and update the name to match the
// testDocument string
@@ -75,31 +77,27 @@ public class TestName3QualifiedPrefix extends AxiomTestCase {
String result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Make sure that the serialized string does not contain the DUMMY values
- assertTrue(result.indexOf("DUMMY") < 0);
+ assertThat(result).doesNotContain("DUMMY");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
// Serialize again
writer = new StringWriter();
root.serialize(writer);
result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Make sure that the serialized string does not contain the DUMMY values
- assertTrue(result.indexOf("DUMMY") < 0);
+ assertThat(result).doesNotContain("DUMMY");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3Unqualified.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3Unqualified.java
index b27725d60..a7c047fa9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3Unqualified.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3Unqualified.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -56,9 +58,9 @@ public class TestName3Unqualified extends AxiomTestCase {
// Test getting the namespace, localpart and prefix. This should used not result in
// expansion
- assertTrue(element.getLocalName().equals("DUMMYNAME"));
- assertTrue(element.getNamespace().getNamespaceURI().equals("http://DUMMYNS"));
- assertTrue(element.getNamespace().getPrefix().equals("DUMMYPREFIX"));
+ assertThat(element.getLocalName()).isEqualTo("DUMMYNAME");
+ assertThat(element.getNamespace().getNamespaceURI()).isEqualTo("http://DUMMYNS");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("DUMMYPREFIX");
// Serialize and cache. This should cause expansion and update the name to match the
// testDocument string
@@ -75,28 +77,26 @@ public class TestName3Unqualified extends AxiomTestCase {
String result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(element.getNamespace().getNamespaceURI().equals(""));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI()).isEmpty();
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Make sure that the serialized string does not contain the DUMMY values
- assertTrue(result.indexOf("DUMMY") < 0);
+ assertThat(result).doesNotContain("DUMMY");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
// Serialize again
writer = new StringWriter();
root.serialize(writer);
result = writer.toString();
- assertTrue(element.getLocalName().equals("library"));
- assertTrue(
- element.getNamespace()
- .getNamespaceURI()
- .equals("http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("library");
+ assertThat(element.getNamespace().getNamespaceURI())
+ .isEqualTo("http://www.sosnoski.com/uwjws/library");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Make sure that the serialized string does not contain the DUMMY values
- assertTrue(result.indexOf("DUMMY") < 0);
+ assertThat(result).doesNotContain("DUMMY");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4DefaultPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4DefaultPrefix.java
index 47155cebd..91ecd0046 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4DefaultPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4DefaultPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -57,9 +59,9 @@ public class TestName4DefaultPrefix extends AxiomTestCase {
// Test getting the namespace, localpart and prefix. This should used not result in
// expansion
- assertTrue(element.getLocalName().equals("DUMMYNAME"));
- assertTrue(element.getNamespace().getNamespaceURI().equals("http://DUMMYNS"));
- assertTrue(element.getNamespace().getPrefix().equals("DUMMYPREFIX"));
+ assertThat(element.getLocalName()).isEqualTo("DUMMYNAME");
+ assertThat(element.getNamespace().getNamespaceURI()).isEqualTo("http://DUMMYNS");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("DUMMYPREFIX");
// Serialize and consume. This should not cause expansion and currently won't update
// the name of the element.
@@ -67,12 +69,12 @@ public class TestName4DefaultPrefix extends AxiomTestCase {
root.serializeAndConsume(writer);
String result = writer.toString();
- assertTrue(element.getLocalName().equals("DUMMYNAME"));
- assertTrue(element.getNamespace().getNamespaceURI().equals("http://DUMMYNS"));
- assertTrue(element.getNamespace().getPrefix().equals("DUMMYPREFIX"));
+ assertThat(element.getLocalName()).isEqualTo("DUMMYNAME");
+ assertThat(element.getNamespace().getNamespaceURI()).isEqualTo("http://DUMMYNS");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("DUMMYPREFIX");
// Make sure that the serialized string does not contain the DUMMY values
- assertTrue(result.indexOf("DUMMY") < 0);
+ assertThat(result).doesNotContain("DUMMY");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4QualifiedPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4QualifiedPrefix.java
index 42297fa79..f62b18f5d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4QualifiedPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4QualifiedPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -56,9 +58,9 @@ public class TestName4QualifiedPrefix extends AxiomTestCase {
// Test getting the namespace, localpart and prefix. This should used not result in
// expansion
- assertTrue(element.getLocalName().equals("DUMMYNAME"));
- assertTrue(element.getNamespace().getNamespaceURI().equals("http://DUMMYNS"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("DUMMYNAME");
+ assertThat(element.getNamespace().getNamespaceURI()).isEqualTo("http://DUMMYNS");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Serialize and consume. This should not cause expansion and currently won't update
// the name of the element.
@@ -66,14 +68,14 @@ public class TestName4QualifiedPrefix extends AxiomTestCase {
root.serializeAndConsume(writer);
String result = writer.toString();
- assertTrue(element.getLocalName().equals("DUMMYNAME"));
- assertTrue(element.getNamespace().getNamespaceURI().equals("http://DUMMYNS"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("DUMMYNAME");
+ assertThat(element.getNamespace().getNamespaceURI()).isEqualTo("http://DUMMYNS");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Make sure that the serialized string does not contain the DUMMY values
- assertTrue(result.indexOf("DUMMY") < 0);
+ assertThat(result).doesNotContain("DUMMY");
// Make sure that the serialized string does not contain the default prefix declaration
- assertTrue(result.indexOf("xmlns=") < 0);
+ assertThat(result).doesNotContain("xmlns=");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4Unqualified.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4Unqualified.java
index 2a8809f2d..2a4ff33eb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4Unqualified.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4Unqualified.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringWriter;
import org.apache.axiom.om.OMElement;
@@ -56,9 +58,9 @@ public class TestName4Unqualified extends AxiomTestCase {
// Test getting the namespace, localpart and prefix. This should used not result in
// expansion
- assertTrue(element.getLocalName().equals("DUMMYNAME"));
- assertTrue(element.getNamespace().getNamespaceURI().equals("http://DUMMYNS"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("DUMMYNAME");
+ assertThat(element.getNamespace().getNamespaceURI()).isEqualTo("http://DUMMYNS");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Serialize and consume. This should not cause expansion and currently won't update
// the name of the element.
@@ -66,14 +68,14 @@ public class TestName4Unqualified extends AxiomTestCase {
root.serializeAndConsume(writer);
String result = writer.toString();
- assertTrue(element.getLocalName().equals("DUMMYNAME"));
- assertTrue(element.getNamespace().getNamespaceURI().equals("http://DUMMYNS"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
+ assertThat(element.getLocalName()).isEqualTo("DUMMYNAME");
+ assertThat(element.getNamespace().getNamespaceURI()).isEqualTo("http://DUMMYNS");
+ assertThat(element.getNamespace().getPrefix()).isEqualTo("");
// Make sure that the serialized string does not contain the DUMMY values
- assertTrue(result.indexOf("DUMMY") < 0);
+ assertThat(result).doesNotContain("DUMMY");
// Make sure that the serialized string does not contain the default prefix declaration
- assertTrue(result.indexOf("xmlns=") < 0);
+ assertThat(result).doesNotContain("xmlns=");
- assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
+ assertThat(result).contains("1930110111");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java
index 9f05338c0..66624e484 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import java.util.Map;
@@ -87,8 +89,6 @@ public class TestPushOMDataSourceExpansion extends AxiomTestCase {
parent.addChild(element);
}
scenario.validate(element, true);
- assertTrue(
- "Invalid test case: validation didn't expand the OMSourcedElement",
- ds.isExpanded());
+ assertThat(ds.isExpanded()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestRemoveChildrenUnexpanded.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestRemoveChildrenUnexpanded.java
index 01ffc3cbd..706d90bd2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestRemoveChildrenUnexpanded.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestRemoveChildrenUnexpanded.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMAttribute;
@@ -50,12 +52,12 @@ public class TestRemoveChildrenUnexpanded extends AxiomTestCase {
element.removeChildren();
// Check that the attribute has been added
Iterator<OMAttribute> it = element.getAllAttributes();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMAttribute attr = it.next();
- assertEquals("attr", attr.getLocalName());
- assertEquals("value", attr.getAttributeValue());
- assertFalse(it.hasNext());
+ assertThat(attr.getLocalName()).isEqualTo("attr");
+ assertThat(attr.getAttributeValue()).isEqualTo("value");
+ assertThat(it.hasNext()).isFalse();
// Check that the element is empty
- assertNull(element.getFirstOMChild());
+ assertThat(element.getFirstOMChild()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
index 2d76ca7c6..e0101b754 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
@@ -22,6 +22,7 @@ import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
import org.apache.axiom.om.OMContainer;
@@ -129,19 +130,18 @@ public class TestSerialize extends AxiomTestCase {
// then the sourced element should be expanded.
if (expansionStrategy.isExpandedAfterSerialization(
push, destructive, serializationStrategy)) {
- assertTrue(element.isExpanded());
- assertEquals(
- "OMSourcedElement completion status", !consuming, element.isComplete());
+ assertThat(element.isExpanded()).isTrue();
+ assertThat(element.isComplete()).isEqualTo(!consuming);
} else {
- assertFalse(element.isExpanded());
+ assertThat(element.isExpanded()).isFalse();
}
if (parent != null && !serializeParent) {
// Operations on the OMSourcedElement should have no impact on the parent
- assertEquals("Parent completion status", parentComplete, parent.isComplete());
+ assertThat(parent.isComplete()).isEqualTo(parentComplete);
}
}
if (ds instanceof PullOMDataSource pullOmDataSource) {
- assertFalse(pullOmDataSource.hasUnclosedReaders());
+ assertThat(pullOmDataSource.hasUnclosedReaders()).isFalse();
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java
index 7a657d390..0fede8b59 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.ByteArrayOutputStream;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
@@ -40,7 +42,7 @@ public class TestSerializeModifiedOMSEWithNonDestructiveDataSource extends Axiom
@Override
protected void runTest() throws Throwable {
OMDataSourceExt ds = new StringOMDataSource("<element><child/></element>");
- assertFalse(ds.isDestructiveWrite());
+ assertThat(ds.isDestructiveWrite()).isFalse();
OMFactory f = metaFactory.getOMFactory();
OMElement element = f.createOMElement(ds, "element", null);
@@ -49,12 +51,12 @@ public class TestSerializeModifiedOMSEWithNonDestructiveDataSource extends Axiom
StringWriter sw = new StringWriter();
element.serialize(sw);
- assertTrue(sw.toString().indexOf("TEST") != -1);
+ assertThat(sw.toString()).contains("TEST");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
element.serialize(baos);
- assertTrue(new String(baos.toByteArray(), StandardCharsets.UTF_8).indexOf("TEST") != -1);
+ assertThat(new String(baos.toByteArray(), StandardCharsets.UTF_8)).contains("TEST");
- assertTrue(element.toString().indexOf("TEST") != -1);
+ assertThat(element.toString()).contains("TEST");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSource.java
index 3cdc699a3..0f071b744 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSource.java
@@ -59,9 +59,9 @@ public class TestSetDataSource extends AxiomTestCase {
factory.createOMNamespace("urn://test", "tns"));
parent.addChild(omse);
OMNode firstChild = parent.getFirstOMChild();
- assertTrue("Expected OMSourcedElement child", firstChild instanceof OMSourcedElement);
+ assertThat(firstChild).isInstanceOf(OMSourcedElement.class);
OMSourcedElement child = (OMSourcedElement) firstChild;
- assertTrue("OMSourcedElement is expanded. This is unexpected", !child.isExpanded());
+ assertThat(child.isExpanded()).isFalse();
assertThat(child.getDataSource()).isSameAs(nonDestructiveOMDataSource1);
// Write out the body
@@ -69,8 +69,8 @@ public class TestSetDataSource extends AxiomTestCase {
parent.serialize(sw);
String output = sw.toString();
// System.out.println(output);
- assertTrue("The payload was not present in the output", output.indexOf(payload1) > 0);
- assertTrue("OMSourcedElement is expanded. This is unexpected", !child.isExpanded());
+ assertThat(output).contains(payload1);
+ assertThat(child.isExpanded()).isFalse();
// Replace with payload2.
// Important note, it is legal to replace the OMDataSource, but
@@ -82,8 +82,8 @@ public class TestSetDataSource extends AxiomTestCase {
parent.serialize(sw);
output = sw.toString();
// System.out.println(output);
- assertTrue("The payload was not present in the output", output.indexOf(payload2) > 0);
- assertTrue("OMSourcedElement is expanded. This is unexpected", !child.isExpanded());
+ assertThat(output).contains(payload2);
+ assertThat(child.isExpanded()).isFalse();
// Now Replace with payload1 from an destructiveOMDataSource1
child.setDataSource(destructiveOMDataSource1);
@@ -91,7 +91,7 @@ public class TestSetDataSource extends AxiomTestCase {
parent.serialize(sw);
output = sw.toString();
// System.out.println(output);
- assertTrue("The payload was not present in the output", output.indexOf(payload1) > 0);
+ assertThat(output).contains(payload1);
// Now Replace with payload2 from an destructiveOMDataSource2.
// Note at this point, the child's tree is expanded.
@@ -100,6 +100,6 @@ public class TestSetDataSource extends AxiomTestCase {
parent.serialize(sw);
output = sw.toString();
// System.out.println(output);
- assertTrue("The payload was not present in the output", output.indexOf(payload2) > 0);
+ assertThat(output).contains(payload2);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSourceOnAlreadyExpandedElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSourceOnAlreadyExpandedElement.java
index 2107d49e5..d1a0f1995 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSourceOnAlreadyExpandedElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSourceOnAlreadyExpandedElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.ts.AxiomTestCase;
@@ -39,12 +41,12 @@ public class TestSetDataSourceOnAlreadyExpandedElement extends AxiomTestCase {
metaFactory.getOMFactory(), false, true);
// Make sure the OMSourcedElement is expanded
element.getFirstOMChild();
- assertTrue(element.isExpanded());
+ assertThat(element.isExpanded()).isTrue();
// Now set a new data source
element.setDataSource(new PullOMDataSource(TestDocument.DOCUMENT2.getContent()));
- assertFalse(element.isExpanded());
+ assertThat(element.isExpanded()).isFalse();
// getNextOMSibling should not expand the element
- assertNull(element.getNextOMSibling());
- assertFalse(element.isExpanded());
+ assertThat(element.getNextOMSibling()).isNull();
+ assertThat(element.isExpanded()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestStringOMDataSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestStringOMDataSource.java
index 3b84dc1bb..fe5a92b30 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestStringOMDataSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestStringOMDataSource.java
@@ -55,9 +55,9 @@ public class TestStringOMDataSource extends AxiomTestCase {
OMSourcedElement omse = factory.createOMElement(somds, localName, ns);
parent.addChild(omse);
OMNode firstChild = parent.getFirstOMChild();
- assertTrue("Expected OMSourcedElement child", firstChild instanceof OMSourcedElement);
+ assertThat(firstChild).isInstanceOf(OMSourcedElement.class);
OMSourcedElement child = (OMSourcedElement) firstChild;
- assertTrue("OMSourcedElement is expanded. This is unexpected", !child.isExpanded());
+ assertThat(child.isExpanded()).isFalse();
assertThat(child.getDataSource()).isInstanceOf(StringOMDataSource.class);
// A StringOMDataSource does not consume the backing object when read.
@@ -65,7 +65,7 @@ public class TestStringOMDataSource extends AxiomTestCase {
// cause expansion of the OMSourcedElement.
XMLStreamReader reader = child.getXMLStreamReader();
reader.next();
- assertTrue("OMSourcedElement is expanded. This is unexpected", !child.isExpanded());
+ assertThat(child.isExpanded()).isFalse();
// Likewise, a StringOMDataSource does not consume the backing object when
// written. Thus serializing the OMSourcedElement should not cause the expansion
@@ -73,9 +73,8 @@ public class TestStringOMDataSource extends AxiomTestCase {
StringWriter out = new StringWriter();
parent.serialize(out);
// System.out.println(output);
- assertTrue(
- "The payload was not present in the output", out.toString().indexOf(payload1) > 0);
- assertTrue("OMSourcedElement is expanded. This is unexpected", !child.isExpanded());
+ assertThat(out.toString()).contains(payload1);
+ assertThat(child.isExpanded()).isFalse();
// Test getting the raw content from the StringOMDataSource.
StringOMDataSource ds = (StringOMDataSource) child.getDataSource();
@@ -83,6 +82,6 @@ public class TestStringOMDataSource extends AxiomTestCase {
// Validate close
ds.close();
- assertTrue("Close should free the resource", ds.getObject() == null);
+ assertThat(ds.getObject()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWrappedTextNodeOMDataSourceFromReader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWrappedTextNodeOMDataSourceFromReader.java
index c288f0c8c..18d08cc60 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWrappedTextNodeOMDataSourceFromReader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWrappedTextNodeOMDataSourceFromReader.java
@@ -19,6 +19,8 @@
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import java.util.Random;
@@ -52,6 +54,6 @@ public class TestWrappedTextNodeOMDataSourceFromReader extends AxiomTestCase {
new WrappedTextNodeOMDataSourceFromReader(qname, new StringReader(testData));
OMFactory factory = metaFactory.getOMFactory();
OMSourcedElement element = factory.createOMElement(ds, qname);
- assertEquals(testData, element.getText());
+ assertThat(element.getText()).isEqualTo(testData);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWriteTextToWithNonDestructiveOMDataSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWriteTextToWithNonDestructiveOMDataSource.java
index de03b7b73..8ca61dbe7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWriteTextToWithNonDestructiveOMDataSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWriteTextToWithNonDestructiveOMDataSource.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Writer;
@@ -56,6 +58,6 @@ public class TestWriteTextToWithNonDestructiveOMDataSource extends AxiomTestCase
Writer out = new CharacterStreamComparator(in);
element.writeTextTo(out, true); // cache doesn't matter here
out.close();
- assertFalse(element.isExpanded());
+ assertThat(element.isExpanded()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/GetNamespaceContextScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/GetNamespaceContextScenario.java
index f316e2e84..b38ee8510 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/GetNamespaceContextScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/GetNamespaceContextScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -27,7 +29,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
/**
* Tests that {@link XMLStreamWriter#getNamespaceContext()} gives access to pre-existing namespace
@@ -46,7 +47,7 @@ public class GetNamespaceContextScenario implements PushOMDataSourceScenario {
@Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- Assert.assertEquals("urn:test", writer.getNamespaceContext().getNamespaceURI("p"));
+ assertThat(writer.getNamespaceContext().getNamespaceURI("p")).isEqualTo("urn:test");
writer.writeStartElement(null, "root", null);
writer.writeEndElement();
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeAutoPrefixScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeAutoPrefixScenario.java
index b8ba69fbd..08e9096d5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeAutoPrefixScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeAutoPrefixScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
@@ -28,7 +30,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
/**
* Scenario that lets {@link XMLStreamWriter#writeAttribute(String, String, String)} automatically
@@ -57,11 +58,11 @@ public class WriteAttributeAutoPrefixScenario implements PushOMDataSourceScenari
@Override
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
Iterator<OMAttribute> it = element.getAllAttributes();
- Assert.assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMAttribute attr = it.next();
- Assert.assertEquals("p", attr.getPrefix());
- Assert.assertEquals("urn:test", attr.getNamespaceURI());
- Assert.assertEquals("attr", attr.getLocalName());
- Assert.assertEquals("value", attr.getAttributeValue());
+ assertThat(attr.getPrefix()).isEqualTo("p");
+ assertThat(attr.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(attr.getLocalName()).isEqualTo("attr");
+ assertThat(attr.getAttributeValue()).isEqualTo("value");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeNamespaceUnawareScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeNamespaceUnawareScenario.java
index ce99b1ae7..136e126bd 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeNamespaceUnawareScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeNamespaceUnawareScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -27,7 +29,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
/**
* Tests that {@link XMLStreamWriter#writeAttribute(String, String)} creates the expected attribute.
@@ -52,6 +53,6 @@ public class WriteAttributeNamespaceUnawareScenario implements PushOMDataSourceS
@Override
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
- Assert.assertEquals("value", element.getAttributeValue(new QName("attr")));
+ assertThat(element.getAttributeValue(new QName("attr"))).isEqualTo("value");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobProviderScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobProviderScenario.java
index 042e0736b..25f55778d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobProviderScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobProviderScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
@@ -34,7 +36,6 @@ import org.apache.axiom.testutils.blob.RandomBlob;
import org.apache.axiom.testutils.io.IOTestUtils;
import org.apache.axiom.testutils.suite.LabelTarget;
import org.apache.axiom.util.stax.XMLStreamWriterUtils;
-import org.junit.Assert;
/**
* Tests that {@link BlobWriter#writeBlob(BlobProvider, String, boolean)} creates an {@link OMText}
@@ -68,8 +69,8 @@ public class WriteBlobProviderScenario implements PushOMDataSourceScenario {
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
OMText child = (OMText) element.getFirstOMChild();
if (blobsPreserved) {
- Assert.assertTrue(child.isBinary());
- Assert.assertSame(blob, child.getBlob());
+ assertThat(child.isBinary()).isTrue();
+ assertThat(child.getBlob()).isSameAs(blob);
} else {
child.setBinary(true);
IOTestUtils.compareStreams(blob.getInputStream(), child.getBlob().getInputStream());
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobScenario.java
index b841c2e2d..784a8aee2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
@@ -33,7 +35,6 @@ import org.apache.axiom.testutils.blob.RandomBlob;
import org.apache.axiom.testutils.io.IOTestUtils;
import org.apache.axiom.testutils.suite.LabelTarget;
import org.apache.axiom.util.stax.XMLStreamWriterUtils;
-import org.junit.Assert;
/**
* Tests that {@link BlobWriter#writeBlob(Blob, String, boolean)} creates an {@link OMText} backed
@@ -67,8 +68,8 @@ public class WriteBlobScenario implements PushOMDataSourceScenario {
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
OMText child = (OMText) element.getFirstOMChild();
if (blobsPreserved) {
- Assert.assertTrue(child.isBinary());
- Assert.assertSame(blob, child.getBlob());
+ assertThat(child.isBinary()).isTrue();
+ assertThat(child.getBlob()).isSameAs(blob);
} else {
// TODO: this will only work if a single text node was created
child.setBinary(true);
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCDataScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCDataScenario.java
index aeaabde97..e54f11d8e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCDataScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCDataScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -28,7 +30,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
public class WriteCDataScenario implements PushOMDataSourceScenario {
@Override
@@ -51,9 +52,9 @@ public class WriteCDataScenario implements PushOMDataSourceScenario {
@Override
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
OMNode child = element.getFirstOMChild();
- Assert.assertTrue(child instanceof OMText);
+ assertThat(child).isInstanceOf(OMText.class);
OMText text = (OMText) child;
- Assert.assertEquals(OMNode.CDATA_SECTION_NODE, text.getType());
- Assert.assertEquals("content", text.getText());
+ assertThat(text.getType()).isEqualTo(OMNode.CDATA_SECTION_NODE);
+ assertThat(text.getText()).isEqualTo("content");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCharactersCharArrayScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCharactersCharArrayScenario.java
index 6dca38c8f..5b89491ea 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCharactersCharArrayScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCharactersCharArrayScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -28,7 +30,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
/** Scenario that uses {@link XMLStreamWriter#writeCharacters(char[], int, int)}. */
public class WriteCharactersCharArrayScenario implements PushOMDataSourceScenario {
@@ -56,11 +57,11 @@ public class WriteCharactersCharArrayScenario implements PushOMDataSourceScenari
@Override
public void validate(OMElement element, boolean blobsPreserved) {
OMNode child = element.getFirstOMChild();
- Assert.assertTrue(child instanceof OMText);
- Assert.assertEquals("test", ((OMText) child).getText());
+ assertThat(child).isInstanceOf(OMText.class);
+ assertThat(((OMText) child).getText()).isEqualTo("test");
child = child.getNextOMSibling();
- Assert.assertTrue(child instanceof OMText);
- Assert.assertEquals("case", ((OMText) child).getText());
- Assert.assertNull(child.getNextOMSibling());
+ assertThat(child).isInstanceOf(OMText.class);
+ assertThat(((OMText) child).getText()).isEqualTo("case");
+ assertThat(child.getNextOMSibling()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCommentScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCommentScenario.java
index bfcbd461c..fd5a36010 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCommentScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCommentScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -28,7 +30,6 @@ import org.apache.axiom.om.OMComment;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
public class WriteCommentScenario implements PushOMDataSourceScenario {
@Override
@@ -51,7 +52,7 @@ public class WriteCommentScenario implements PushOMDataSourceScenario {
@Override
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
OMNode child = element.getFirstOMChild();
- Assert.assertTrue(child instanceof OMComment);
- Assert.assertEquals("comment", ((OMComment) child).getValue());
+ assertThat(child).isInstanceOf(OMComment.class);
+ assertThat(((OMComment) child).getValue()).isEqualTo("comment");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementAutoPrefixScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementAutoPrefixScenario.java
index 33b7904fa..160a791b7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementAutoPrefixScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementAutoPrefixScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -26,7 +28,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
/**
* Tests that {@link XMLStreamWriter#writeEmptyElement(String, String)} automatically selects an
@@ -55,8 +56,8 @@ public class WriteEmptyElementAutoPrefixScenario implements PushOMDataSourceScen
@Override
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
OMElement child = element.getFirstElement();
- Assert.assertEquals("p", child.getPrefix());
- Assert.assertEquals("urn:test", child.getNamespaceURI());
- Assert.assertEquals("child", child.getLocalName());
+ assertThat(child.getPrefix()).isEqualTo("p");
+ assertThat(child.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(child.getLocalName()).isEqualTo("child");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementScenario.java
index b16e3372a..3e6b9923e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -26,7 +28,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
/** Scenario that uses {@link XMLStreamWriter#writeEmptyElement(String, String, String)}. */
public class WriteEmptyElementScenario implements PushOMDataSourceScenario {
@@ -51,8 +52,8 @@ public class WriteEmptyElementScenario implements PushOMDataSourceScenario {
@Override
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
OMElement child = element.getFirstElement();
- Assert.assertEquals("p", child.getPrefix());
- Assert.assertEquals("urn:test", child.getNamespaceURI());
- Assert.assertEquals("child", child.getLocalName());
+ assertThat(child.getPrefix()).isEqualTo("p");
+ assertThat(child.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(child.getLocalName()).isEqualTo("child");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEntityRefScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEntityRefScenario.java
index f7776a940..bc0fdcefa 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEntityRefScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEntityRefScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -28,7 +30,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMEntityReference;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
/** Scenario that uses {@link XMLStreamWriter#writeEntityRef(String)}. */
public class WriteEntityRefScenario implements PushOMDataSourceScenario {
@@ -52,9 +53,9 @@ public class WriteEntityRefScenario implements PushOMDataSourceScenario {
@Override
public void validate(OMElement element, boolean blobsPreserved) {
OMNode child = element.getFirstOMChild();
- Assert.assertTrue(child instanceof OMEntityReference);
+ assertThat(child).isInstanceOf(OMEntityReference.class);
OMEntityReference entref = (OMEntityReference) child;
- Assert.assertEquals("test", entref.getName());
- Assert.assertNull(entref.getReplacementText());
+ assertThat(entref.getName()).isEqualTo("test");
+ assertThat(entref.getReplacementText()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteNamespaceScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteNamespaceScenario.java
index 3e44d38c5..01c971753 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteNamespaceScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteNamespaceScenario.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
@@ -28,7 +31,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
/**
* Tests that {@link XMLStreamWriter#writeNamespace(String, String)} creates the expected namespace
@@ -71,14 +73,14 @@ public class WriteNamespaceScenario implements PushOMDataSourceScenario {
OMNamespace ns = it.next();
if (!ns.getPrefix().equals("_p_")) {
if (decl != null) {
- Assert.fail("Found unexpected namespace declaration");
+ fail("Found unexpected namespace declaration");
} else {
decl = ns;
}
}
}
- Assert.assertNotNull(decl);
- Assert.assertEquals(prefix, decl.getPrefix());
- Assert.assertEquals(namespaceURI, decl.getNamespaceURI());
+ assertThat(decl).isNotNull();
+ assertThat(decl.getPrefix()).isEqualTo(prefix);
+ assertThat(decl.getNamespaceURI()).isEqualTo(namespaceURI);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction1Scenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction1Scenario.java
index 1ad571760..9b40b0c9f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction1Scenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction1Scenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -28,7 +30,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMProcessingInstruction;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
public class WriteProcessingInstruction1Scenario implements PushOMDataSourceScenario {
@Override
@@ -51,9 +52,9 @@ public class WriteProcessingInstruction1Scenario implements PushOMDataSourceScen
@Override
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
OMNode child = element.getFirstOMChild();
- Assert.assertTrue(child instanceof OMProcessingInstruction);
+ assertThat(child).isInstanceOf(OMProcessingInstruction.class);
OMProcessingInstruction pi = (OMProcessingInstruction) child;
- Assert.assertEquals("target", pi.getTarget());
- Assert.assertEquals("", pi.getValue());
+ assertThat(pi.getTarget()).isEqualTo("target");
+ assertThat(pi.getValue()).isEqualTo("");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction2Scenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction2Scenario.java
index 2dacb1e66..fcbd791e8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction2Scenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction2Scenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -28,7 +30,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMProcessingInstruction;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
public class WriteProcessingInstruction2Scenario implements PushOMDataSourceScenario {
@Override
@@ -51,9 +52,9 @@ public class WriteProcessingInstruction2Scenario implements PushOMDataSourceScen
@Override
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
OMNode child = element.getFirstOMChild();
- Assert.assertTrue(child instanceof OMProcessingInstruction);
+ assertThat(child).isInstanceOf(OMProcessingInstruction.class);
OMProcessingInstruction pi = (OMProcessingInstruction) child;
- Assert.assertEquals("target", pi.getTarget());
- Assert.assertEquals("data", pi.getValue());
+ assertThat(pi.getTarget()).isEqualTo("target");
+ assertThat(pi.getValue()).isEqualTo("data");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementAutoPrefixScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementAutoPrefixScenario.java
index e19b72a15..ceaece4c6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementAutoPrefixScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementAutoPrefixScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -26,7 +28,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
/**
* Tests that {@link XMLStreamWriter#writeStartElement(String, String)} automatically selects an
@@ -57,8 +58,8 @@ public class WriteStartElementAutoPrefixScenario implements PushOMDataSourceScen
@Override
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
OMElement child = element.getFirstElement();
- Assert.assertEquals("p", child.getPrefix());
- Assert.assertEquals("urn:test", child.getNamespaceURI());
- Assert.assertEquals("child", child.getLocalName());
+ assertThat(child.getPrefix()).isEqualTo("p");
+ assertThat(child.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(child.getLocalName()).isEqualTo("child");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementWithDefaultNamespaceDeclaredOnParentScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementWithDefaultNamespaceDeclaredOnParentScenario.java
index fbc675283..54fbc4c70 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementWithDefaultNamespaceDeclaredOnParentScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementWithDefaultNamespaceDeclaredOnParentScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Collections;
import java.util.Map;
@@ -26,7 +28,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.testutils.suite.LabelTarget;
-import org.junit.Assert;
/**
* Tests that {@link XMLStreamWriter#writeStartElement(String, String, String)} creates the correct
@@ -58,9 +59,9 @@ public class WriteStartElementWithDefaultNamespaceDeclaredOnParentScenario
@Override
public void validate(OMElement element, boolean blobsPreserved) throws Throwable {
OMElement child = element.getFirstElement();
- Assert.assertNull(child.getPrefix());
- Assert.assertEquals("urn:test", child.getNamespaceURI());
- Assert.assertEquals("child", child.getLocalName());
- Assert.assertFalse(child.getAllDeclaredNamespaces().hasNext());
+ assertThat(child.getPrefix()).isNull();
+ assertThat(child.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(child.getLocalName()).isEqualTo("child");
+ assertThat(child.getAllDeclaredNamespaces().hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestCloseWithoutCaching.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestCloseWithoutCaching.java
index c71e7cc68..33695d407 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestCloseWithoutCaching.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestCloseWithoutCaching.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.OMContainer;
@@ -56,6 +58,6 @@ public class TestCloseWithoutCaching extends AxiomTestCase {
reader.next();
}
reader.close();
- assertFalse(ds.hasUnclosedReaders());
+ assertThat(ds.hasUnclosedReaders()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestGetName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestGetName.java
index 603a3b74e..a9565e584 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestGetName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/sr/TestGetName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.sr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
@@ -53,11 +55,11 @@ public class TestGetName extends AxiomTestCase {
factory.createOMNamespace("urn:ns", null));
root.addChild(el);
XMLStreamReader reader = root.getXMLStreamReader();
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
QName name = reader.getName();
- assertEquals("p", name.getPrefix());
- assertEquals("urn:ns", name.getNamespaceURI());
- assertEquals("el", name.getLocalPart());
+ assertThat(name.getPrefix()).isEqualTo("p");
+ assertThat(name.getNamespaceURI()).isEqualTo("urn:ns");
+ assertThat(name.getLocalPart()).isEqualTo("el");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java
index 9a24f0696..6be9d860a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.transform.stream.StreamSource;
@@ -61,8 +63,8 @@ public class TestCloneBinary extends AxiomTestCase {
OMCloneOptions options = new OMCloneOptions();
options.setFetchBlobs(fetch);
OMText clone = (OMText) text.clone(options);
- assertTrue(clone.isBinary());
- assertEquals(fetch, attachmentAccessor.isLoaded());
- assertSame(blob, clone.getBlob());
+ assertThat(clone.isBinary()).isTrue();
+ assertThat(attachmentAccessor.isLoaded()).isEqualTo(fetch);
+ assertThat(clone.getBlob()).isSameAs(blob);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetNamespace.java
index b91482c70..8fb0b6d03 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -41,7 +43,7 @@ public class TestGetNamespace extends AxiomTestCase {
element.declareNamespace("urn:ns", "p");
OMText text = factory.createOMText(element, "p:value");
OMNamespace ns = text.getNamespace();
- assertEquals("urn:ns", ns.getNamespaceURI());
- assertEquals("p", ns.getPrefix());
+ assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns");
+ assertThat(ns.getPrefix()).isEqualTo("p");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetNamespaceNoNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetNamespaceNoNamespace.java
index e506131a6..ca40961c2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetNamespaceNoNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetNamespaceNoNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -41,6 +43,6 @@ public class TestGetNamespaceNoNamespace extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement("TestElement", null);
OMText text = factory.createOMText(element, "value");
- assertNull(text.getNamespace());
+ assertThat(text.getNamespace()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetTextCharactersFromDataHandler.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetTextCharactersFromDataHandler.java
index 64878fd76..1a4cde02f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetTextCharactersFromDataHandler.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetTextCharactersFromDataHandler.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.nio.charset.StandardCharsets;
import org.apache.axiom.blob.Blob;
@@ -46,6 +48,6 @@ public class TestGetTextCharactersFromDataHandler extends AxiomTestCase {
OMText text = metaFactory.getOMFactory().createOMText(blob, true);
char[] chars = text.getTextCharacters();
byte[] decoded = Base64.decodeBase64(new String(chars));
- assertEquals("test content", new String(decoded, StandardCharsets.UTF_8));
+ assertThat(new String(decoded, StandardCharsets.UTF_8)).isEqualTo("test content");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
index 1d8181ed2..22dcb2ea3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.xop;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -81,10 +83,10 @@ public class TestSerialize extends AxiomTestCase {
if (base64) {
// Do a quick check to see if the data is base64 and is
// writing base64 compliant code.
- assertTrue(out.indexOf("base64") != -1);
- assertTrue(out.indexOf("GBgcGBQgHBwcJCQgKDBQNDAsL") != -1);
+ assertThat(out).contains("base64");
+ assertThat(out).contains("GBgcGBQgHBwcJCQgKDBQNDAsL");
} else {
- assertTrue(out.indexOf("base64") == -1);
+ assertThat(out).doesNotContain("base64");
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java
index 40f26ee60..12ebe9e12 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.xop;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.stax.StAXSource;
@@ -54,9 +56,9 @@ public class XOPRoundtripTest extends AxiomTestCase {
xopEncodedStream.getAttachmentAccessor())
.getDocumentElement();
OMText child = (OMText) element2.getFirstOMChild();
- assertNotNull(child);
- assertTrue(child.isBinary());
- assertTrue(child.isOptimized());
- assertSame(blob, child.getBlob());
+ assertThat(child).isNotNull();
+ assertThat(child.isBinary()).isTrue();
+ assertThat(child.isOptimized()).isTrue();
+ assertThat(child.getBlob()).isSameAs(blob);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAddNamespaces.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAddNamespaces.java
index b4a974439..4694cf8ad 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAddNamespaces.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAddNamespaces.java
@@ -19,6 +19,8 @@
package org.apache.axiom.ts.om.xpath;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -47,6 +49,6 @@ public class TestAddNamespaces extends AxiomTestCase {
"<root xmlns='urn:ns1'><child xmlns='urn:ns2'>text</child></root>");
AXIOMXPath xpath = new AXIOMXPath("/ns1:root/ns2:child");
xpath.addNamespaces(root1.getFirstElement());
- assertEquals("text", xpath.stringValueOf(root2.getParent()));
+ assertThat(xpath.stringValueOf(root2.getParent())).isEqualTo("text");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAddNamespaces2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAddNamespaces2.java
index 72aad346e..76af28027 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAddNamespaces2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAddNamespaces2.java
@@ -19,6 +19,8 @@
package org.apache.axiom.ts.om.xpath;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -47,6 +49,6 @@ public class TestAddNamespaces2 extends AxiomTestCase {
"<root xmlns='urn:ns1'><child xmlns='urn:ns2'>text</child></root>");
AXIOMXPath xpath = new AXIOMXPath("//ns:child");
xpath.addNamespaces(root1.getFirstElement());
- assertEquals("text", xpath.stringValueOf(root2.getParent()));
+ assertThat(xpath.stringValueOf(root2.getParent())).isEqualTo("text");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestGetAttributeQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestGetAttributeQName.java
index 6d479b6e3..1d5374e2d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestGetAttributeQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestGetAttributeQName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.xpath;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -42,6 +44,6 @@ public class TestGetAttributeQName extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement("test", null);
element.addAttribute("att", "value", factory.createOMNamespace("urn:test", "p"));
- assertEquals("p:att", new AXIOMXPath("name(@*)").stringValueOf(element));
+ assertThat(new AXIOMXPath("name(@*)").stringValueOf(element)).isEqualTo("p:att");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/attr/TestGetNamespaceNormalized.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/attr/TestGetNamespaceNormalized.java
index 93924562a..a7fade905 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/attr/TestGetNamespaceNormalized.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/attr/TestGetNamespaceNormalized.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.attr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMNamedInformationItem;
import org.apache.axiom.ts.omdom.OMDOMTestCase;
@@ -33,6 +35,6 @@ public class TestGetNamespaceNormalized extends OMDOMTestCase {
protected void runTest() throws Throwable {
Document doc = metaFactory.newDocumentBuilderFactory().newDocumentBuilder().newDocument();
Attr attr = doc.createAttributeNS(null, "attr");
- assertNull(((OMAttribute) attr).getNamespace());
+ assertThat(((OMAttribute) attr).getNamespace()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestCreateDocumentFragmentInterfaces.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestCreateDocumentFragmentInterfaces.java
index f082c22bb..28d5b09cd 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestCreateDocumentFragmentInterfaces.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestCreateDocumentFragmentInterfaces.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMInformationItem;
import org.apache.axiom.ts.omdom.OMDOMTestCase;
import org.w3c.dom.Document;
@@ -33,6 +35,6 @@ public class TestCreateDocumentFragmentInterfaces extends OMDOMTestCase {
Document document =
metaFactory.newDocumentBuilderFactory().newDocumentBuilder().newDocument();
DocumentFragment fragment = document.createDocumentFragment();
- assertFalse(fragment instanceof OMInformationItem);
+ assertThat(fragment).isNotInstanceOf(OMInformationItem.class);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestGetOMFactory1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestGetOMFactory1.java
index fef37ed66..be0a58b0a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestGetOMFactory1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestGetOMFactory1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilder;
import org.apache.axiom.om.OMDocument;
@@ -34,6 +36,6 @@ public class TestGetOMFactory1 extends OMDOMTestCase {
protected void runTest() throws Throwable {
Document document =
metaFactory.newDocumentBuilderFactory().newDocumentBuilder().newDocument();
- assertSame(metaFactory.getOMFactory(), ((OMDocument) document).getOMFactory());
+ assertThat(((OMDocument) document).getOMFactory()).isSameAs(metaFactory.getOMFactory());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestGetOMFactory2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestGetOMFactory2.java
index d73a4a3d6..cc80046c6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestGetOMFactory2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestGetOMFactory2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMInformationItem;
import org.apache.axiom.ts.omdom.OMDOMTestCase;
@@ -35,6 +37,6 @@ public class TestGetOMFactory2 extends OMDOMTestCase {
protected void runTest() throws Throwable {
Document document =
metaFactory.getDOMImplementation().createDocument("urn:test", "root", null);
- assertSame(metaFactory.getOMFactory(), ((OMDocument) document).getOMFactory());
+ assertThat(((OMDocument) document).getOMFactory()).isSameAs(metaFactory.getOMFactory());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAddAttributeReplace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAddAttributeReplace.java
index 285447242..3ff167c67 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAddAttributeReplace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAddAttributeReplace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -36,13 +38,13 @@ public class TestAddAttributeReplace extends OMDOMTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement("test", null);
Document ownerDocument = ((Element) element).getOwnerDocument();
- assertNotNull(ownerDocument);
+ assertThat(ownerDocument).isNotNull();
OMAttribute attr1 = element.addAttribute("attr", "value1", null);
- assertSame(ownerDocument, ((Attr) attr1).getOwnerDocument());
+ assertThat(((Attr) attr1).getOwnerDocument()).isSameAs(ownerDocument);
OMAttribute attr2 = factory.createOMAttribute("attr", null, "value2");
element.addAttribute(attr2);
Document newOwnerDocument = ((Attr) attr1).getOwnerDocument();
- assertNotNull(ownerDocument);
- assertNotSame(ownerDocument, newOwnerDocument);
+ assertThat(ownerDocument).isNotNull();
+ assertThat(newOwnerDocument).isNotSameAs(ownerDocument);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAddChildFromForeignDocument.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAddChildFromForeignDocument.java
index 6aafb8fd3..ebacaf13c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAddChildFromForeignDocument.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAddChildFromForeignDocument.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilder;
import org.apache.axiom.om.OMContainer;
@@ -41,8 +43,8 @@ public class TestAddChildFromForeignDocument extends OMDOMTestCase {
Element element2 = document2.createElementNS(null, "element2");
((OMElement) element1).addChild((OMElement) element2);
// Assert that the new child is not a copy, but the original element
- assertSame(element2, element1.getFirstChild());
+ assertThat(element1.getFirstChild()).isSameAs(element2);
// Assert that the owner document of element2 was changed
- assertSame(document1, element2.getOwnerDocument());
+ assertThat(element2.getOwnerDocument()).isSameAs(document1);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAppendChildIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAppendChildIncomplete.java
index 196813026..fe79061cc 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAppendChildIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestAppendChildIncomplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMFactory;
@@ -46,9 +48,9 @@ public class TestAppendChildIncomplete extends OMDOMTestCase {
Element parent = document.getDocumentElement();
parent.appendChild(document.createElementNS(null, "c"));
NodeList children = parent.getChildNodes();
- assertEquals(3, children.getLength());
- assertEquals("a", children.item(0).getLocalName());
- assertEquals("b", children.item(1).getLocalName());
- assertEquals("c", children.item(2).getLocalName());
+ assertThat(children.getLength()).isEqualTo(3);
+ assertThat(children.item(0).getLocalName()).isEqualTo("a");
+ assertThat(children.item(1).getLocalName()).isEqualTo("b");
+ assertThat(children.item(2).getLocalName()).isEqualTo("c");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestCloneOMElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestCloneOMElement.java
index ecffdb155..a4730cf5c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestCloneOMElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestCloneOMElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.ts.omdom.OMDOMTestCase;
@@ -33,6 +35,7 @@ public class TestCloneOMElement extends OMDOMTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement("test", null);
OMElement clone = element.cloneOMElement();
- assertNotSame(((Element) element).getOwnerDocument(), ((Element) clone).getOwnerDocument());
+ assertThat(((Element) clone).getOwnerDocument())
+ .isNotSameAs(((Element) element).getOwnerDocument());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestDetach.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestDetach.java
index 553a6753f..0452cf82b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestDetach.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestDetach.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.ts.omdom.OMDOMTestCase;
@@ -37,6 +39,6 @@ public class TestDetach extends OMDOMTestCase {
Element child = document.createElementNS(null, "child");
parent.appendChild(child);
((OMElement) child).detach();
- assertNotSame(document, child.getOwnerDocument());
+ assertThat(child.getOwnerDocument()).isNotSameAs(document);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestGetNamespaceNormalized.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestGetNamespaceNormalized.java
index 8d32d58f6..1ded91179 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestGetNamespaceNormalized.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestGetNamespaceNormalized.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamedInformationItem;
import org.apache.axiom.ts.omdom.OMDOMTestCase;
@@ -33,6 +35,6 @@ public class TestGetNamespaceNormalized extends OMDOMTestCase {
protected void runTest() throws Throwable {
Document doc = metaFactory.newDocumentBuilderFactory().newDocumentBuilder().newDocument();
Element element = doc.createElementNS(null, "test");
- assertNull(((OMElement) element).getNamespace());
+ assertThat(((OMElement) element).getNamespace()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestInsertBeforeIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestInsertBeforeIncomplete.java
index dcfa59aeb..81867574c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestInsertBeforeIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestInsertBeforeIncomplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMFactory;
@@ -48,9 +50,9 @@ public class TestInsertBeforeIncomplete extends OMDOMTestCase {
Element parent = document.getDocumentElement();
parent.insertBefore(document.createElementNS(null, "c"), null);
NodeList children = parent.getChildNodes();
- assertEquals(3, children.getLength());
- assertEquals("a", children.item(0).getLocalName());
- assertEquals("b", children.item(1).getLocalName());
- assertEquals("c", children.item(2).getLocalName());
+ assertThat(children.getLength()).isEqualTo(3);
+ assertThat(children.item(0).getLocalName()).isEqualTo("a");
+ assertThat(children.item(1).getLocalName()).isEqualTo("b");
+ assertThat(children.item(2).getLocalName()).isEqualTo("c");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttribute.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttribute.java
index 29c85271c..4ee524f47 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttribute.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttribute.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -36,12 +38,12 @@ public class TestRemoveAttribute extends OMDOMTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement("test", null);
Document ownerDocument = ((Element) element).getOwnerDocument();
- assertNotNull(ownerDocument);
+ assertThat(ownerDocument).isNotNull();
OMAttribute attr = element.addAttribute("attr", "value", null);
- assertSame(ownerDocument, ((Attr) attr).getOwnerDocument());
+ assertThat(((Attr) attr).getOwnerDocument()).isSameAs(ownerDocument);
element.removeAttribute(attr);
Document newOwnerDocument = ((Attr) attr).getOwnerDocument();
- assertNotNull(ownerDocument);
- assertNotSame(ownerDocument, newOwnerDocument);
+ assertThat(ownerDocument).isNotNull();
+ assertThat(newOwnerDocument).isNotSameAs(ownerDocument);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttributeNSNamespaceDeclaration.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttributeNSNamespaceDeclaration.java
index 5b3cdce10..006fd6805 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttributeNSNamespaceDeclaration.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttributeNSNamespaceDeclaration.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import org.apache.axiom.om.OMElement;
@@ -36,6 +38,6 @@ public class TestRemoveAttributeNSNamespaceDeclaration extends OMDOMTestCase {
OMElement element = factory.createOMElement("test", null);
element.declareNamespace("urn:test", "ns");
((Element) element).removeAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "ns");
- assertFalse(element.getAllDeclaredNamespaces().hasNext());
+ assertThat(element.getAllDeclaredNamespaces().hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveChildIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveChildIncomplete.java
index 6ed9d91ee..d16abd4c3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveChildIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveChildIncomplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.util.AXIOMUtil;
import org.apache.axiom.ts.omdom.OMDOMTestCase;
import org.w3c.dom.Element;
@@ -37,9 +39,9 @@ public class TestRemoveChildIncomplete extends OMDOMTestCase {
Node b = element.getFirstChild().getNextSibling();
element.removeChild(b);
Node child = element.getFirstChild();
- assertEquals("a", child.getLocalName());
+ assertThat(child.getLocalName()).isEqualTo("a");
child = child.getNextSibling();
- assertEquals("c", child.getLocalName());
- assertNull(child.getNextSibling());
+ assertThat(child.getLocalName()).isEqualTo("c");
+ assertThat(child.getNextSibling()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestReplaceChildFirstIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestReplaceChildFirstIncomplete.java
index 9dd80d38f..2b8680c4b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestReplaceChildFirstIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestReplaceChildFirstIncomplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMFactory;
@@ -44,28 +46,28 @@ public class TestReplaceChildFirstIncomplete extends OMDOMTestCase {
Element a2 = element.getOwnerDocument().createElementNS(null, "a2");
element.replaceChild(a2, a);
Element b = (Element) a2.getNextSibling();
- assertNotNull(b);
+ assertThat(b).isNotNull();
Element c = (Element) b.getNextSibling();
- assertNotNull(c);
+ assertThat(c).isNotNull();
// Check the other sibling relations
- assertNull(a2.getPreviousSibling());
- assertSame(a2, b.getPreviousSibling());
- assertSame(b, c.getPreviousSibling());
- assertNull(c.getNextSibling());
+ assertThat(a2.getPreviousSibling()).isNull();
+ assertThat(b.getPreviousSibling()).isSameAs(a2);
+ assertThat(c.getPreviousSibling()).isSameAs(b);
+ assertThat(c.getNextSibling()).isNull();
// Check parent-child relations
- assertSame(a2, element.getFirstChild());
- assertSame(c, element.getLastChild());
- assertSame(element, a2.getParentNode());
- assertSame(element, b.getParentNode());
- assertSame(element, c.getParentNode());
+ assertThat(element.getFirstChild()).isSameAs(a2);
+ assertThat(element.getLastChild()).isSameAs(c);
+ assertThat(a2.getParentNode()).isSameAs(element);
+ assertThat(b.getParentNode()).isSameAs(element);
+ assertThat(c.getParentNode()).isSameAs(element);
NodeList children = element.getChildNodes();
- assertEquals(3, children.getLength());
- assertSame(a2, children.item(0));
- assertSame(b, children.item(1));
- assertSame(c, children.item(2));
+ assertThat(children.getLength()).isEqualTo(3);
+ assertThat(children.item(0)).isSameAs(a2);
+ assertThat(children.item(1)).isSameAs(b);
+ assertThat(children.item(2)).isSameAs(c);
// Check that a has been detached properly
- assertNull(a.getPreviousSibling());
- assertNull(a.getNextSibling());
- assertNull(a.getParentNode());
+ assertThat(a.getPreviousSibling()).isNull();
+ assertThat(a.getNextSibling()).isNull();
+ assertThat(a.getParentNode()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestReplaceChildMiddleIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestReplaceChildMiddleIncomplete.java
index 0ed6e461d..d6d28c460 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestReplaceChildMiddleIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestReplaceChildMiddleIncomplete.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMFactory;
@@ -50,27 +52,27 @@ public class TestReplaceChildMiddleIncomplete extends OMDOMTestCase {
// and the next sibling was not yet created. replaceChild must ensure that the next
// sibling is available now.
Element c = (Element) b2.getNextSibling();
- assertNotNull(c);
+ assertThat(c).isNotNull();
// Check the other sibling relations
- assertNull(a.getPreviousSibling());
- assertSame(b2, a.getNextSibling());
- assertSame(a, b2.getPreviousSibling());
- assertSame(b2, c.getPreviousSibling());
- assertNull(c.getNextSibling());
+ assertThat(a.getPreviousSibling()).isNull();
+ assertThat(a.getNextSibling()).isSameAs(b2);
+ assertThat(b2.getPreviousSibling()).isSameAs(a);
+ assertThat(c.getPreviousSibling()).isSameAs(b2);
+ assertThat(c.getNextSibling()).isNull();
// Check parent-child relations
- assertSame(a, element.getFirstChild());
- assertSame(c, element.getLastChild());
- assertSame(element, a.getParentNode());
- assertSame(element, b2.getParentNode());
- assertSame(element, c.getParentNode());
+ assertThat(element.getFirstChild()).isSameAs(a);
+ assertThat(element.getLastChild()).isSameAs(c);
+ assertThat(a.getParentNode()).isSameAs(element);
+ assertThat(b2.getParentNode()).isSameAs(element);
+ assertThat(c.getParentNode()).isSameAs(element);
NodeList children = element.getChildNodes();
- assertEquals(3, children.getLength());
- assertSame(a, children.item(0));
- assertSame(b2, children.item(1));
- assertSame(c, children.item(2));
+ assertThat(children.getLength()).isEqualTo(3);
+ assertThat(children.item(0)).isSameAs(a);
+ assertThat(children.item(1)).isSameAs(b2);
+ assertThat(children.item(2)).isSameAs(c);
// Check that b has been detached properly
- assertNull(b.getPreviousSibling());
- assertNull(b.getNextSibling());
- assertNull(b.getParentNode());
+ assertThat(b.getPreviousSibling()).isNull();
+ assertThat(b.getNextSibling()).isNull();
+ assertThat(b.getParentNode()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMAttribute.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMAttribute.java
index b6c5dc430..4ab3c5a7c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMAttribute.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMAttribute.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.ts.omdom.OMDOMTestCase;
@@ -28,11 +30,11 @@ public class TestCreateOMAttribute extends OMDOMTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMAttribute attr = factory.createOMAttribute("attr", null, "value");
- assertTrue(attr instanceof Attr);
+ assertThat(attr).isInstanceOf(Attr.class);
Attr domAttr = (Attr) attr;
- assertNull(domAttr.getOwnerElement());
- assertNotNull(domAttr.getOwnerDocument());
- assertEquals("attr", domAttr.getLocalName());
- assertEquals("value", domAttr.getValue());
+ assertThat(domAttr.getOwnerElement()).isNull();
+ assertThat(domAttr.getOwnerDocument()).isNotNull();
+ assertThat(domAttr.getLocalName()).isEqualTo("attr");
+ assertThat(domAttr.getValue()).isEqualTo("value");
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMTextCDATASection.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMTextCDATASection.java
index 3b7b97a7d..7b1936f53 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMTextCDATASection.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMTextCDATASection.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
@@ -35,6 +37,6 @@ public class TestCreateOMTextCDATASection extends OMDOMTestCase {
metaFactory
.getOMFactory()
.createOMText("cdata section content", OMNode.CDATA_SECTION_NODE);
- assertTrue(text instanceof CDATASection);
+ assertThat(text).isInstanceOf(CDATASection.class);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMTextCDATASectionWithParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMTextCDATASectionWithParent.java
index c38839d8c..2119700ab 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMTextCDATASectionWithParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/factory/TestCreateOMTextCDATASectionWithParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -37,6 +39,6 @@ public class TestCreateOMTextCDATASectionWithParent extends OMDOMTestCase {
OMElement parent = factory.createOMElement("test", null);
OMText text =
factory.createOMText(parent, "cdata section content", OMNode.CDATA_SECTION_NODE);
- assertTrue(text instanceof CDATASection);
+ assertThat(text).isInstanceOf(CDATASection.class);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/node/TestInsertSiblingAfterFromForeignDocument.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/node/TestInsertSiblingAfterFromForeignDocument.java
index dcd5d6658..096a6e879 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/node/TestInsertSiblingAfterFromForeignDocument.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/node/TestInsertSiblingAfterFromForeignDocument.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.node;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilder;
import org.apache.axiom.om.OMElement;
@@ -43,8 +45,8 @@ public class TestInsertSiblingAfterFromForeignDocument extends OMDOMTestCase {
Element element2 = document2.createElementNS(null, "element2");
((OMNode) text).insertSiblingAfter((OMElement) element2);
// Assert that the new child is not a copy, but the original element
- assertSame(element2, element1.getLastChild());
+ assertThat(element1.getLastChild()).isSameAs(element2);
// Assert that the owner document of element2 was changed
- assertSame(document1, element2.getOwnerDocument());
+ assertThat(element2.getOwnerDocument()).isSameAs(document1);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/node/TestInsertSiblingBeforeFromForeignDocument.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/node/TestInsertSiblingBeforeFromForeignDocument.java
index 3996e6214..b4d2b642c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/node/TestInsertSiblingBeforeFromForeignDocument.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/node/TestInsertSiblingBeforeFromForeignDocument.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.node;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilder;
import org.apache.axiom.om.OMElement;
@@ -43,8 +45,8 @@ public class TestInsertSiblingBeforeFromForeignDocument extends OMDOMTestCase {
Element element2 = document2.createElementNS(null, "element2");
((OMNode) text).insertSiblingBefore((OMElement) element2);
// Assert that the new child is not a copy, but the original element
- assertSame(element2, element1.getFirstChild());
+ assertThat(element1.getFirstChild()).isSameAs(element2);
// Assert that the owner document of element2 was changed
- assertSame(document1, element2.getOwnerDocument());
+ assertThat(element2.getOwnerDocument()).isSameAs(document1);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestCloneNodeBinary.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestCloneNodeBinary.java
index c3a9787e3..d50e25cb5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestCloneNodeBinary.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestCloneNodeBinary.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.omdom.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.blob.Blob;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.testutils.blob.RandomBlob;
@@ -31,7 +33,7 @@ public class TestCloneNodeBinary extends OMDOMTestCase {
Blob blob = new RandomBlob(666L, 1000);
Text text = (Text) factory.createOMText(blob, false);
String base64 = text.getData();
- assertTrue(base64.length() > 0);
- assertEquals(base64, ((Text) text.cloneNode(true)).getData());
+ assertThat(base64).isNotEmpty();
+ assertThat(((Text) text.cloneNode(true)).getData()).isEqualTo(base64);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java
index a19a0a09a..e47a9d280 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMMetaFactorySPI;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -25,7 +27,6 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.testing.multiton.AdapterType;
-import org.junit.Assert;
import org.xml.sax.InputSource;
/**
@@ -52,9 +53,8 @@ public final class SOAPSampleAdapter {
public SOAPEnvelope getSOAPEnvelope(OMMetaFactory metaFactory) {
SOAPEnvelope envelope = getBuilder(metaFactory).getSOAPEnvelope();
// TODO: this is not the right place to assert this
- Assert.assertSame(
- sample.getSOAPSpec().getEnvelopeNamespaceURI(),
- ((SOAPFactory) envelope.getOMFactory()).getSoapVersionURI());
+ assertThat(((SOAPFactory) envelope.getOMFactory()).getSoapVersionURI())
+ .isSameAs(sample.getSOAPSpec().getEnvelopeNamespaceURI());
return envelope;
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java
index 6b1f939b6..99daf26ca 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -34,8 +36,6 @@ public class TestAddFault1 extends TestCase {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
SOAPBody body = soapFactory.createSOAPBody(envelope);
body.addFault(new Exception("This an exception for testing"));
- assertTrue(
- "Body Test:- After calling addFault method, SOAP body has no fault",
- body.hasFault());
+ assertThat(body.hasFault()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java
index e13ba9324..6090944f0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -34,8 +36,6 @@ public class TestAddFault2 extends TestCase {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
SOAPBody body = soapFactory.createSOAPBody(envelope);
body.addFault(soapFactory.createSOAPFault());
- assertTrue(
- "Body Test:- After calling addFault method, SOAP body has no fault",
- body.hasFault());
+ assertThat(body.hasFault()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
index f645aeb44..b273a4f73 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.soap.body;
import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -44,8 +45,8 @@ public class TestCloneOMElement extends SampleBasedSOAPTestCase {
OMElement secondClonedBodyElement = body.cloneOMElement();
// cloneOMElement creates plain OMElements
- assertFalse(firstClonedBodyElement instanceof SOAPBody);
- assertFalse(secondClonedBodyElement instanceof SOAPBody);
+ assertThat(firstClonedBodyElement).isNotInstanceOf(SOAPBody.class);
+ assertThat(secondClonedBodyElement).isNotInstanceOf(SOAPBody.class);
// first check whether both have the same information
assertAbout(xml())
@@ -61,8 +62,8 @@ public class TestCloneOMElement extends SampleBasedSOAPTestCase {
.hasSameContentAs(xml(OMElement.class, firstClonedBodyElement));
// The clone is expected to be orphaned
- assertNull(firstClonedBodyElement.getParent());
- assertNull(secondClonedBodyElement.getParent());
+ assertThat(firstClonedBodyElement.getParent()).isNull();
+ assertThat(secondClonedBodyElement.getParent()).isNull();
envelope.close(false);
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
index 0c150b6f0..87aeaf3d5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -33,10 +35,8 @@ public class TestGetFault extends TestCase {
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
SOAPBody body = soapFactory.createSOAPBody(envelope);
- assertNull("Body Test:- After creating a soap body it has a fault", body.getFault());
+ assertThat(body.getFault()).isNull();
body.addFault(new Exception("This an exception for testing"));
- assertNotNull(
- "Body Test:- After calling addFault method, getFault method returns null",
- body.getFault());
+ assertThat(body.getFault()).isNotNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
index f15ac0bab..79d5d7298 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPFactory;
@@ -38,6 +40,6 @@ public class TestGetFaultFakeFault extends TestCase {
protected void runTest() throws Throwable {
SOAPBody body = soapFactory.getDefaultEnvelope().getBody();
soapFactory.createOMElement("Fault", soapFactory.getNamespace(), body);
- assertNull(body.getFault());
+ assertThat(body.getFault()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
index dc4ef9193..9f84a675d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.soap.SOAPBody;
@@ -37,6 +39,6 @@ public class TestGetFaultNoFault extends TestCase {
body.addChild(
soapFactory.createOMElement(
qname.getLocalPart(), qname.getNamespaceURI(), qname.getPrefix()));
- assertNull(body.getFault());
+ assertThat(body.getFault()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
index 82fd99708..4c43dfecb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -36,10 +38,7 @@ public class TestGetFaultWithParser extends SampleBasedSOAPTestCase {
@Override
protected void runTest(SOAPEnvelope envelope) throws Throwable {
SOAPBody body = envelope.getBody();
- assertNotNull("Body Test With parser :- getFault method returns null", body.getFault());
- assertEquals(
- "Body Test With parser : - SOAP fault name mismatch",
- SOAPConstants.SOAPFAULT_LOCAL_NAME,
- body.getFault().getLocalName());
+ assertThat(body.getFault()).isNotNull();
+ assertThat(body.getFault().getLocalName()).isEqualTo(SOAPConstants.SOAPFAULT_LOCAL_NAME);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParserNoFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParserNoFault.java
index 984f1b1cc..4027a424a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParserNoFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParserNoFault.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.inject.Inject;
import javax.xml.namespace.QName;
@@ -33,6 +35,6 @@ public class TestGetFaultWithParserNoFault extends FirstElementNameWithParserTes
@Override
protected void runTest(SOAPBody body) throws Throwable {
- assertNull(body.getFault());
+ assertThat(body.getFault()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java
index 6b2f15af8..6f66b017a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -36,6 +38,6 @@ public class TestGetFirstElementLocalNameEmptyBody extends TestCase {
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
- assertNull(envelope.getBody().getFirstElementLocalName());
+ assertThat(envelope.getBody().getFirstElementLocalName()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser.java
index 6ee5066ec..2007a3314 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.inject.Inject;
import javax.xml.namespace.QName;
@@ -36,6 +38,6 @@ public class TestGetFirstElementLocalNameWithParser extends FirstElementNameWith
@Override
protected void runTest(SOAPBody body) throws Throwable {
- assertEquals(qname.getLocalPart(), body.getFirstElementLocalName());
+ assertThat(body.getFirstElementLocalName()).isEqualTo(qname.getLocalPart());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java
index 26fea3f1b..f7d38386c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -35,6 +37,6 @@ public class TestGetFirstElementNSEmptyBody extends TestCase {
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
- assertNull(envelope.getBody().getFirstElementNS());
+ assertThat(envelope.getBody().getFirstElementNS()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSWithParser.java
index 5e736fb90..e82675da1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.inject.Inject;
import javax.xml.namespace.QName;
@@ -39,10 +41,10 @@ public class TestGetFirstElementNSWithParser extends FirstElementNameWithParserT
protected void runTest(SOAPBody body) throws Throwable {
OMNamespace ns = body.getFirstElementNS();
if (qname.getNamespaceURI().length() == 0) {
- assertNull(ns);
+ assertThat(ns).isNull();
} else {
- assertEquals(qname.getNamespaceURI(), ns.getNamespaceURI());
- assertEquals(qname.getPrefix(), ns.getPrefix());
+ assertThat(ns.getNamespaceURI()).isEqualTo(qname.getNamespaceURI());
+ assertThat(ns.getPrefix()).isEqualTo(qname.getPrefix());
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java
index 16e29acc6..696d45159 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -33,10 +35,8 @@ public class TestHasFault extends TestCase {
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
SOAPBody body = soapFactory.createSOAPBody(envelope);
- assertFalse("Body Test:- After creating a soap body it has a fault", body.hasFault());
+ assertThat(body.hasFault()).isFalse();
body.addFault(new Exception("This an exception for testing"));
- assertTrue(
- "Body Test:- After calling addFault method, hasFault method returns false",
- body.hasFault());
+ assertThat(body.hasFault()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java
index 2ad1e29ea..187537ba9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPFactory;
@@ -39,9 +41,9 @@ public class TestHasFaultAfterReplace extends TestCase {
@Override
protected void runTest() throws Throwable {
SOAPBody body = soapFactory.getDefaultFaultEnvelope().getBody();
- assertTrue(body.hasFault());
+ assertThat(body.hasFault()).isTrue();
body.getFault().detach();
soapFactory.createOMElement("echo", soapFactory.createOMNamespace("urn:test", "echo"));
- assertFalse(body.hasFault());
+ assertThat(body.hasFault()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
index 69d8e6836..775d502d5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPFactory;
@@ -38,6 +40,6 @@ public class TestHasFaultFakeFault extends TestCase {
protected void runTest() throws Throwable {
SOAPBody body = soapFactory.getDefaultEnvelope().getBody();
soapFactory.createOMElement("Fault", soapFactory.getNamespace(), body);
- assertFalse(body.hasFault());
+ assertThat(body.hasFault()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
index ced595713..a4f3263de 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.soap.SOAPBody;
@@ -37,6 +39,6 @@ public class TestHasFaultNoFault extends TestCase {
body.addChild(
soapFactory.createOMElement(
qname.getLocalPart(), qname.getNamespaceURI(), qname.getPrefix()));
- assertFalse(body.hasFault());
+ assertThat(body.hasFault()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java
index 6860fe5dd..56ac8777b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.ds.StringOMDataSource;
import org.apache.axiom.soap.SOAPBody;
@@ -42,7 +44,7 @@ public class TestHasFaultWithOMSEUnknownName extends TestCase {
OMSourcedElement element =
soapFactory.createOMElement(new StringOMDataSource("<ns:root xmlns:ns='urn:ns'/>"));
body.addChild(element);
- assertFalse(body.hasFault());
- assertFalse(element.isExpanded());
+ assertThat(body.hasFault()).isFalse();
+ assertThat(element.isExpanded()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
index 336081076..08e898484 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -35,6 +37,6 @@ public class TestHasFaultWithParser extends SampleBasedSOAPTestCase {
@Override
protected void runTest(SOAPEnvelope envelope) throws Throwable {
SOAPBody body = envelope.getBody();
- assertTrue("Body Test With parser :- hasFault method returns false", body.hasFault());
+ assertThat(body.hasFault()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParserNoFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParserNoFault.java
index 535b20bb8..655c54fc0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParserNoFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParserNoFault.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.body;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.inject.Inject;
import javax.xml.namespace.QName;
@@ -37,6 +39,6 @@ public class TestHasFaultWithParserNoFault extends FirstElementNameWithParserTes
@Override
protected void runTest(SOAPBody body) throws Throwable {
- assertFalse(body.hasFault());
+ assertThat(body.hasFault()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/OMTestUtils.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/OMTestUtils.java
index 1289f3493..582135d17 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/OMTestUtils.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/OMTestUtils.java
@@ -19,19 +19,19 @@
package org.apache.axiom.ts.soap.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
-import org.junit.Assert;
public class OMTestUtils {
public static void walkThrough(OMElement element) {
- Assert.assertFalse(
- "Expected " + element.getQName() + " to be incomplete", element.isComplete());
+ assertThat(element.isComplete()).isFalse();
for (Iterator<OMAttribute> it = element.getAllAttributes(); it.hasNext(); ) {
- Assert.assertNotNull(it.next());
+ assertThat(it.next()).isNotNull();
}
OMNode child = element.getFirstOMChild();
while (child != null) {
@@ -40,6 +40,6 @@ public class OMTestUtils {
}
child = child.getNextOMSibling();
}
- Assert.assertTrue(element.isComplete());
+ assertThat(element.isComplete()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java
index fa9dcad5e..05824cfca 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.om.OMComment;
@@ -48,6 +50,6 @@ public class TestCommentInEpilog extends TestCase {
soapFactory.getDefaultEnvelope() + "<!--comment-->"))
.getSOAPEnvelope();
OMNode sibling = envelope.getNextOMSibling();
- assertTrue(sibling instanceof OMComment);
+ assertThat(sibling).isInstanceOf(OMComment.class);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
index d2350f2d2..257d3af10 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMComment;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -43,6 +45,6 @@ public class TestCommentInProlog extends TestCase {
.getAdapter(SOAPSampleAdapter.class)
.getSOAPMessage(metaFactory);
OMNode firstChild = message.getFirstOMChild();
- assertTrue(firstChild instanceof OMComment);
+ assertThat(firstChild).isInstanceOf(OMComment.class);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
index 6830c62e4..d8321bed6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.ArrayList;
import org.apache.axiom.blob.MemoryBlob;
@@ -66,11 +68,11 @@ public class TestRegisterCustomBuilder extends TestCase {
new BlobOMDataSourceCustomBuilder(MemoryBlob.FACTORY, "utf-8"));
SOAPHeader header = builder.getSOAPEnvelope().getHeader();
ArrayList al = header.getHeaderBlocksWithNSURI("http://www.w3.org/2005/08/addressing");
- assertEquals(al.size(), 4);
+ assertThat(al.size()).isEqualTo(4);
for (int i = 0; i < al.size(); i++) {
SOAPHeaderBlock shb = (SOAPHeaderBlock) al.get(i);
if ("To".equals(shb.getLocalName())) {
- assertNotNull(shb.getDataSource());
+ assertThat(shb.getDataSource()).isNotNull();
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
index 7b8ac0792..c301c33ed 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.builder;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.blob.MemoryBlob;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMSourcedElement;
@@ -63,6 +65,6 @@ public class TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck
new BlobOMDataSourceCustomBuilder(MemoryBlob.FACTORY, "utf-8"));
OMElement bodyElement = envelope.getBody().getFirstElement();
- assertTrue(bodyElement instanceof OMSourcedElement);
+ assertThat(bodyElement).isInstanceOf(OMSourcedElement.class);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
index b1742903f..fb581f565 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.soap.envelope;
import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
import org.apache.axiom.om.OMElement;
@@ -72,13 +73,9 @@ public abstract class CloneTestCase extends TestCase {
if (source instanceof OMElement element) {
if (element instanceof OMSourcedElement sourcedElement) {
- assertTrue(
- "Source = "
- + element.getClass().getName()
- + "Target = "
- + target.getClass().getName(),
- target instanceof OMSourcedElement);
- assertEquals(sourcedElement.isExpanded(), ((OMSourcedElement) target).isExpanded());
+ assertThat(target).isInstanceOf(OMSourcedElement.class);
+ assertThat(((OMSourcedElement) target).isExpanded())
+ .isEqualTo(sourcedElement.isExpanded());
if (sourcedElement.isExpanded()) {
Iterator<OMNode> i = element.getChildren();
Iterator<OMNode> j = ((OMElement) target).getChildren();
@@ -87,13 +84,10 @@ public abstract class CloneTestCase extends TestCase {
OMNode targetChild = j.next();
identityCheck(sourceChild, targetChild, depth + " ");
}
- assertEquals(
- "Source and Target have different number of children",
- i.hasNext(),
- j.hasNext());
+ assertThat(j.hasNext()).isEqualTo(i.hasNext());
}
} else {
- assertEquals(element.getClass(), target.getClass());
+ assertThat(target.getClass()).isEqualTo(element.getClass());
Iterator<OMNode> i = element.getChildren();
Iterator<OMNode> j = ((OMElement) target).getChildren();
while (i.hasNext() && j.hasNext()) {
@@ -101,13 +95,10 @@ public abstract class CloneTestCase extends TestCase {
OMNode targetChild = j.next();
identityCheck(sourceChild, targetChild, depth + " ");
}
- assertEquals(
- "Source and Target have different number of children",
- i.hasNext(),
- j.hasNext());
+ assertThat(j.hasNext()).isEqualTo(i.hasNext());
}
} else {
- assertEquals(source.getClass(), target.getClass());
+ assertThat(target.getClass()).isEqualTo(source.getClass());
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java
index 3e166f457..1352bc5f4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
@@ -41,8 +43,8 @@ public class TestAddHeaderToIncompleteEnvelope extends SampleBasedSOAPTestCase {
@Override
protected void runTest(SOAPEnvelope envelope) throws Throwable {
- assertNull(envelope.getHeader());
+ assertThat(envelope.getHeader()).isNull();
SOAPHeader header = soapFactory.createSOAPHeader(envelope);
- assertSame(header, envelope.getHeader());
+ assertThat(envelope.getHeader()).isSameAs(header);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java
index f55c4972e..5929edf5a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
@@ -35,6 +37,6 @@ public class TestBodyHeaderOrder extends TestCase {
SOAPEnvelope env = soapFactory.createSOAPEnvelope();
soapFactory.createSOAPBody(env);
soapFactory.createSOAPHeader(env);
- assertTrue("Header isn't the first child!", env.getFirstElement() instanceof SOAPHeader);
+ assertThat(env.getFirstElement()).isInstanceOf(SOAPHeader.class);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement1.java
index b513f384c..c4b1918c0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMSourcedElement;
@@ -50,6 +52,6 @@ public class TestCloneWithSourcedElement1 extends CloneTestCase {
OMSourcedElement omse = body.getOMFactory().createOMElement(bads, "payload", ns);
body.addChild(omse);
copyAndCheck(sourceEnv);
- assertFalse(omse.isExpanded());
+ assertThat(omse.isExpanded()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement2.java
index c4505e0cb..9c560dd91 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMSourcedElement;
@@ -66,6 +68,6 @@ public class TestCloneWithSourcedElement2 extends CloneTestCase {
copyAndCheck(sourceEnv);
// The source SOAPHeaderBlock should not be expanded in the process
- assertFalse(shb.isExpanded());
+ assertThat(shb.isExpanded()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
index 4d993673f..332741e84 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -42,9 +44,9 @@ public class TestDetach extends SampleBasedSOAPTestCase {
protected void runTest(SOAPEnvelope envelope) throws Throwable {
OMDocument document = (OMDocument) envelope.getParent();
envelope.detach();
- assertNull(envelope.getParent());
- assertNull(envelope.getPreviousOMSibling());
- assertNull(envelope.getNextOMSibling());
- assertNull(document.getOMDocumentElement());
+ assertThat(envelope.getParent()).isNull();
+ assertThat(envelope.getPreviousOMSibling()).isNull();
+ assertThat(envelope.getNextOMSibling()).isNull();
+ assertThat(document.getOMDocumentElement()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
index 3403c8eff..0fe3c7369 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -36,13 +38,7 @@ public class TestGetBody extends TestCase {
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
SOAPBody body = envelope.getBody();
- assertEquals(
- "Body Test : - Body local name mismatch",
- SOAPConstants.BODY_LOCAL_NAME,
- body.getLocalName());
- assertEquals(
- "Body Test : - Body namespace mismatch",
- spec.getEnvelopeNamespaceURI(),
- body.getNamespace().getNamespaceURI());
+ assertThat(body.getLocalName()).isEqualTo(SOAPConstants.BODY_LOCAL_NAME);
+ assertThat(body.getNamespace().getNamespaceURI()).isEqualTo(spec.getEnvelopeNamespaceURI());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java
index 8f9593cdd..513532ad7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPFactory;
import com.google.inject.Inject;
@@ -29,6 +31,6 @@ public class TestGetBodyOnEmptyEnvelope extends TestCase {
@Override
protected void runTest() throws Throwable {
- assertNull(soapFactory.createSOAPEnvelope().getBody());
+ assertThat(soapFactory.createSOAPEnvelope().getBody()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java
index 6f30dc264..952920028 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -33,6 +35,6 @@ public class TestGetBodyOnEnvelopeWithHeaderOnly extends TestCase {
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
soapFactory.createSOAPHeader(envelope);
- assertNull(envelope.getBody());
+ assertThat(envelope.getBody()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
index 60f4f2028..16d3187f1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -36,13 +38,7 @@ public class TestGetBodyWithParser extends SampleBasedSOAPTestCase {
@Override
protected void runTest(SOAPEnvelope envelope) throws Throwable {
SOAPBody body = envelope.getBody();
- assertEquals(
- "Body Test : - Body local name mismatch",
- SOAPConstants.BODY_LOCAL_NAME,
- body.getLocalName());
- assertEquals(
- "Body Test : - Body namespace mismatch",
- spec.getEnvelopeNamespaceURI(),
- body.getNamespace().getNamespaceURI());
+ assertThat(body.getLocalName()).isEqualTo(SOAPConstants.BODY_LOCAL_NAME);
+ assertThat(body.getNamespace().getNamespaceURI()).isEqualTo(spec.getEnvelopeNamespaceURI());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
index 6cac98046..0759dd2f8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -36,13 +38,8 @@ public class TestGetHeader extends TestCase {
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
SOAPHeader header = envelope.getHeader();
- assertEquals(
- "Header Test : - Header local name mismatch",
- SOAPConstants.HEADER_LOCAL_NAME,
- header.getLocalName());
- assertEquals(
- "Header Test : - Header namespace mismatch",
- spec.getEnvelopeNamespaceURI(),
- header.getNamespace().getNamespaceURI());
+ assertThat(header.getLocalName()).isEqualTo(SOAPConstants.HEADER_LOCAL_NAME);
+ assertThat(header.getNamespace().getNamespaceURI())
+ .isEqualTo(spec.getEnvelopeNamespaceURI());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
index 4e7266f28..fc4d1b9e0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeader;
@@ -36,13 +38,8 @@ public class TestGetHeaderWithParser extends SampleBasedSOAPTestCase {
@Override
protected void runTest(SOAPEnvelope envelope) throws Throwable {
SOAPHeader header = envelope.getHeader();
- assertEquals(
- "Header Test : - Header local name mismatch",
- SOAPConstants.HEADER_LOCAL_NAME,
- header.getLocalName());
- assertEquals(
- "Header Test : - Header namespace mismatch",
- spec.getEnvelopeNamespaceURI(),
- header.getNamespace().getNamespaceURI());
+ assertThat(header.getLocalName()).isEqualTo(SOAPConstants.HEADER_LOCAL_NAME);
+ assertThat(header.getNamespace().getNamespaceURI())
+ .isEqualTo(spec.getEnvelopeNamespaceURI());
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
index 211093b1f..4e7309900 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -38,7 +40,7 @@ public class TestGetHeaderWithParserNoHeader extends SampleBasedSOAPTestCase {
@Override
protected void runTest(SOAPEnvelope envelope) throws Throwable {
- assertNull(envelope.getHeader());
- assertFalse(envelope.getBody().isComplete());
+ assertThat(envelope.getHeader()).isNull();
+ assertThat(envelope.getBody().isComplete()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java
index 9b99abd76..f3ae9041c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
@@ -33,6 +35,6 @@ public class TestGetOrCreateHeader extends TestCase {
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
SOAPHeader header = (SOAPHeader) envelope.getFirstOMChild();
- assertSame(header, envelope.getOrCreateHeader());
+ assertThat(envelope.getOrCreateHeader()).isSameAs(header);
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
index 1fa6b2f5f..01b63b540 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeader;
@@ -41,8 +43,8 @@ public class TestGetOrCreateHeaderWithParserNoHeader extends SampleBasedSOAPTest
@Override
protected void runTest(SOAPEnvelope envelope) throws Throwable {
SOAPHeader header = envelope.getOrCreateHeader();
- assertNotNull(header);
- assertSame(envelope.getFirstElement(), header);
- assertFalse(envelope.getBody().isComplete());
+ assertThat(header).isNotNull();
+ assertThat(header).isSameAs(envelope.getFirstElement());
+ assertThat(envelope.getBody().isComplete()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
index 923bbd98b..892ee8f9d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -40,13 +42,13 @@ public class TestGetSOAPBodyFirstElementLocalNameAndNS extends TestCase {
soapFactory.createOMElement(
qname.getLocalPart(), qname.getNamespaceURI(), qname.getPrefix());
envelope.getBody().addChild(bodyElement);
- assertEquals(qname.getLocalPart(), envelope.getSOAPBodyFirstElementLocalName());
+ assertThat(envelope.getSOAPBodyFirstElementLocalName()).isEqualTo(qname.getLocalPart());
OMNamespace ns = envelope.getSOAPBodyFirstElementNS();
if (qname.getNamespaceURI().length() == 0) {
- assertNull(ns);
+ assertThat(ns).isNull();
} else {
- assertEquals(qname.getNamespaceURI(), ns.getNamespaceURI());
- assertEquals(qname.getPrefix(), ns.getPrefix());
+ assertThat(ns.getNamespaceURI()).isEqualTo(qname.getNamespaceURI());
+ assertThat(ns.getPrefix()).isEqualTo(qname.getPrefix());
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
index 798972184..a8667d450 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.namespace.QName;
@@ -60,35 +62,35 @@ public class TestGetSOAPBodyFirstElementLocalNameAndNSWithParser extends TestCas
SOAPEnvelope envelope =
OMXMLBuilderFactory.createSOAPModelBuilder(metaFactory, new StringReader(message))
.getSOAPEnvelope();
- assertEquals(qname.getLocalPart(), envelope.getSOAPBodyFirstElementLocalName());
+ assertThat(envelope.getSOAPBodyFirstElementLocalName()).isEqualTo(qname.getLocalPart());
OMNamespace ns = envelope.getSOAPBodyFirstElementNS();
if (qname.getNamespaceURI().length() == 0) {
- assertNull(ns);
+ assertThat(ns).isNull();
} else {
- assertEquals(qname.getNamespaceURI(), ns.getNamespaceURI());
- assertEquals(qname.getPrefix(), ns.getPrefix());
+ assertThat(ns.getNamespaceURI()).isEqualTo(qname.getNamespaceURI());
+ assertThat(ns.getPrefix()).isEqualTo(qname.getPrefix());
}
// Also request an XMLStreamReader. The LLOM implementation triggers some special processing
// in this case (because the getSOAPBodyFirstElementXXX calls put the builder in lookahead
// mode). This is a regression test for r631687 (AXIOM-282).
XMLStreamReader reader = envelope.getXMLStreamReader(false);
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals("Envelope", reader.getLocalName());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals("Body", reader.getLocalName());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals(qname.getLocalPart(), reader.getLocalName());
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(reader.getLocalName()).isEqualTo("Envelope");
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(reader.getLocalName()).isEqualTo("Body");
+ assertThat(reader.next()).isEqualTo(XMLStreamReader.START_ELEMENT);
+ assertThat(reader.getLocalName()).isEqualTo(qname.getLocalPart());
if (qname.getNamespaceURI().length() == 0) {
- assertNull(reader.getNamespaceURI());
+ assertThat(reader.getNamespaceURI()).isNull();
} else {
- assertEquals(qname.getNamespaceURI(), reader.getNamespaceURI());
+ assertThat(reader.getNamespaceURI()).isEqualTo(qname.getNamespaceURI());
}
String readerPrefix = reader.getPrefix();
if (qname.getPrefix().length() == 0) {
- assertTrue(readerPrefix == null || readerPrefix.isEmpty());
+ assertThat(readerPrefix).isNullOrEmpty();
} else {
- assertEquals(qname.getPrefix(), readerPrefix);
+ assertThat(readerPrefix).isEqualTo(qname.getPrefix());
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
index c3dfade03..426565a59 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
@@ -56,11 +58,11 @@ public class TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock
new QName(
"http://www.w3.org/2005/08/addressing", "ReplyTo"));
headerBlock.getFirstElement().getFirstOMChild();
- assertFalse(headerBlock.isComplete());
+ assertThat(headerBlock.isComplete()).isFalse();
XMLStreamReader reader = envelope.getXMLStreamReaderWithoutCaching();
while (reader.hasNext()) {
reader.next();
}
- assertFalse(headerBlock.isComplete());
+ assertThat(headerBlock.isComplete()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java
index b1934bea3..82d85d9f8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -32,10 +34,10 @@ public class TestHasFault extends TestCase {
@Override
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
- assertFalse(envelope.hasFault());
+ assertThat(envelope.hasFault()).isFalse();
SOAPBody body = soapFactory.createSOAPBody(envelope);
- assertFalse(envelope.hasFault());
+ assertThat(envelope.hasFault()).isFalse();
body.addFault(new Exception("This an exception for testing"));
- assertTrue(envelope.hasFault());
+ assertThat(envelope.hasFault()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
index 0d066af6e..5c5fb3030 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.soap.SOAPSpec;
@@ -33,6 +35,6 @@ public class TestHasFaultWithParser extends SampleBasedSOAPTestCase {
@Override
protected void runTest(SOAPEnvelope envelope) throws Throwable {
- assertTrue(envelope.hasFault());
+ assertThat(envelope.hasFault()).isTrue();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
index 38866af28..a6c69032f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
@@ -20,6 +20,7 @@ package org.apache.axiom.ts.soap.factory;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -53,21 +54,21 @@ public abstract class CreateSOAPElementWithoutParentTestCase extends TestCase {
? ""
: SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX;
OMElement element = createSOAPElement();
- assertTrue(element.isComplete());
+ assertThat(element.isComplete()).isTrue();
QName actualName = element.getQName();
- assertEquals(expectedName, actualName);
- assertEquals(expectedPrefix, actualName.getPrefix());
- assertNull(element.getParent());
+ assertThat(actualName).isEqualTo(expectedName);
+ assertThat(actualName.getPrefix()).isEqualTo(expectedPrefix);
+ assertThat(element.getParent()).isNull();
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
if (expectedPrefix.length() != 0) {
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNamespace ns = it.next();
- assertEquals(expectedName.getNamespaceURI(), ns.getNamespaceURI());
- assertEquals(expectedPrefix, ns.getPrefix());
+ assertThat(ns.getNamespaceURI()).isEqualTo(expectedName.getNamespaceURI());
+ assertThat(ns.getPrefix()).isEqualTo(expectedPrefix);
}
- assertFalse(it.hasNext());
- assertFalse(element.getAllAttributes().hasNext());
- assertNull(element.getFirstOMChild());
+ assertThat(it.hasNext()).isFalse();
+ assertThat(element.getAllAttributes().hasNext()).isFalse();
+ assertThat(element.getFirstOMChild()).isNull();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java
index 6d2eec2f7..fa65586a3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMNode;
@@ -43,19 +45,19 @@ public class TestCreateDefaultSOAPMessage extends TestCase {
protected void runTest() throws Throwable {
SOAPMessage message = soapFactory.createDefaultSOAPMessage();
SOAPEnvelope env = message.getSOAPEnvelope();
- assertNotNull(env);
- assertSame(env, message.getFirstOMChild());
- assertNull(env.getNextOMSibling());
+ assertThat(env).isNotNull();
+ assertThat(message.getFirstOMChild()).isSameAs(env);
+ assertThat(env.getNextOMSibling()).isNull();
// Check correct SOAP version
- assertEquals(spec.getEnvelopeNamespaceURI(), env.getNamespaceURI());
+ assertThat(env.getNamespaceURI()).isEqualTo(spec.getEnvelopeNamespaceURI());
// Check the children
Iterator<OMNode> it = env.getChildren();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNode child = it.next();
- assertTrue(child instanceof SOAPBody);
- assertNull(((SOAPBody) child).getFirstOMChild());
- assertFalse(it.hasNext());
+ assertThat(child).isInstanceOf(SOAPBody.class);
+ assertThat(((SOAPBody) child).getFirstOMChild()).isNull();
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
index 59637973f..ac6e646b0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
@@ -20,6 +20,7 @@ package org.apache.axiom.ts.soap.factory;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -83,17 +84,17 @@ public class TestCreateSOAPElementWithParent extends TestCase {
OMElement child =
type.getAdapter(SOAPElementTypeAdapter.class)
.create(soapFactory, parentType, parent);
- assertTrue(child.isComplete());
+ assertThat(child.isComplete()).isTrue();
QName actualName = child.getQName();
- assertEquals(expectedName, actualName);
- assertEquals(expectedPrefix, actualName.getPrefix());
- assertSame(parent, child.getParent());
- assertSame(child, parent.getFirstOMChild());
- assertNull(child.getNextOMSibling());
+ assertThat(actualName).isEqualTo(expectedName);
+ assertThat(actualName.getPrefix()).isEqualTo(expectedPrefix);
+ assertThat(child.getParent()).isSameAs(parent);
+ assertThat(parent.getFirstOMChild()).isSameAs(child);
+ assertThat(child.getNextOMSibling()).isNull();
// All relevant namespaces have already been declared on the parent
- assertFalse(child.getAllDeclaredNamespaces().hasNext());
- assertFalse(child.getAllAttributes().hasNext());
- assertNull(child.getFirstOMChild());
+ assertThat(child.getAllDeclaredNamespaces().hasNext()).isFalse();
+ assertThat(child.getAllAttributes().hasNext()).isFalse();
+ assertThat(child.getFirstOMChild()).isNull();
}
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java
index 0f4c7529a..b89e686b8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMNamespace;
@@ -40,12 +42,12 @@ public class TestCreateSOAPEnvelopeWithCustomPrefix extends TestCase {
String prefix = "my-soap";
OMNamespace ns = soapFactory.createOMNamespace(spec.getEnvelopeNamespaceURI(), prefix);
SOAPEnvelope env = soapFactory.createSOAPEnvelope(ns);
- assertEquals(prefix, env.getNamespace().getPrefix());
- assertEquals(spec.getEnvelopeNamespaceURI(), env.getNamespace().getNamespaceURI());
- assertEquals(SOAPConstants.SOAPENVELOPE_LOCAL_NAME, env.getLocalName());
+ assertThat(env.getNamespace().getPrefix()).isEqualTo(prefix);
+ assertThat(env.getNamespace().getNamespaceURI()).isEqualTo(spec.getEnvelopeNamespaceURI());
+ assertThat(env.getLocalName()).isEqualTo(SOAPConstants.SOAPENVELOPE_LOCAL_NAME);
Iterator<OMNamespace> it = env.getAllDeclaredNamespaces();
- assertTrue(it.hasNext());
- assertEquals(ns, it.next());
- assertFalse(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
+ assertThat(it.next()).isEqualTo(ns);
+ assertThat(it.hasNext()).isFalse();
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java
index 488668cda..ce05ee280 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.ts.soap.FactorySelector;
import org.apache.axiom.ts.soap.SOAPSpec;
@@ -38,7 +40,7 @@ public class TestFactoryIsSingleton extends TestCase {
@Override
protected void runTest() throws Throwable {
FactorySelector factorySelector = spec.getAdapter(FactorySelector.class);
- assertSame(
- factorySelector.getFactory(metaFactory), factorySelector.getFactory(metaFactory));
+ assertThat(factorySelector.getFactory(metaFactory))
+ .isSameAs(factorySelector.getFactory(metaFactory));
}
}
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java
index 2a7d61f1e..aba4b20e8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.factory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Iterator;
import org.apache.axiom.om.OMNode;
@@ -41,20 +43,20 @@ public class TestGetDefaultEnvelope extends TestCase {
SOAPEnvelope env = soapFactory.getDefaultEnvelope();
// Check correct SOAP version
- assertEquals(spec.getEnvelopeNamespaceURI(), env.getNamespaceURI());
+ assertThat(env.getNamespaceURI()).isEqualTo(spec.getEnvelopeNamespaceURI());
// getDefaultEnvelope doesn't create a SOAPMessage/OMDocument
- assertNull(env.getParent());
+ assertThat(env.getParent()).isNull();
// Check the children
Iterator<OMNode> it = env.getChildren();
- assertTrue(it.hasNext());
+ assertThat(it.hasNext()).isTrue();
OMNode child = it.next();
- assertTrue(child instanceof SOAPHeader);
- assertNull(((SOAPHeader) child).getFirstOMChild());
+ assertThat(child).isInstanceOf(SOAPHeader.class);
+ assertThat(((SOAPHeader) child).getFirstOMChild()).isNull();
child = it.next();
- assertTrue(child instanceof SOAPBody);
- assertNull(((SOAPBody) child).getFirstOMChild());
- assertFalse(it.hasNext());
+ assertThat(child).isInstanceOf(SOAPBody.class);
+ assertThat(((SOAPBody) child).getFirstOMChild()).isNull();
... 3076 lines suppressed ...