Skip to content

Commit

Permalink
do not use obsolete class for assertions
Browse files Browse the repository at this point in the history
  • Loading branch information
unixoid committed Oct 25, 2014
1 parent cde6264 commit 625e5ae
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import org.junit.*
import org.openehealth.ipf.commons.ihe.hl7v2.definitions.CustomModelClassUtils
import org.openehealth.ipf.modules.hl7dsl.MessageAdapter
import org.openehealth.ipf.modules.hl7dsl.MessageAdapters
import static junit.framework.Assert.assertTrue
import static org.junit.Assert.assertTrue
import static org.openehealth.ipf.commons.ihe.core.IpfInteractionId.ITI_44_PIX

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package org.openehealth.ipf.commons.ihe.ws.utils;

import org.junit.Assert;

import javax.activation.DataSource;
import java.io.InputStream;
import java.io.IOException;
Expand Down Expand Up @@ -45,7 +47,7 @@ public int read() throws IOException {

@Override
public void close() throws IOException {
junit.framework.Assert.assertEquals(STREAM_SIZE, idx);
Assert.assertEquals(STREAM_SIZE, idx);
super.close();
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit
import java.util.concurrent.LinkedBlockingQueue
import java.security.AccessController
import javax.security.auth.SubjectDomainCombiner
import static junit.framework.Assert.assertNotNull
import static org.junit.Assert.assertNotNull

class MultiplastRouteBuilder extends SpringRouteBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import javax.security.auth.Subject
import java.security.AccessController
import javax.security.auth.SubjectDomainCombiner

import static junit.framework.Assert.assertTrue
import static org.junit.Assert.assertTrue
import java.security.PrivilegedAction

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.openehealth.ipf.platform.camel.core.adapter;

import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertEquals;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.openehealth.ipf.platform.camel.core.adapter;

import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertEquals;

import java.io.ByteArrayInputStream;
import java.io.StringReader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.openehealth.ipf.platform.camel.core.adapter;

import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertEquals;

import org.apache.camel.ExchangePattern;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package org.openehealth.ipf.platform.camel.core.adapter;

import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import java.util.ArrayList;
import java.util.List;

import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertEquals;


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.openehealth.ipf.platform.camel.ihe.mllp.iti8

import static junit.framework.Assert.*
import static org.junit.Assert.*
import static org.openehealth.ipf.platform.camel.ihe.hl7v2.Hl7v2MarshalUtils.typeSupported
import static org.openehealth.ipf.platform.camel.core.util.Exchanges.resultMessage

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.openehealth.ipf.platform.camel.ihe.xds.iti17

import static junit.framework.Assert.assertEquals
import static org.junit.Assert.assertEquals

import org.apache.commons.io.IOUtils
import org.junit.BeforeClass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import org.openehealth.ipf.commons.ihe.xds.core.SampleData;
import org.openehealth.ipf.commons.ihe.xds.core.requests.ProvideAndRegisterDocumentSet;

import static junit.framework.Assert.assertTrue;
import static junit.framework.TestCase.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;

public class XdsRenderingUtilsTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import org.openehealth.ipf.commons.ihe.xds.core.responses.Response
import org.openehealth.ipf.commons.ihe.xds.core.responses.RetrievedDocumentSet
import org.openehealth.ipf.commons.ihe.xds.core.responses.Status
import org.openehealth.ipf.platform.camel.ihe.ws.StandardTestContainer
import static junit.framework.Assert.assertEquals
import static org.junit.Assert.assertEquals
import javax.activation.DataHandler
import org.openehealth.ipf.commons.ihe.xds.core.requests.query.QueryReturnType

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ import org.openehealth.ipf.commons.ihe.xds.core.responses.QueryResponse
import org.openehealth.ipf.commons.ihe.xds.core.responses.Response
import org.openehealth.ipf.commons.ihe.xds.core.responses.RetrievedDocumentSet
import org.openehealth.ipf.platform.camel.ihe.ws.StandardTestContainer
import org.openehealth.ipf.tutorials.xds.Task
import static junit.framework.Assert.assertEquals
import static org.junit.Assert.assertEquals
import static org.openehealth.ipf.commons.ihe.xds.core.metadata.AvailabilityStatus.APPROVED
import static org.openehealth.ipf.commons.ihe.xds.core.responses.Status.SUCCESS

Expand Down

0 comments on commit 625e5ae

Please sign in to comment.