Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/CustomIDGeneratorTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/QuickStartTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java34
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicPackageTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java86
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252214_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258850_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_280102_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest2.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_296561_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractCDORevisionCacheTest.java20
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java4
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java4
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java6
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java12
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java27
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java4
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java34
64 files changed, 323 insertions, 300 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java
index 417de5ffff..834e8811c8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java
@@ -300,7 +300,7 @@ public class GMFTest extends AbstractCDOTest
Edge edge = (Edge)o;
RelativeBendpoints bendpoints = (RelativeBendpoints)edge.getBendpoints();
assertNotNull(bendpoints);
- assertTrue(bendpoints.getPoints().size() > 0);
+ assertEquals(true, bendpoints.getPoints().size() > 0);
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardTest.java
index b6ebb9b615..69e484014f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardTest.java
@@ -296,7 +296,7 @@ public class DawnCreationWizardTest extends AbstractCDOTest
assertEquals("cdo://repo1/folder/default.acore", dawnDomainModelFilePage.getURI().toString());
boolean performFinish = creationWizard.performFinish();
- assertTrue(performFinish);
+ assertEquals(true, performFinish);
{
CDOSession session = openSession();
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/CustomIDGeneratorTest.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/CustomIDGeneratorTest.java
index 6a5db4a2b0..76f3807030 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/CustomIDGeneratorTest.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/CustomIDGeneratorTest.java
@@ -28,7 +28,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
* Note this testcase will work with the hibernate mapping created using the latest version of the ecore file. When
* using the generated hbm file then it does not work (as the generated hbm file does not necessarily contain the
* required generator definitions).
- *
+ *
* @author Martin Taal
*/
public class CustomIDGeneratorTest extends BaseTest
@@ -83,7 +83,7 @@ public class CustomIDGeneratorTest extends BaseTest
// and the other uuid has been set
assertNotNull(category2_read.getName());
- assertFalse(uuid.equals(category2_read.getName()));
+ assertEquals(false, uuid.equals(category2_read.getName()));
transaction.commit();
session.close();
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java
index 66149678a3..1e5fb59139 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java
@@ -207,7 +207,7 @@ public class HibernateQueryTest extends BaseTest
found |= od.getProduct() == product;
}
- assertTrue(found);
+ assertEquals(true, found);
}
}
else
@@ -289,13 +289,13 @@ public class HibernateQueryTest extends BaseTest
query.setParameter("vat", VAT.VAT15); //$NON-NLS-1$
for (Object[] values : query.getResult(Object[].class))
{
- assertTrue(values[0] instanceof OrderDetail);
- assertTrue(values[1] instanceof SalesOrder);
- assertTrue(values[2] instanceof VAT);
+ assertEquals(true, values[0] instanceof OrderDetail);
+ assertEquals(true, values[1] instanceof SalesOrder);
+ assertEquals(true, values[2] instanceof VAT);
assertEquals(VAT.VAT15, values[2]);
- assertTrue(values[3] instanceof Float);
+ assertEquals(true, values[3] instanceof Float);
final SalesOrder order = (SalesOrder)values[1];
- assertTrue(order.getOrderDetails().contains(values[0]));
+ assertEquals(true, order.getOrderDetails().contains(values[0]));
}
}
@@ -319,11 +319,11 @@ public class HibernateQueryTest extends BaseTest
// NOTE: firstResult is a special parameter for the hql query language
productQuery.setParameter("firstResult", page * pageSize); //$NON-NLS-1$
final List<Product> queriedProducts = productQuery.getResult(Product.class);
- assertTrue(queriedProducts.size() <= pageSize);
+ assertEquals(true, queriedProducts.size() <= pageSize);
// a product should not have been read yet
for (Product newProduct : queriedProducts)
{
- assertTrue(!allProducts.contains(newProduct));
+ assertEquals(true, !allProducts.contains(newProduct));
}
allProducts.addAll(queriedProducts);
@@ -349,7 +349,7 @@ public class HibernateQueryTest extends BaseTest
{
final Product product = iterator.next();
// meaningless but do something
- assertTrue(product != null);
+ assertEquals(true, product != null);
counter++;
if (counter == NUM_OF_PRODUCTS / 2)
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/QuickStartTest.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/QuickStartTest.java
index 89bbf72fdc..dfb54ca9f5 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/QuickStartTest.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/QuickStartTest.java
@@ -58,7 +58,7 @@ public class QuickStartTest extends BaseTest
final CDOSession session = openSession();
final CDOTransaction transaction = session.openTransaction();
CDOResource resource = transaction.getResource("/res1"); //$NON-NLS-1$
- assertTrue(resource.getContents().get(0) instanceof Address);
+ assertEquals(true, resource.getContents().get(0) instanceof Address);
assertEquals(1, resource.getContents().size());
final Address address = (Address)resource.getContents().get(0);
assertEquals(addressName, address.getName());
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java
index 82e1282927..7f5ed20a7c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java
@@ -409,7 +409,7 @@ public class Net4jDBTest extends AbstractCDOTest
{
Statement stmt = connection.createStatement();
ResultSet resultSet = stmt.executeQuery("SELECT * FROM " + tableName);
- assertTrue(resultSet.next());
+ assertEquals(true, resultSet.next());
ByteArrayOutputStream output = new ByteArrayOutputStream();
ExtendedDataOutputStream outs = new ExtendedDataOutputStream(output);
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
index 3d70eb9b56..66bd930066 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
@@ -124,7 +124,7 @@ public class SQLQueryTest extends AbstractCDOTest
}
else
{
- assertTrue(result instanceof Long);
+ assertEquals(true, result instanceof Long);
intResult = ((Long)result).intValue();
}
@@ -182,11 +182,11 @@ public class SQLQueryTest extends AbstractCDOTest
productQuery.setMaxResults(pageSize);
productQuery.setParameter(SQLQueryHandler.FIRST_RESULT, page * pageSize);
final List<Product1> queriedProducts = productQuery.getResult(Product1.class);
- assertTrue(queriedProducts.size() <= pageSize);
+ assertEquals(true, queriedProducts.size() <= pageSize);
// a product should not have been read yet
for (Product1 newProduct : queriedProducts)
{
- assertTrue(!allProducts.contains(newProduct));
+ assertEquals(true, !allProducts.contains(newProduct));
}
allProducts.addAll(queriedProducts);
@@ -218,7 +218,7 @@ public class SQLQueryTest extends AbstractCDOTest
{
final Product1 product = iterator.next();
// meaningless but do something
- assertTrue(product != null);
+ assertEquals(true, product != null);
counter++;
if (counter == NUM_OF_PRODUCTS / 2)
{
@@ -248,7 +248,7 @@ public class SQLQueryTest extends AbstractCDOTest
List<String> streets = new ArrayList<String>(cdoQuery.getResult(String.class));
for (int i = 0; i < 5; i++)
{
- assertTrue(streets.contains("Street " + i));
+ assertEquals(true, streets.contains("Street " + i));
}
}
}
@@ -269,10 +269,10 @@ public class SQLQueryTest extends AbstractCDOTest
cdoQuery.setParameter("cdoObjectQuery", false);
List<String> cities = new ArrayList<String>(cdoQuery.getResult(String.class));
- assertTrue(cities.contains(null));
+ assertEquals(true, cities.contains(null));
for (int i = 1; i < 5; i++)
{
- assertTrue(cities.contains("City " + i));
+ assertEquals(true, cities.contains("City " + i));
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java
index 089982142e..783a91130a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java
@@ -11,7 +11,6 @@
package org.eclipse.emf.cdo.tests.db.verifier;
import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
import org.eclipse.emf.cdo.common.model.EMFUtil;
import org.eclipse.emf.cdo.server.IRepository;
@@ -60,7 +59,7 @@ public abstract class DBStoreVerifier
this.repository = repository;
if (repository != null)
{
- assertTrue(repository.getStore() instanceof IDBStore);
+ assertEquals(true, repository.getStore() instanceof IDBStore);
}
}
@@ -246,7 +245,7 @@ public abstract class DBStoreVerifier
super(repo);
// this is a verifier for auditing mode
- assertTrue(getStore().getMappingStrategy() instanceof HorizontalAuditMappingStrategy);
+ assertEquals(true, getStore().getMappingStrategy() instanceof HorizontalAuditMappingStrategy);
}
@Override
@@ -282,7 +281,7 @@ public abstract class DBStoreVerifier
{
while (resultSet.next())
{
- assertTrue("Multiple unrevised rows for ID " + resultSet.getLong(1), resultSet.getInt(2) <= 1);
+ assertEquals("Multiple unrevised rows for ID " + resultSet.getLong(1), true, resultSet.getInt(2) <= 1);
}
}
finally
@@ -309,7 +308,7 @@ public abstract class DBStoreVerifier
{
while (resultSet.next())
{
- assertTrue("Multiple rows for ID " + resultSet.getLong(1) + "v" + resultSet.getInt(2),
+ assertEquals("Multiple rows for ID " + resultSet.getLong(1) + "v" + resultSet.getInt(2), true,
resultSet.getInt(3) <= 1);
}
}
@@ -406,9 +405,9 @@ public abstract class DBStoreVerifier
super(repo);
// this is a verifier for non-auditing mode
- assertTrue(getStore().getRevisionTemporality() == IStore.RevisionTemporality.NONE);
+ assertEquals(true, getStore().getRevisionTemporality() == IStore.RevisionTemporality.NONE);
// ... and for horizontal class mapping
- assertTrue(getStore().getMappingStrategy() instanceof HorizontalNonAuditMappingStrategy);
+ assertEquals(true, getStore().getMappingStrategy() instanceof HorizontalNonAuditMappingStrategy);
}
@Override
@@ -440,7 +439,7 @@ public abstract class DBStoreVerifier
ResultSet resultSet = getStatement().executeQuery(sql);
try
{
- assertTrue(resultSet.next());
+ assertEquals(true, resultSet.next());
assertEquals("Revised revision in table " + tableName, 0, resultSet.getInt(1));
}
finally
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
index 3059ee7469..a6c29f0a80 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
@@ -315,8 +315,8 @@ public class AllTestsHibernate extends AllConfigs
}
catch (Exception e)
{
- assertTrue(e instanceof CommitException);
- assertTrue(e.getMessage().contains("org.hibernate.ObjectNotFoundException"));
+ assertEquals(true, e instanceof CommitException);
+ assertEquals(true, e.getMessage().contains("org.hibernate.ObjectNotFoundException"));
}
}
@@ -329,8 +329,8 @@ public class AllTestsHibernate extends AllConfigs
}
catch (Exception e)
{
- assertTrue(e instanceof CommitException);
- assertTrue(e.getMessage().contains("org.hibernate.ObjectNotFoundException"));
+ assertEquals(true, e instanceof CommitException);
+ assertEquals(true, e.getMessage().contains("org.hibernate.ObjectNotFoundException"));
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
index 726bb0665a..a39d92472b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
@@ -68,8 +68,8 @@ public class HibernateQueryTest extends AbstractCDOTest
CDOQuery cdoQuery = transaction.createQuery("hql", "from Product1");
addCacheParameter(cdoQuery);
final List<Product1> products = cdoQuery.getResult(Product1.class);
- assertTrue(products.get(0).getOrderDetails().size() > 0);
- assertTrue(products.get(0).getOrderDetails().get(0).getOrder() != null);
+ assertEquals(true, products.get(0).getOrderDetails().size() > 0);
+ assertEquals(true, products.get(0).getOrderDetails().get(0).getOrder() != null);
assertEquals(NUM_OF_PRODUCTS, products.size());
}
@@ -89,7 +89,7 @@ public class HibernateQueryTest extends AbstractCDOTest
CDOQuery cdoQuery = transaction.createQuery("hql", "from Customer");
addCacheParameter(cdoQuery);
final List<Customer> customers = cdoQuery.getResult(Customer.class);
- assertTrue(customers.get(0).getSalesOrders().size() > 0);
+ assertEquals(true, customers.get(0).getSalesOrders().size() > 0);
assertEquals(NUM_OF_CUSTOMERS, customers.size());
}
@@ -206,7 +206,7 @@ public class HibernateQueryTest extends AbstractCDOTest
found |= od.getProduct() == product;
}
- assertTrue(found);
+ assertEquals(true, found);
}
}
else
@@ -315,7 +315,7 @@ public class HibernateQueryTest extends AbstractCDOTest
assertEquals(VAT.VAT15, values[2]);
assertInstanceOf(Float.class, values[3]);
final SalesOrder order = (SalesOrder)values[1];
- assertTrue(order.getOrderDetails().contains(values[0]));
+ assertEquals(true, order.getOrderDetails().contains(values[0]));
}
}
@@ -345,11 +345,11 @@ public class HibernateQueryTest extends AbstractCDOTest
productQuery.setParameter(IHibernateStore.FIRST_RESULT, page * pageSize);
addCacheParameter(productQuery);
final List<Product1> queriedProducts = productQuery.getResult(Product1.class);
- assertTrue(queriedProducts.size() <= pageSize);
+ assertEquals(true, queriedProducts.size() <= pageSize);
// a product should not have been read yet
for (Product1 newProduct : queriedProducts)
{
- assertTrue(!allProducts.contains(newProduct));
+ assertEquals(true, !allProducts.contains(newProduct));
}
allProducts.addAll(queriedProducts);
@@ -382,7 +382,7 @@ public class HibernateQueryTest extends AbstractCDOTest
{
final Product1 product = iterator.next();
// meaningless but do something
- assertTrue(product != null);
+ assertEquals(true, product != null);
counter++;
if (counter == NUM_OF_PRODUCTS / 2)
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java
index 89556db6bc..5a3c3b51d2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java
@@ -11,7 +11,6 @@
package org.eclipse.emf.cdo.tests.objectivity;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.eclipse.emf.cdo.server.internal.objectivity.db.FdManager;
import org.eclipse.emf.cdo.server.internal.objectivity.db.ObjyConnection;
@@ -173,7 +172,7 @@ public class ObjyBranchManagementTest
dbStore.begin();
int branchId = dbStore.getBranchManager().nextBranchId();
dbStore.commit();
- assertTrue(branchId > 0);
+ assertEquals(true, branchId > 0);
}
@Test
@@ -195,7 +194,7 @@ public class ObjyBranchManagementTest
dbStore.begin();
ObjyBranch objyBranch = dbStore.getBranchManager().getBranch(1);
dbStore.commit();
- assertTrue(objyBranch == null);
+ assertEquals(true, objyBranch == null);
}
@Test
@@ -225,8 +224,8 @@ public class ObjyBranchManagementTest
dbStore.begin();
int nextBranchId = dbStore.getBranchManager().nextBranchId();
dbStore.commit();
- assertTrue(branchIdA < nextBranchId);
- assertTrue(branchIdB < nextBranchId);
+ assertEquals(true, branchIdA < nextBranchId);
+ assertEquals(true, branchIdB < nextBranchId);
}
@Test
@@ -324,7 +323,7 @@ public class ObjyBranchManagementTest
// delete it.
dbStore.begin();
- assertTrue(dbStore.getBranchManager().deleteBranch(branchId));
+ assertEquals(true, dbStore.getBranchManager().deleteBranch(branchId));
dbStore.commit();
}
@@ -484,7 +483,7 @@ public class ObjyBranchManagementTest
{
Temp tempObj = (Temp)itr.next();
assertEquals(tempObj.getBranchId(), branchId);
- assertTrue(tempObj.getRevision() > 1);
+ assertEquals(true, tempObj.getRevision() > 1);
actualList.add(tempObj);
}
assertEquals(objectList.size(), actualList.size());
@@ -541,7 +540,7 @@ public class ObjyBranchManagementTest
ObjyBranch objyBranch = dbStore.getBranchManager().getBranch(branchId);
for (Temp tempObj : objectList)
{
- assertTrue(objyBranch.deleteRevision(tempObj));
+ assertEquals(true, objyBranch.deleteRevision(tempObj));
}
dbStore.commit();
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
index c493259dab..927c370f2c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
@@ -203,7 +203,7 @@ public class AttributeTest extends AbstractCDOTest
CDOResource resource = view.getResource("/my/resource");
EObject genOfByteArray = resource.getContents().get(0);
byte storeByteArray[] = (byte[])genOfByteArray.eGet(genOfByteArray.eClass().getEStructuralFeature("bytes"));
- assertTrue(storeByteArray == null || storeByteArray.length == 0);
+ assertEquals(true, storeByteArray == null || storeByteArray.length == 0);
view.close();
session.close();
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java
index 9b523a8823..64a2e24ed3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java
@@ -384,7 +384,7 @@ public class AuditTest extends AbstractCDOTest
CDOView view = session.openView();
CDOResource res = view.getResource("/res1");
- assertTrue(res.getContents().isEmpty());
+ assertEquals(true, res.getContents().isEmpty());
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
index 08a8d9be8b..536c50c4a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
@@ -1160,15 +1160,15 @@ public class ComplexTest extends AbstractCDOTest
container2.setElement(element);
commit();
- assertTrue(element.getParent() == container2);
- assertTrue(element.eContainer() == container2);
- assertTrue(CDOUtil.getCDOObject(element).cdoDirectResource() == null);
+ assertEquals(true, element.getParent() == container2);
+ assertEquals(true, element.eContainer() == container2);
+ assertEquals(true, CDOUtil.getCDOObject(element).cdoDirectResource() == null);
- assertTrue(container1.getElement() == null);
- assertTrue(CDOUtil.getCDOObject(container1).cdoDirectResource() == resource1);
+ assertEquals(true, container1.getElement() == null);
+ assertEquals(true, CDOUtil.getCDOObject(container1).cdoDirectResource() == resource1);
- assertTrue(container2.getElement() == element);
- assertTrue(CDOUtil.getCDOObject(container2).cdoDirectResource() == resource2);
+ assertEquals(true, container2.getElement() == element);
+ assertEquals(true, CDOUtil.getCDOObject(container2).cdoDirectResource() == resource2);
}
public void testMigrateContainmentMulti()
@@ -1192,21 +1192,21 @@ public class ComplexTest extends AbstractCDOTest
container2.getElements().add(container1.getElements().get(0));
commit();
- assertTrue(elementA.getParent() == container2);
- assertTrue(elementA.eContainer() == container2);
- assertTrue(CDOUtil.getCDOObject(elementA).cdoDirectResource() == null);
- assertTrue(elementA.eResource() == resource2);
+ assertEquals(true, elementA.getParent() == container2);
+ assertEquals(true, elementA.eContainer() == container2);
+ assertEquals(true, CDOUtil.getCDOObject(elementA).cdoDirectResource() == null);
+ assertEquals(true, elementA.eResource() == resource2);
- assertTrue(elementB.getParent() == container1);
- assertTrue(elementB.eContainer() == container1);
- assertTrue(CDOUtil.getCDOObject(elementB).cdoDirectResource() == null);
- assertTrue(elementB.eResource() == resource1);
+ assertEquals(true, elementB.getParent() == container1);
+ assertEquals(true, elementB.eContainer() == container1);
+ assertEquals(true, CDOUtil.getCDOObject(elementB).cdoDirectResource() == null);
+ assertEquals(true, elementB.eResource() == resource1);
- assertTrue(CDOUtil.getCDOObject(container1).cdoDirectResource() == resource1);
+ assertEquals(true, CDOUtil.getCDOObject(container1).cdoDirectResource() == resource1);
assertEquals(1, container1.getElements().size());
assertEquals(elementB, container1.getElements().get(0));
- assertTrue(CDOUtil.getCDOObject(container2).cdoDirectResource() == resource2);
+ assertEquals(true, CDOUtil.getCDOObject(container2).cdoDirectResource() == resource2);
assertEquals(1, container2.getElements().size());
assertEquals(elementA, container2.getElements().get(0));
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java
index 77a78273b7..722473968c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java
@@ -349,7 +349,7 @@ public class CrossReferenceTest extends AbstractCDOTest
transaction.commit();
CDORevisionData data = CDOUtil.getCDOObject(salesOrder).cdoRevision().data();
CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0);
- assertTrue(id.isExternal());
+ assertEquals(true, id.isExternal());
}
public void _testDetachXRefExternalReattach() throws Exception
@@ -378,13 +378,13 @@ public class CrossReferenceTest extends AbstractCDOTest
transaction.commit();
CDORevisionData data = CDOUtil.getCDOObject(salesOrder).cdoRevision().data();
CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0);
- assertTrue(id.isExternal());
+ assertEquals(true, id.isExternal());
company.getCustomers().add(customer);
transaction.commit();
data = CDOUtil.getCDOObject(salesOrder).cdoRevision().data();
id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0);
- assertFalse(id.isExternal());
+ assertEquals(false, id.isExternal());
}
public void testNewMakeExternal() throws Exception
@@ -414,7 +414,7 @@ public class CrossReferenceTest extends AbstractCDOTest
transaction.commit();
CDORevisionData data = CDOUtil.getCDOObject(salesOrder).cdoRevision().data();
CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0);
- assertTrue(id.isExternal());
+ assertEquals(true, id.isExternal());
}
public void testExternalMakeNew() throws Exception
@@ -445,7 +445,7 @@ public class CrossReferenceTest extends AbstractCDOTest
transaction.commit();
CDORevisionData data = CDOUtil.getCDOObject(salesOrder).cdoRevision().data();
CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0);
- assertFalse(id.isExternal());
+ assertEquals(false, id.isExternal());
}
public void testExternalMakeDangling() throws Exception
@@ -476,7 +476,7 @@ public class CrossReferenceTest extends AbstractCDOTest
transaction.commit();
CDORevisionData data = CDOUtil.getCDOObject(salesOrder).cdoRevision().data();
CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0);
- assertTrue(id.isExternal());
+ assertEquals(true, id.isExternal());
externalResource.getContents().remove(customer);
transaction.commit(); // Should be dangling reference now, but we can not detect ;-(
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java
index ce8d50695a..6cda022d7a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java
@@ -357,7 +357,7 @@ public class DetachTest extends AbstractCDOTest
final ResourceSet rSet2 = res2.getResourceSet();
res.delete(null);
- assertTrue(transaction1.isDirty());
+ assertEquals(true, transaction1.isDirty());
transaction1.commit();
new PollingTimeOuter()
@@ -399,7 +399,7 @@ public class DetachTest extends AbstractCDOTest
msg("Deleting resource");
resource.delete(null);
- assertTrue(resource.isExisting());
+ assertEquals(true, resource.isExisting());
transaction.commit();
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicPackageTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicPackageTest.java
index 56aa4a719c..d81bceb955 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicPackageTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicPackageTest.java
@@ -48,11 +48,11 @@ public class DynamicPackageTest extends AbstractCDOTest
if (!isConfig(LEGACY))
{
- assertTrue(mapContainer instanceof DynamicCDOObjectImpl);
+ assertEquals(true, mapContainer instanceof DynamicCDOObjectImpl);
}
else
{
- assertTrue(mapContainer instanceof DynamicEObjectImpl);
+ assertEquals(true, mapContainer instanceof DynamicEObjectImpl);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java
index 2642252db9..a8751d85d9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java
@@ -53,11 +53,11 @@ public class EMapTest extends AbstractCDOTest
Customer customer = (Customer)eObject;
for (Product1 product : customer.getOrderByProduct().keySet())
{
- assertTrue(res.getContents().contains(product));
+ assertEquals(true, res.getContents().contains(product));
SalesOrder order = customer.getOrderByProduct().get(product);
assertNotNull(order);
assertEquals(product.getName(), order.getId() + "");
- assertTrue(res.getContents().contains(order));
+ assertEquals(true, res.getContents().contains(order));
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java
index 2475442abc..c79fbf1d1c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java
@@ -168,7 +168,7 @@ public class FeatureMapTest extends AbstractCDOTest
assertEquals(5, fmDb.getValue(3));
assertEquals(integer, fmDb.getEStructuralFeature(3));
- assertFalse((Boolean)fmDb.getValue(4));
+ assertEquals(false, (boolean)(Boolean)fmDb.getValue(4));
assertEquals(bool, fmDb.getEStructuralFeature(4));
assertEquals(dummyDb, fmDb.getValue(5));
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java
index 3dfc7fefbb..8b7ef0d6f6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -50,11 +50,11 @@ public class GeneratedEcoreTest extends AbstractCDOTest
EList<EObject> contents = res2.getContents();
EPackage root2 = (EPackage)contents.get(0);
- assertFalse("Unresolved proxy", root2.eIsProxy());
+ assertEquals("Unresolved proxy", false, root2.eIsProxy());
assertEquals(res2, root2.eResource());
CDOUtil.load(root2, transaction2);
TestEMFUtil.saveEcore("model1X.ecore", root2);
- // assertTrue("Models differ", EcoreUtil.equals(root1, root2));
+ // assertEquals(true, "Models differ", EcoreUtil.equals(root1, root2));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java
index 555680528d..1542e847db 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java
@@ -107,7 +107,7 @@ public class InitialTest extends AbstractCDOTest
msg("Verifying contents");
EList<EObject> contents = resource.getContents();
assertNotNull(contents);
- assertTrue(contents.isEmpty());
+ assertEquals(true, contents.isEmpty());
assertEquals(0, contents.size());
assertTransient(resource);
@@ -333,7 +333,7 @@ public class InitialTest extends AbstractCDOTest
supplier.setName("Eike");
long commitTime2 = transaction.commit().getTimeStamp();
- assertTrue(commitTime1 < commitTime2);
+ assertEquals(true, commitTime1 < commitTime2);
assertEquals(CDOState.CLEAN, resource.cdoState());
assertEquals(CDOState.CLEAN, CDOUtil.getCDOObject(supplier).cdoState());
assertCreatedTime(supplier, commitTime2);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
index dadd254efc..e01767e213 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
@@ -288,7 +288,7 @@ public class InvalidationTest extends AbstractCDOTest
res1.delete(null);
res2.getContents().add(getModel1Factory().createCustomer());
- assertTrue(res2.isExisting());
+ assertEquals(true, res2.isExisting());
trans1.commit();
@@ -303,7 +303,7 @@ public class InvalidationTest extends AbstractCDOTest
trans2.rollback();
assertEquals(CDOState.INVALID, CDOUtil.getCDOObject(res2).cdoState());
- assertFalse(res2.isExisting());
+ assertEquals(false, res2.isExisting());
try
{
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
index 7d97b60048..358d917b46 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
@@ -139,7 +139,7 @@ public class OCLQueryTest extends AbstractCDOTest
for (CloseableIterator<Product1> it = query.getResultAsync(Product1.class); it.hasNext();)
{
Product1 product = it.next();
- assertTrue(product != null); // meaningless but do something
+ assertEquals(true, product != null); // meaningless but do something
if (++counter == NUM_OF_PRODUCTS / 2)
{
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
index a8f7e2d048..3cec2169f0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
@@ -178,7 +178,7 @@ public class PartialCommitTest extends AbstractCDOTest
assertClean(company1, tx);
assertDirty(company2, tx);
assertDirty(company3, tx);
- assertTrue(tx.isDirty());
+ assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(company2));
tx.commit();
@@ -186,7 +186,7 @@ public class PartialCommitTest extends AbstractCDOTest
assertClean(company1, tx);
assertClean(company2, tx);
assertDirty(company3, tx);
- assertTrue(tx.isDirty());
+ assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(company3));
tx.commit();
@@ -194,7 +194,7 @@ public class PartialCommitTest extends AbstractCDOTest
assertClean(company1, tx);
assertClean(company2, tx);
assertClean(company3, tx);
- assertFalse(tx.isDirty());
+ assertEquals(false, tx.isDirty());
}
public void testPartialCleanUp_newObjects() throws CommitException
@@ -221,7 +221,7 @@ public class PartialCommitTest extends AbstractCDOTest
assertClean(company4, tx);
assertNew(po, tx);
assertNew(product, tx);
- assertTrue(tx.isDirty());
+ assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(po, company2));
tx.commit();
@@ -229,7 +229,7 @@ public class PartialCommitTest extends AbstractCDOTest
assertClean(company4, tx);
assertClean(po, tx);
assertNew(product, tx);
- assertTrue(tx.isDirty());
+ assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(product, cat));
tx.commit();
@@ -237,11 +237,11 @@ public class PartialCommitTest extends AbstractCDOTest
assertClean(company4, tx);
assertClean(po, tx);
assertClean(product, tx);
- assertTrue(tx.isDirty());
+ assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(company1));
tx.commit();
- assertFalse(tx.isDirty());
+ assertEquals(false, tx.isDirty());
}
public void testPartialCleanUp_detachedObjects() throws CommitException
@@ -266,50 +266,50 @@ public class PartialCommitTest extends AbstractCDOTest
company2.getPurchaseOrders().remove(po);
cat.getProducts().remove(product);
- assertTrue(tx.getDetachedObjects().containsValue(company4));
- assertTrue(tx.getFormerRevisionKeys().containsKey(company4));
- assertTrue(tx.getDetachedObjects().containsValue(po));
- assertTrue(tx.getFormerRevisionKeys().containsKey(company4));
- assertTrue(tx.getDetachedObjects().containsValue(product));
- assertTrue(tx.getFormerRevisionKeys().containsKey(company4));
- assertTrue(tx.isDirty());
+ assertEquals(true, tx.getDetachedObjects().containsValue(company4));
+ assertEquals(true, tx.getFormerRevisionKeys().containsKey(company4));
+ assertEquals(true, tx.getDetachedObjects().containsValue(po));
+ assertEquals(true, tx.getFormerRevisionKeys().containsKey(company4));
+ assertEquals(true, tx.getDetachedObjects().containsValue(product));
+ assertEquals(true, tx.getFormerRevisionKeys().containsKey(company4));
+ assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(company4, resource1));
tx.commit();
- assertFalse(tx.getDetachedObjects().containsValue(company4));
- assertFalse(tx.getFormerRevisionKeys().containsKey(company4));
- assertTrue(tx.getDetachedObjects().containsValue(po));
- assertTrue(tx.getFormerRevisionKeys().containsKey(po));
- assertTrue(tx.getDetachedObjects().containsValue(product));
- assertTrue(tx.getFormerRevisionKeys().containsKey(product));
- assertTrue(tx.isDirty());
+ assertEquals(false, tx.getDetachedObjects().containsValue(company4));
+ assertEquals(false, tx.getFormerRevisionKeys().containsKey(company4));
+ assertEquals(true, tx.getDetachedObjects().containsValue(po));
+ assertEquals(true, tx.getFormerRevisionKeys().containsKey(po));
+ assertEquals(true, tx.getDetachedObjects().containsValue(product));
+ assertEquals(true, tx.getFormerRevisionKeys().containsKey(product));
+ assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(po, company2));
tx.commit();
- assertFalse(tx.getDetachedObjects().containsValue(company4));
- assertFalse(tx.getFormerRevisionKeys().containsKey(company4));
- assertFalse(tx.getDetachedObjects().containsValue(po));
- assertFalse(tx.getFormerRevisionKeys().containsKey(po));
- assertTrue(tx.getDetachedObjects().containsValue(product));
- assertTrue(tx.getFormerRevisionKeys().containsKey(product));
- assertTrue(tx.isDirty());
+ assertEquals(false, tx.getDetachedObjects().containsValue(company4));
+ assertEquals(false, tx.getFormerRevisionKeys().containsKey(company4));
+ assertEquals(false, tx.getDetachedObjects().containsValue(po));
+ assertEquals(false, tx.getFormerRevisionKeys().containsKey(po));
+ assertEquals(true, tx.getDetachedObjects().containsValue(product));
+ assertEquals(true, tx.getFormerRevisionKeys().containsKey(product));
+ assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(product, cat));
tx.commit();
- assertFalse(tx.getDetachedObjects().containsValue(company4));
- assertFalse(tx.getFormerRevisionKeys().containsKey(company4));
- assertFalse(tx.getDetachedObjects().containsValue(po));
- assertFalse(tx.getFormerRevisionKeys().containsKey(po));
- assertFalse(tx.getDetachedObjects().containsValue(product));
- assertFalse(tx.getFormerRevisionKeys().containsKey(product));
- assertTrue(tx.isDirty());
+ assertEquals(false, tx.getDetachedObjects().containsValue(company4));
+ assertEquals(false, tx.getFormerRevisionKeys().containsKey(company4));
+ assertEquals(false, tx.getDetachedObjects().containsValue(po));
+ assertEquals(false, tx.getFormerRevisionKeys().containsKey(po));
+ assertEquals(false, tx.getDetachedObjects().containsValue(product));
+ assertEquals(false, tx.getFormerRevisionKeys().containsKey(product));
+ assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(company1));
tx.commit();
- assertFalse(tx.isDirty());
+ assertEquals(false, tx.isDirty());
}
public void testDirty() throws CommitException
@@ -406,8 +406,8 @@ public class PartialCommitTest extends AbstractCDOTest
assertClean(purchaseOrder, tx);
assertDirty(supplier1, tx);
- assertFalse(company1.getPurchaseOrders().contains(purchaseOrder));
- assertTrue(company2.getPurchaseOrders().contains(purchaseOrder));
+ assertEquals(false, company1.getPurchaseOrders().contains(purchaseOrder));
+ assertEquals(true, company2.getPurchaseOrders().contains(purchaseOrder));
assertEquals("Supplier", supplier1.getName());
assertSame(company2, purchaseOrder.eContainer());
}
@@ -702,7 +702,7 @@ public class PartialCommitTest extends AbstractCDOTest
found = true;
}
}
- assertTrue(found);
+ assertEquals(true, found);
view.close();
session2.close();
@@ -1152,7 +1152,7 @@ public class PartialCommitTest extends AbstractCDOTest
try
{
check.check();
- assertTrue("check.getMissingObjects() should have been empty", check.getMissingObjects().isEmpty());
+ assertEquals("check.getMissingObjects() should have been empty", true, check.getMissingObjects().isEmpty());
}
catch (CommitIntegrityException e)
{
@@ -1175,7 +1175,7 @@ public class PartialCommitTest extends AbstractCDOTest
if (company99 != null)
{
assertDirty(company99, tx);
- assertTrue("Transaction should still have been dirty", tx.isDirty());
+ assertEquals("Transaction should still have been dirty", true, tx.isDirty());
}
}
}
@@ -1277,12 +1277,12 @@ public class PartialCommitTest extends AbstractCDOTest
{
// We cannot use == here, because it isn't (always) possible for the logic to
// find all missing objects
- assertTrue(missingObjects.size() <= expectedMissingObjects.size());
+ assertEquals(true, missingObjects.size() <= expectedMissingObjects.size());
}
for (EObject missingObject : missingObjects)
{
- assertTrue(expectedMissingObjects.contains(missingObject));
+ assertEquals(true, expectedMissingObjects.contains(missingObject));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java
index 902de588a8..bf55c3d3d1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java
@@ -84,11 +84,11 @@ public class PushTransactionTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file);
- assertTrue(transaction.isDirty());
+ assertEquals(true, transaction.isDirty());
assertEquals(1, transaction.getRevisionDeltas().size());
msg("Publish previous modifications");
pushTransaction.push();
- assertFalse(transaction.isDirty());
+ assertEquals(false, transaction.isDirty());
session.close();
}
@@ -123,11 +123,11 @@ public class PushTransactionTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file);
- assertTrue(transaction.isDirty());
+ assertEquals(true, transaction.isDirty());
assertEquals(1, transaction.getRevisionDeltas().size());
msg("Publish previous modifications");
pushTransaction.push();
- assertFalse(transaction.isDirty());
+ assertEquals(false, transaction.isDirty());
session.close();
}
@@ -160,13 +160,13 @@ public class PushTransactionTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file);
- assertTrue(transaction.isDirty());
+ assertEquals(true, transaction.isDirty());
assertEquals(1, transaction.getRevisionDeltas().size());
CDORevisionDelta delta = transaction.getRevisionDeltas().values().iterator().next();
assertNotNull(delta);
msg("Publish previous modifications");
pushTransaction.push();
- assertFalse(transaction.isDirty());
+ assertEquals(false, transaction.isDirty());
session.close();
}
@@ -199,13 +199,13 @@ public class PushTransactionTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file);
- assertTrue(transaction.isDirty());
+ assertEquals(true, transaction.isDirty());
assertEquals(1, transaction.getRevisionDeltas().size());
CDORevisionDelta delta = transaction.getRevisionDeltas().values().iterator().next();
assertNotNull(delta);
msg("Publish previous modifications");
pushTransaction.push();
- assertFalse(transaction.isDirty());
+ assertEquals(false, transaction.isDirty());
session.close();
}
@@ -239,7 +239,7 @@ public class PushTransactionTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file);
- assertTrue(transaction.isDirty());
+ assertEquals(true, transaction.isDirty());
CDOResource resource = transaction.getOrCreateResource(resourcePath);
CDOResource resource2 = (CDOResource)resource.getContents().get(2);
assertNotNull(resource2);
@@ -291,13 +291,13 @@ public class PushTransactionTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file);
- assertTrue(transaction.isDirty());
+ assertEquals(true, transaction.isDirty());
assertEquals(1, transaction.getRevisionDeltas().size());
CDOResource resource = transaction.getOrCreateResource(resourcePath);
assertEquals(4, resource.getContents().size());
msg("Publish previous modifications");
pushTransaction.push();
- assertFalse(transaction.isDirty());
+ assertEquals(false, transaction.isDirty());
session.close();
}
@@ -344,7 +344,7 @@ public class PushTransactionTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file);
- assertTrue(transaction.isDirty());
+ assertEquals(true, transaction.isDirty());
CDOResource resource = transaction.getOrCreateResource(resourcePath);
assertEquals(supplierName, ((Supplier)resource.getContents().get(1)).getName());
msg("Publish previous modifications");
@@ -384,7 +384,7 @@ public class PushTransactionTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file);
- assertTrue(transaction.isDirty());
+ assertEquals(true, transaction.isDirty());
CDOResource resource = transaction.getOrCreateResource(resourcePath);
assertEquals(0, resource.getContents().size());
msg("Publish previous modifications");
@@ -419,7 +419,7 @@ public class PushTransactionTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file);
- assertTrue(transaction.isDirty());
+ assertEquals(true, transaction.isDirty());
CDOResource resource = transaction.getOrCreateResource(resourcePath);
Supplier supplier = (Supplier)resource.getContents().get(0);
assertNull(supplier.getName());
@@ -509,7 +509,7 @@ public class PushTransactionTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file);
- assertTrue(transaction.hasConflict());
+ assertEquals(true, transaction.hasConflict());
try
{
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
index 5c7bdadeef..70cdd070d4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
@@ -598,8 +598,8 @@ public class ResourceTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- assertFalse(transaction.hasResource("/my/resource"));
- assertTrue(transaction.hasResource("/renamed"));
+ assertEquals(false, transaction.hasResource("/my/resource"));
+ assertEquals(true, transaction.hasResource("/renamed"));
}
public void testChangeResourceFolderURI() throws Exception
@@ -623,8 +623,8 @@ public class ResourceTest extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- assertFalse(transaction.hasResource("/my/resource"));
- assertTrue(transaction.hasResource("/renamed"));
+ assertEquals(false, transaction.hasResource("/my/resource"));
+ assertEquals(true, transaction.hasResource("/renamed"));
}
public void testPathNotNull() throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java
index 75dceae315..fcb42a789c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java
@@ -558,7 +558,7 @@ public class StateMachineTest extends AbstractCDOTest
private static void assertFailure(IllegalStateException ex)
{
IOUtil.print(ex);
- assertTrue("Expected FAIL transition", ex.getMessage().startsWith("Failing event "));
+ assertEquals("Expected FAIL transition", true, ex.getMessage().startsWith("Failing event "));
}
private static void setState(EObject object, CDOState state)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java
index 5667118caa..88593e0747 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java
@@ -436,25 +436,25 @@ public class UnsetTest extends AbstractCDOTest
test4.eUnset(baseElement);
test4.eUnset(objectElement);
- assertTrue(test1.eIsSet(baseElement));
- assertTrue(test1.eIsSet(objectElement));
+ assertEquals(true, test1.eIsSet(baseElement));
+ assertEquals(true, test1.eIsSet(objectElement));
assertEquals(1, test1.eGet(baseElement));
assertEquals(2, test1.eGet(objectElement));
- assertTrue(test2.eIsSet(baseElement));
- assertTrue(test2.eIsSet(objectElement));
+ assertEquals(true, test2.eIsSet(baseElement));
+ assertEquals(true, test2.eIsSet(objectElement));
assertEquals(23, test2.eGet(baseElement));
assertEquals(42, test2.eGet(objectElement));
// for basetypes, setting value null seems to be equivalent
// to unset.
- assertFalse(test3.eIsSet(baseElement));
- assertTrue(test3.eIsSet(objectElement));
+ assertEquals(false, test3.eIsSet(baseElement));
+ assertEquals(true, test3.eIsSet(objectElement));
assertEquals(23, test3.eGet(baseElement));
assertNull(test3.eGet(objectElement));
- assertFalse(test4.eIsSet(baseElement));
- assertFalse(test4.eIsSet(objectElement));
+ assertEquals(false, test4.eIsSet(baseElement));
+ assertEquals(false, test4.eIsSet(objectElement));
assertEquals(23, test4.eGet(baseElement));
assertEquals(42, test4.eGet(objectElement));
@@ -487,23 +487,23 @@ public class UnsetTest extends AbstractCDOTest
EObject test3 = res.getContents().get(2);
EObject test4 = res.getContents().get(3);
- assertTrue(test1.eIsSet(baseElement));
- assertTrue(test1.eIsSet(objectElement));
+ assertEquals(true, test1.eIsSet(baseElement));
+ assertEquals(true, test1.eIsSet(objectElement));
assertEquals(1, test1.eGet(baseElement));
assertEquals(2, test1.eGet(objectElement));
- assertTrue(test2.eIsSet(baseElement));
- assertTrue(test2.eIsSet(objectElement));
+ assertEquals(true, test2.eIsSet(baseElement));
+ assertEquals(true, test2.eIsSet(objectElement));
assertEquals(23, test2.eGet(baseElement));
assertEquals(42, test2.eGet(objectElement));
- assertFalse(test3.eIsSet(baseElement));
- assertTrue(test3.eIsSet(objectElement));
+ assertEquals(false, test3.eIsSet(baseElement));
+ assertEquals(true, test3.eIsSet(objectElement));
assertEquals(23, test3.eGet(baseElement));
assertNull(test3.eGet(objectElement));
- assertFalse(test4.eIsSet(baseElement));
- assertFalse(test4.eIsSet(objectElement));
+ assertEquals(false, test4.eIsSet(baseElement));
+ assertEquals(false, test4.eIsSet(objectElement));
assertEquals(23, test4.eGet(baseElement));
assertEquals(42, test4.eGet(objectElement));
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java
index 2d7e94f716..97a35a8031 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java
@@ -75,7 +75,7 @@ public class ViewTest extends AbstractCDOTest
{
CDOSession session = openSession();
CDOView view = session.openView();
- assertFalse(view.isObjectRegistered(null));
+ assertEquals(false, view.isObjectRegistered(null));
session.close();
}
@@ -304,7 +304,7 @@ public class ViewTest extends AbstractCDOTest
});
view.close();
- assertTrue(deactivated[0]);
+ assertEquals(true, deactivated[0]);
session.close();
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java
index 16dc3de657..67787c6bd9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java
@@ -238,11 +238,11 @@ public class XRefTest extends AbstractCDOTest
break;
default:
// must not happen!
- assertTrue(false);
+ assertEquals(true, false);
}
}
- assertTrue(found1 && found2 && found3);
+ assertEquals(true, found1 && found2 && found3);
view.close();
session2.close();
@@ -304,7 +304,7 @@ public class XRefTest extends AbstractCDOTest
CDOView view = session2.openView();
List<CDOObjectReference> results = view.queryXRefs(Collections.singleton(CDOUtil.getCDOObject(obj2_1)));
- assertTrue(results.isEmpty());
+ assertEquals(true, results.isEmpty());
results = view.queryXRefs(Collections.singleton(CDOUtil.getCDOObject(obj2_3)));
@@ -330,7 +330,7 @@ public class XRefTest extends AbstractCDOTest
CDOObject sourceObject = result.getSourceObject();
Integer id = (Integer)sourceObject.eGet(sourceObject.eClass().getEStructuralFeature("id"));
- assertTrue(id == 1 || id == 2);
+ assertEquals(true, id == 1 || id == 2);
assertEquals(0, result.getSourceIndex());
if (id == 1)
@@ -343,7 +343,7 @@ public class XRefTest extends AbstractCDOTest
}
}
- assertTrue(found1 && found2);
+ assertEquals(true, found1 && found2);
view.close();
session2.close();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java
index 3734c51cce..3ac2e1bf5e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java
@@ -42,7 +42,7 @@ public class Bugzilla_248124_Test extends AbstractCDOTest
res.delete(null);
transaction1.commit();
CDOView view = session.openView();
- assertFalse(view.hasResource(resourcePath));
+ assertEquals(false, view.hasResource(resourcePath));
}
public void testBugzilla_248124_getResourceWithCommit() throws Exception
@@ -93,7 +93,7 @@ public class Bugzilla_248124_Test extends AbstractCDOTest
res.getContents().add(getModel1Factory().createCompany());
res.delete(null);
- assertFalse(transaction1.hasResource(resourcePath));
+ assertEquals(false, transaction1.hasResource(resourcePath));
}
public void testBugzilla_248124_getResourceWithoutCommit() throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252214_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252214_Test.java
index 9955834fcd..25a108c09a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252214_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252214_Test.java
@@ -59,13 +59,13 @@ public class Bugzilla_252214_Test extends AbstractCDOTest
company.setName("ESC");
resource.getContents().add(company);
commitTime1 = transaction.commit().getTimeStamp();
- assertTrue(session.getRepositoryInfo().getCreationTime() < commitTime1);
+ assertEquals(true, session.getRepositoryInfo().getCreationTime() < commitTime1);
assertEquals("ESC", company.getName());
company.setName("Sympedia");
commitTime2 = transaction.commit().getTimeStamp();
- assertTrue(commitTime1 < commitTime2);
- assertTrue(session.getRepositoryInfo().getCreationTime() < commitTime2);
+ assertEquals(true, commitTime1 < commitTime2);
+ assertEquals(true, session.getRepositoryInfo().getCreationTime() < commitTime2);
assertEquals("Sympedia", company.getName());
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258850_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258850_Test.java
index 5ce49f4470..a1e8306dfd 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258850_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258850_Test.java
@@ -54,7 +54,7 @@ public class Bugzilla_258850_Test extends AbstractCDOTest
transaction.options().addListener(listener);
transaction.options().setInvalidationNotificationEnabled(true);
- assertTrue(listener.getSucess());
+ assertEquals(true, listener.getSucess());
transaction.commit();
session.close();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java
index bed1393f90..f54f23e575 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java
@@ -63,7 +63,7 @@ public class Bugzilla_259869_Test extends AbstractCDOTest
}
long timeToCommitNoChange = System.currentTimeMillis() - start;
- assertTrue(timeCommitWithChanges > timeToCommitNoChange * 1.2);
+ assertEquals(true, timeCommitWithChanges > timeToCommitNoChange * 1.2);
}
public void testBugzilla_259869_XA() throws Exception
@@ -114,6 +114,6 @@ public class Bugzilla_259869_Test extends AbstractCDOTest
}
long timeToCommitNoChange = System.currentTimeMillis() - start;
- assertTrue(timeCommitWithChanges > timeToCommitNoChange * 1.2);
+ assertEquals(true, timeCommitWithChanges > timeToCommitNoChange * 1.2);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java
index 0ea80875a6..457e9ef101 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java
@@ -64,8 +64,8 @@ public class Bugzilla_260756_Test extends AbstractCDOTest
List<Category> queryResult = cdoQuery.getResult(Category.class);
assertEquals(2, queryResult.size());
- assertTrue(objects.contains(queryResult.get(0)));
- assertTrue(objects.contains(queryResult.get(1)));
+ assertEquals(true, objects.contains(queryResult.get(0)));
+ assertEquals(true, objects.contains(queryResult.get(1)));
Object[] array1 = queryResult.toArray();
Category[] arrayOfCategory = queryResult.toArray(new Category[queryResult.size()]);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java
index 46e19e568c..b52e7078f3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java
@@ -66,10 +66,10 @@ public class Bugzilla_273233_Test extends AbstractCDOTest
// Commit tx #1
trans.commit();
- assertFalse(FSMUtil.isConflict(res2));
+ assertEquals(false, FSMUtil.isConflict(res2));
session2.refresh();
- assertTrue(FSMUtil.isConflict(res2));
+ assertEquals(true, FSMUtil.isConflict(res2));
try
{
@@ -112,10 +112,10 @@ public class Bugzilla_273233_Test extends AbstractCDOTest
trans.commit();
clearCache(session2.getRevisionManager());
- assertFalse(FSMUtil.isConflict(res2));
+ assertEquals(false, FSMUtil.isConflict(res2));
session2.refresh();
- assertTrue(FSMUtil.isConflict(res2));
+ assertEquals(true, FSMUtil.isConflict(res2));
try
{
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java
index 07ef3faacb..4fb5c6f2e6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java
@@ -56,7 +56,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest
try
{
- assertTrue(CDOUtil.isStaleObject(element));
+ assertEquals(true, CDOUtil.isStaleObject(element));
element.eContainer();
fail("Should fail");
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_280102_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_280102_Test.java
index 9812e24a30..3053723870 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_280102_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_280102_Test.java
@@ -31,7 +31,7 @@ public class Bugzilla_280102_Test extends AbstractCDOTest
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOResource root = transaction.getRootResource();
- assertTrue(root.isRoot());
+ assertEquals(true, root.isRoot());
transaction.commit();
}
@@ -40,6 +40,6 @@ public class Bugzilla_280102_Test extends AbstractCDOTest
CDOSession session = openSession();
CDOView view = session.openView();
CDOResource root = view.getRootResource();
- assertTrue(root.isRoot());
+ assertEquals(true, root.isRoot());
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java
index 0c831c886e..cc6bdb68b8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java
@@ -363,49 +363,49 @@ public class Bugzilla_283985_CDOTest extends AbstractCDOTest
tx.commit();
order2.getOrderDetails().remove(detail1);
- assertTrue(CDOUtil.getCDOObject(detail1).cdoState() == CDOState.TRANSIENT);
+ assertEquals(true, CDOUtil.getCDOObject(detail1).cdoState() == CDOState.TRANSIENT);
boolean contains;
order1.getOrderDetails().add(detail1);
contains = order1.getOrderDetails().contains(detail1);
- assertTrue(contains);
- assertTrue(CDOUtil.getCDOObject(detail1).cdoState() == CDOState.DIRTY);
+ assertEquals(true, contains);
+ assertEquals(true, CDOUtil.getCDOObject(detail1).cdoState() == CDOState.DIRTY);
order1.getOrderDetails().remove(detail1);
- assertTrue(CDOUtil.getCDOObject(detail1).cdoState() == CDOState.TRANSIENT);
+ assertEquals(true, CDOUtil.getCDOObject(detail1).cdoState() == CDOState.TRANSIENT);
order2.getOrderDetails().add(detail1);
contains = order2.getOrderDetails().contains(detail1);
- assertTrue(contains);
- assertTrue(CDOUtil.getCDOObject(detail1).cdoState() == CDOState.DIRTY);
+ assertEquals(true, contains);
+ assertEquals(true, CDOUtil.getCDOObject(detail1).cdoState() == CDOState.DIRTY);
order2.getOrderDetails().remove(detail1);
- assertTrue(CDOUtil.getCDOObject(detail1).cdoState() == CDOState.TRANSIENT);
+ assertEquals(true, CDOUtil.getCDOObject(detail1).cdoState() == CDOState.TRANSIENT);
order1.getOrderDetails().add(detail1);
contains = order1.getOrderDetails().contains(detail1);
- assertTrue(contains);
- assertTrue(CDOUtil.getCDOObject(detail1).cdoState() == CDOState.DIRTY);
+ assertEquals(true, contains);
+ assertEquals(true, CDOUtil.getCDOObject(detail1).cdoState() == CDOState.DIRTY);
order1.getOrderDetails().remove(detail1);
- assertTrue(CDOUtil.getCDOObject(detail1).cdoState() == CDOState.TRANSIENT);
+ assertEquals(true, CDOUtil.getCDOObject(detail1).cdoState() == CDOState.TRANSIENT);
tx.commit();
order1.getOrderDetails().add(detail1);
contains = order1.getOrderDetails().contains(detail1);
- assertTrue(contains);
+ assertEquals(true, contains);
order1.getOrderDetails().remove(detail1);
order2.getOrderDetails().add(detail1);
contains = order2.getOrderDetails().contains(detail1);
- assertTrue(contains);
+ assertEquals(true, contains);
order2.getOrderDetails().remove(detail1);
order1.getOrderDetails().add(detail1);
contains = order1.getOrderDetails().contains(detail1);
- assertTrue(contains);
+ assertEquals(true, contains);
order1.getOrderDetails().remove(detail1);
tx.close();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest2.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest2.java
index 60e2a3d8a9..036dbf4645 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest2.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest2.java
@@ -58,20 +58,20 @@ public class Bugzilla_283985_CDOTest2 extends AbstractCDOTest
r1.getContents().add(order2);
boolean contains = order1.getOrderDetails().contains(detail1);
- assertTrue(contains);
+ assertEquals(true, contains);
// Commit so that everything gets a CDOID
tx.commit();
contains = order1.getOrderDetails().contains(detail1);
- assertTrue(contains);
+ assertEquals(true, contains);
tx.commit();
order1.getOrderDetails().remove(detail1);
order2.getOrderDetails().add(detail1);
contains = order2.getOrderDetails().contains(detail1);
- assertTrue(contains);
+ assertEquals(true, contains);
tx.commit();
@@ -92,8 +92,8 @@ public class Bugzilla_283985_CDOTest2 extends AbstractCDOTest
boolean contains1 = order1.getOrderDetails().contains(detail1);
boolean contains2 = order2.getOrderDetails().contains(detail1);
- assertFalse(contains1);
- assertTrue(contains2);
+ assertEquals(false, contains1);
+ assertEquals(true, contains2);
tx.close();
session.close();
@@ -111,25 +111,25 @@ public class Bugzilla_283985_CDOTest2 extends AbstractCDOTest
r1.getContents().add(order2);
boolean contains = order1.getOrderDetails().contains(detail1);
- assertTrue(contains);
+ assertEquals(true, contains);
// Commit so that everything gets a CDOID
tx.commit();
contains = order1.getOrderDetails().contains(detail1);
- assertTrue(contains);
+ assertEquals(true, contains);
tx.commit();
order1.getOrderDetails().remove(detail1);
order2.getOrderDetails().add(detail1);
contains = order2.getOrderDetails().contains(detail1);
- assertTrue(contains);
+ assertEquals(true, contains);
order2.getOrderDetails().remove(detail1);
order1.getOrderDetails().add(detail1);
contains = order1.getOrderDetails().contains(detail1);
- assertTrue(contains);
+ assertEquals(true, contains);
tx.commit();
@@ -148,8 +148,8 @@ public class Bugzilla_283985_CDOTest2 extends AbstractCDOTest
boolean contains1 = order1.getOrderDetails().contains(detail1);
boolean contains2 = order2.getOrderDetails().contains(detail1);
- assertFalse(contains2);
- assertTrue(contains1);
+ assertEquals(false, contains2);
+ assertEquals(true, contains1);
tx.close();
session.close();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java
index 5cad971271..776b8d8718 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java
@@ -98,13 +98,13 @@ public class Bugzilla_283985_SavePointTest extends AbstractCDOTest
order1.getOrderDetails().remove(detail1);
assertTransient(detail1);
- assertTrue(sp.getDetachedObjects().containsValue(CDOUtil.getCDOObject(detail1)));
+ assertEquals(true, sp.getDetachedObjects().containsValue(CDOUtil.getCDOObject(detail1)));
sp = (InternalCDOSavepoint)transaction.setSavepoint();
- assertTrue(sp.getPreviousSavepoint().getDetachedObjects().containsValue(CDOUtil.getCDOObject(detail1)));
+ assertEquals(true, sp.getPreviousSavepoint().getDetachedObjects().containsValue(CDOUtil.getCDOObject(detail1)));
order1.getOrderDetails().add(detail1);
- assertTrue(sp.getReattachedObjects().containsValue(CDOUtil.getCDOObject(detail1)));
+ assertEquals(true, sp.getReattachedObjects().containsValue(CDOUtil.getCDOObject(detail1)));
assertDirty(detail1, transaction);
sp.rollback();
@@ -112,7 +112,7 @@ public class Bugzilla_283985_SavePointTest extends AbstractCDOTest
assertTransient(detail1);
transaction.commit();
- assertFalse(order1.getOrderDetails().contains(detail1));
+ assertEquals(false, order1.getOrderDetails().contains(detail1));
}
public void test3() throws CommitException
@@ -138,7 +138,7 @@ public class Bugzilla_283985_SavePointTest extends AbstractCDOTest
transaction.commit();
- assertTrue(order1.getOrderDetails().contains(detail1));
+ assertEquals(true, order1.getOrderDetails().contains(detail1));
assertEquals(id, CDOUtil.getCDOObject(detail1).cdoID());
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java
index a26cf61102..4fc6e81d8c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java
@@ -56,11 +56,11 @@ public class Bugzilla_285008_Test extends AbstractCDOTest
r1.getContents().add(b);
a.getElements().add(b);
- assertTrue(a.isSetElements());
+ assertEquals(true, a.isSetElements());
tx.commit();
- assertTrue(a.isSetElements());
+ assertEquals(true, a.isSetElements());
tx.close();
session.close();
@@ -77,7 +77,7 @@ public class Bugzilla_285008_Test extends AbstractCDOTest
CDOResource r1 = tx.getResource(RESOURCENAME);
RefMultiNonContainedUnsettable a = (RefMultiNonContainedUnsettable)r1.getContents().get(0);
- assertTrue(a.isSetElements());
+ assertEquals(true, a.isSetElements());
tx.close();
session.close();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java
index ae0771fcc9..a7df4b1bce 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java
@@ -70,7 +70,7 @@ public class Bugzilla_294859_Test extends AbstractCDOTest
// The purchaseOrder was touched in both this and 2nd session;
// we refresh now go cause a conflict
session.refresh();
- assertTrue(cdoPurchaseOrder.cdoState() == CDOState.CONFLICT);
+ assertEquals(true, cdoPurchaseOrder.cdoState() == CDOState.CONFLICT);
// Touch it again
purchaseOrder.setDate(new Date(3000L));
@@ -80,10 +80,10 @@ public class Bugzilla_294859_Test extends AbstractCDOTest
CDOSavepointImpl savepoint = (CDOSavepointImpl)((InternalCDOTransaction)tx).getLastSavepoint();
CDORevisionDelta revDelta = savepoint.getRevisionDeltas().get(cdoPurchaseOrder.cdoID());
assertNotNull(revDelta);
- assertTrue(revDelta.getFeatureDeltas().size() == 1);
+ assertEquals(true, revDelta.getFeatureDeltas().size() == 1);
CDOFeatureDelta featDelta = revDelta.getFeatureDeltas().get(0);
EAttribute eAttr = getModel1Factory().getModel1Package().getPurchaseOrder_Date();
- assertTrue(featDelta instanceof CDOSetFeatureDelta);
+ assertEquals(true, featDelta instanceof CDOSetFeatureDelta);
CDOSetFeatureDelta setFeatDelta = (CDOSetFeatureDelta)featDelta;
assertSame(eAttr, setFeatDelta.getFeature());
assertSame(CDOFeatureDelta.Type.SET, setFeatDelta.getType());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_296561_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_296561_Test.java
index bd65f0d5e5..941db76f62 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_296561_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_296561_Test.java
@@ -136,7 +136,7 @@ public class Bugzilla_296561_Test extends AbstractCDOTest
transaction.setSavepoint();
res.getContents().remove(customer2);
transaction.rollback();
- assertFalse(res.getContents().contains(customer2));
+ assertEquals(false, res.getContents().contains(customer2));
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java
index 0e86bd356a..60606d8185 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java
@@ -66,6 +66,6 @@ public class Bugzilla_313326_Test extends AbstractCDOTest
tr1.merge(tr2.getBranch().getHead(), new DefaultCDOMerger.PerFeature());
tr1.commit();
- assertFalse(tr1.isDirty());
+ assertEquals(false, tr1.isDirty());
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
index 268ccf3f5d..72331bdb26 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
@@ -72,7 +72,7 @@ public class Bugzilla_314264_Test extends AbstractCDOTest
tr1.merge(tr2.getBranch().getHead(), new DefaultCDOMerger.PerFeature.ManyValued());
tr1.commit();
- assertFalse(tr1.isDirty());
+ assertEquals(false, tr1.isDirty());
}
public void testNotificationBuilderTest() throws Exception
@@ -118,7 +118,7 @@ public class Bugzilla_314264_Test extends AbstractCDOTest
tr1.commit();
Boolean indexWasCorrect = (Boolean)result.getResult();
- assertTrue(indexWasCorrect != null && indexWasCorrect.booleanValue());
+ assertEquals(true, indexWasCorrect != null && indexWasCorrect.booleanValue());
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java
index d5b840fa0f..04d42f88fb 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java
@@ -76,7 +76,7 @@ public class Bugzilla_324084_Test extends AbstractCDOTest
tr1.merge(tr2.getBranch().getHead(), new DefaultCDOMerger.PerFeature.ManyValued());
tr1.commit();
- assertFalse(tr1.isDirty());
+ assertEquals(false, tr1.isDirty());
}
public void testXRefMergeManyValueTest() throws Exception
@@ -113,6 +113,6 @@ public class Bugzilla_324084_Test extends AbstractCDOTest
tr1.merge(tr2.getBranch().getHead(), new DefaultCDOMerger.PerFeature.ManyValued());
tr1.commit();
- assertFalse(tr1.isDirty());
+ assertEquals(false, tr1.isDirty());
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java
index b164bf0676..fe64b6e6f5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java
@@ -39,11 +39,11 @@ public class Bugzilla_328790_Test extends AbstractCDOTest
EObject object = getModel1Factory().createAddress();
resource.getContents().add(object);
- assertTrue(resource.isLoaded());
+ assertEquals(true, resource.isLoaded());
tx.commit();
- assertTrue(resource.isLoaded());
+ assertEquals(true, resource.isLoaded());
tx.close();
session.close();
@@ -58,11 +58,11 @@ public class Bugzilla_328790_Test extends AbstractCDOTest
EObject object = getModel1Factory().createAddress();
resource.getContents().add(object);
- assertTrue(resource.isLoaded());
+ assertEquals(true, resource.isLoaded());
tx.commit();
- assertTrue(resource.isLoaded());
+ assertEquals(true, resource.isLoaded());
tx.close();
session.close();
@@ -76,11 +76,11 @@ public class Bugzilla_328790_Test extends AbstractCDOTest
CDOResource resource = tx.createResource("/myUri");
resource.getContents().clear();
- assertTrue(resource.isLoaded());
+ assertEquals(true, resource.isLoaded());
tx.commit();
- assertTrue(resource.isLoaded());
+ assertEquals(true, resource.isLoaded());
tx.close();
session.close();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java
index 95fc9bcb02..1e3ca37959 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java
@@ -108,9 +108,9 @@ public class Bugzilla_331619_Test extends AbstractCDOTest
String conName1 = (String)results.get(0).getSourceObject().eGet(conName);
String conName2 = (String)results.get(1).getSourceObject().eGet(conName);
- assertTrue(conName1.equals("con1") || conName1.equals("con2"));
- assertTrue(conName2.equals("con1") || conName2.equals("con2"));
- assertTrue(!conName1.equals(conName2));
+ assertEquals(true, conName1.equals("con1") || conName1.equals("con2"));
+ assertEquals(true, conName2.equals("con1") || conName2.equals("con2"));
+ assertEquals(true, !conName1.equals(conName2));
oRef = res.getContents().get(2);
assertEquals("ref2", oRef.eGet(refName));
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java
index 74922e1f11..7bb31030a6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java
@@ -57,7 +57,7 @@ public class CDOAuditDefImplTest extends AbstractCDOTest
CDOView cdoAudit = (CDOView)cdoAuditDef.getInstance();
EObject object = cdoAudit.getResource(RESOURCE_ID).getContents().get(0);
- assertTrue(object instanceof Customer && customerName.equals(customer.getName()));
+ assertEquals(true, object instanceof Customer && customerName.equals(customer.getName()));
}
public void testCreateAuditCreatesOnceAndReusesEvenOnChangedTimestamp()
@@ -77,6 +77,6 @@ public class CDOAuditDefImplTest extends AbstractCDOTest
calendar.roll(Calendar.SECOND, true);
cdoAuditDef.setTimeStamp(calendar.getTime());
CDOView thatCdoAuditReference = (CDOView)cdoAuditDef.getInstance();
- assertTrue(thisCdoAuditReference == thatCdoAuditReference);
+ assertEquals(true, thisCdoAuditReference == thatCdoAuditReference);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java
index 645827fc06..fd5ab8ac35 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java
@@ -38,9 +38,9 @@ public class CDOPackageRegistryDefImplTest extends AbstractCDOTest
EPackage.Registry packageRegistry = (EPackage.Registry)packageRegistryDef.getInstance();
EPackage ePackage1 = packageRegistry.getEPackage(getModel1Package().getNsURI());
- assertTrue(ePackage1 instanceof Model1Package);
+ assertEquals(true, ePackage1 instanceof Model1Package);
EPackage ePackage2 = packageRegistry.getEPackage(getModel2Package().getNsURI());
- assertTrue(ePackage2 instanceof Model2Package);
+ assertEquals(true, ePackage2 instanceof Model2Package);
}
private EGlobalPackageDef createEGlobalPackageDef(EPackage ePackage)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java
index 2c0859bb84..e4486b54e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java
@@ -73,7 +73,7 @@ public class CDOResourceDefImplTest extends AbstractCDOTest
}
catch (WrappedException e)
{
- assertTrue(e.getCause().getClass() == InvalidURIException.class);
+ assertEquals(true, e.getCause().getClass() == InvalidURIException.class);
}
finally
{
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java
index 305c285906..828ac4cfd0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java
@@ -66,6 +66,6 @@ public class CDOSessionDefImplTest extends AbstractCDOTest
cdoSessionDef.setRepositoryName(IRepositoryConfig.REPOSITORY_NAME);
cdoSessionDef.setCdoPackageRegistryDef(CDODefsUtil.createEagerPackageRegistryDef());
CDOSession cdoSession = (CDOSession)cdoSessionDef.getInstance();
- assertTrue(LifecycleUtil.isActive(cdoSession));
+ assertEquals(true, LifecycleUtil.isActive(cdoSession));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java
index a79d069703..a2cff222cb 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java
@@ -42,7 +42,7 @@ public class CDOTransactionDefImplTest extends AbstractCDOTest
CDOTransaction thisCdoTransactionReference = (CDOTransaction)transactionDef.getInstance();
CDOTransaction thatCdoTransactionReference = (CDOTransaction)transactionDef.getInstance();
- assertTrue(thisCdoTransactionReference == thatCdoTransactionReference);
+ assertEquals(true, thisCdoTransactionReference == thatCdoTransactionReference);
thisCdoTransactionReference.getSession().close();
}
@@ -58,7 +58,7 @@ public class CDOTransactionDefImplTest extends AbstractCDOTest
transactionInstance.close();
CDOTransaction newTransactionInstance = (CDOTransaction)cdoTransactionDef.getInstance();
- assertTrue(newTransactionInstance != transactionInstance);
+ assertEquals(true, newTransactionInstance != transactionInstance);
newTransactionInstance.getSession().close();
}
@@ -81,7 +81,7 @@ public class CDOTransactionDefImplTest extends AbstractCDOTest
transaction.commit();
CDOResource resourceFetched = transaction.getResource(TEST_RESOURCE);
- assertTrue(resourceFetched.eContents().contains(customer));
+ assertEquals(true, resourceFetched.eContents().contains(customer));
transaction.getSession().close();
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java
index 2f07a8b7ad..8309ecfde9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java
@@ -66,7 +66,7 @@ public class CDOViewDefImplTest extends AbstractCDOTest
public void testCreateView()
{
CDOView cdoView = (CDOView)cdoViewDef.getInstance();
- assertTrue(cdoView.isReadOnly());
+ assertEquals(true, cdoView.isReadOnly());
}
public void testCreateViewCreatesOnceAndReuses()
@@ -74,7 +74,7 @@ public class CDOViewDefImplTest extends AbstractCDOTest
CDOView thisCdoViewReference = (CDOView)cdoViewDef.getInstance();
CDOView thatCdoViewReference = (CDOView)cdoViewDef.getInstance();
- assertTrue(thisCdoViewReference == thatCdoViewReference);
+ assertEquals(true, thisCdoViewReference == thatCdoViewReference);
}
public void testViewCreatedCanRead() throws CommitException
@@ -93,7 +93,7 @@ public class CDOViewDefImplTest extends AbstractCDOTest
{
CDOView cdoView = (CDOView)cdoViewDef.getInstance();
cdoViewDef.unsetInstance(); // deactivates instance
- assertTrue(((CDOViewDefImpl)cdoViewDef).getInternalInstance() == null);
- assertTrue(!LifecycleUtil.isActive(cdoView));
+ assertEquals(true, ((CDOViewDefImpl)cdoViewDef).getInternalInstance() == null);
+ assertEquals(true, !LifecycleUtil.isActive(cdoView));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractCDORevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractCDORevisionCacheTest.java
index ab2301cae0..0404e89af2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractCDORevisionCacheTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractCDORevisionCacheTest.java
@@ -94,7 +94,7 @@ public abstract class AbstractCDORevisionCacheTest extends AbstractOMTest
CDOID cdoID = CDOUtil.getCDOObject(company).cdoID();
CDORevision fetchedCDORevision = revisionCache.getRevision(cdoID, BRANCH_POINT);
- assertTrue(CDOIDUtil.equals(cdoRevision.getID(), fetchedCDORevision.getID()));
+ assertEquals(true, CDOIDUtil.equals(cdoRevision.getID(), fetchedCDORevision.getID()));
}
private void addRevision(CDORevision revision)
@@ -126,7 +126,7 @@ public abstract class AbstractCDORevisionCacheTest extends AbstractOMTest
CDOID cdoID = company.cdoID();
CDORevision fetchedRevision = revisionCache.getRevision(cdoID, BRANCH_POINT);
- assertTrue(fetchedRevision.getRevised() == 0);
+ assertEquals(true, fetchedRevision.getRevised() == 0);
}
public void testFormerVersionIsGettable() throws Exception
@@ -146,8 +146,8 @@ public abstract class AbstractCDORevisionCacheTest extends AbstractOMTest
CDORevision fetchedRevision = revisionCache.getRevisionByVersion(cdoID,
BRANCH.getVersion(firstRevision.getVersion()));
assertNotNull(fetchedRevision);
- assertTrue(firstRevision.getID().equals(fetchedRevision.getID()));
- assertTrue(firstRevision.getVersion() == fetchedRevision.getVersion());
+ assertEquals(true, firstRevision.getID().equals(fetchedRevision.getID()));
+ assertEquals(true, firstRevision.getVersion() == fetchedRevision.getVersion());
}
public void testAddRevisionUpdatesRevisedTimeStampOfLastRevision() throws Exception
@@ -159,7 +159,7 @@ public abstract class AbstractCDORevisionCacheTest extends AbstractOMTest
addRevision(firstVersion);
CDORevision fetchedRevision = revisionCache.getRevision(cdoID, BRANCH_POINT);
- assertTrue(fetchedRevision.getRevised() == 0);
+ assertEquals(true, fetchedRevision.getRevised() == 0);
// add new version
company.setName("Andre");
@@ -169,9 +169,9 @@ public abstract class AbstractCDORevisionCacheTest extends AbstractOMTest
// fetch older version and check revised timestamp
fetchedRevision = revisionCache.getRevisionByVersion(cdoID, BRANCH.getVersion(firstVersion.getVersion()));
- assertTrue(fetchedRevision.getRevised() != 0);
- assertTrue(fetchedRevision.getRevised() < secondVersion.getTimeStamp());
- assertTrue(fetchedRevision.getRevised() == firstVersion.getRevised());
+ assertEquals(true, fetchedRevision.getRevised() != 0);
+ assertEquals(true, fetchedRevision.getRevised() < secondVersion.getTimeStamp());
+ assertEquals(true, fetchedRevision.getRevised() == firstVersion.getRevised());
}
public void testTheFormerRevisionOf2VersionsMayBeFetchedByTimestamp() throws Exception
@@ -195,8 +195,8 @@ public abstract class AbstractCDORevisionCacheTest extends AbstractOMTest
// fetch version by timstamp check version and ID equality
CDORevision fetchedRevision = revisionCache.getRevision(cdoID, BRANCH_POINT);
- assertTrue(secondRevision.getID().equals(fetchedRevision.getID()));
- assertTrue(secondRevision.getVersion() == fetchedRevision.getVersion());
+ assertEquals(true, secondRevision.getID().equals(fetchedRevision.getID()));
+ assertEquals(true, secondRevision.getVersion() == fetchedRevision.getVersion());
}
public void testGiven3ObjectsOf2TypesGetRevisionsReturns2Versions() throws Exception
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
index 6db1dc18a4..82a192aa62 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
@@ -517,7 +517,7 @@ public class TCPConnectorTest extends AbstractOMTest
channels[i] = c;
}
- assertTrue(queue.isEmpty());
+ assertEquals(true, queue.isEmpty());
assertNull(queue.peek());
assertNull(queue.poll());
@@ -542,7 +542,7 @@ public class TCPConnectorTest extends AbstractOMTest
assertSame(peek1, poll);
}
- assertTrue(queue.isEmpty());
+ assertEquals(true, queue.isEmpty());
assertNull(queue.peek());
assertNull(queue.poll());
}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java
index 2d07b3d270..fbb70453e3 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java
@@ -59,12 +59,12 @@ public class JVMAcceptorDefImplTest extends AbstractOMTest
IJVMAcceptor jvmAcceptor = (IJVMAcceptor)jvmAcceptorDef.getInstance();
- assertTrue(LifecycleUtil.isActive(jvmAcceptor));
+ assertEquals(true, LifecycleUtil.isActive(jvmAcceptor));
LifecycleUtil.activate(jvmConnector);
jvmConnector.waitForConnection(DELAY + TIMEOUT);
- assertTrue(LifecycleUtil.isActive(jvmConnector));
+ assertEquals(true, LifecycleUtil.isActive(jvmConnector));
LifecycleUtil.deactivate(jvmAcceptor);
}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java
index b9ea7be43a..2ff6bb6c1c 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java
@@ -55,7 +55,7 @@ public class JVMConnectorDefImplTest extends AbstractOMTest
jvmConnectorDef.setName(NAME);
IJVMConnector jvmConnector = (IJVMConnector)jvmConnectorDef.getInstance();
jvmConnector.connect(500L);
- assertTrue(jvmConnector.isConnected());
+ assertEquals(true, jvmConnector.isConnected());
LifecycleUtil.deactivate(jvmConnector);
LifecycleUtil.deactivate(jvmAcceptor);
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java
index 13ceb958d2..e1ac65843e 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java
@@ -59,11 +59,11 @@ public class TCPAcceptorDefImplTest extends AbstractOMTest
ITCPAcceptor tcpAcceptor = (ITCPAcceptor)tcpAcceptorDef.getInstance();
- assertTrue(LifecycleUtil.isActive(tcpAcceptor));
+ assertEquals(true, LifecycleUtil.isActive(tcpAcceptor));
LifecycleUtil.activate(tcpConnector);
tcpConnector.waitForConnection(DELAY + TIMEOUT);
- assertTrue(LifecycleUtil.isActive(tcpConnector));
+ assertEquals(true, LifecycleUtil.isActive(tcpConnector));
LifecycleUtil.deactivate(tcpAcceptor);
}
@@ -88,7 +88,7 @@ public class TCPAcceptorDefImplTest extends AbstractOMTest
tcpAcceptorDef.setNegotiator(challengeNegotiatorDef);
ITCPAcceptor tcpAcceptor = (ITCPAcceptor)tcpAcceptorDef.getInstance();
- assertTrue(LifecycleUtil.isActive(tcpAcceptor));
+ assertEquals(true, LifecycleUtil.isActive(tcpAcceptor));
Util.addNegotiator(USERID, PASSWORD, tcpConnector);
LifecycleUtil.activate(tcpConnector);
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java
index 3588690043..b7a5dacb37 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java
@@ -63,7 +63,7 @@ public class TCPConnectorDefImplTest extends AbstractProtocolTest
ITCPConnector tcpConnector = (ITCPConnector)tcpConnectorDef.getInstance();
tcpConnector.waitForConnection(DELAY + TIMEOUT);
- assertTrue(LifecycleUtil.isActive(tcpConnector));
+ assertEquals(true, LifecycleUtil.isActive(tcpConnector));
LifecycleUtil.deactivate(tcpConnector);
}
@@ -81,13 +81,13 @@ public class TCPConnectorDefImplTest extends AbstractProtocolTest
ITCPConnector thisTcpConnector = (ITCPConnector)tcpConnectorDef.getInstance();
tcpConnectorDef.setPort(PORT + 1);
- assertTrue(tcpConnectorDef.isTouched());
+ assertEquals(true, tcpConnectorDef.isTouched());
ITCPConnector thatTcpConnector = (ITCPConnector)tcpConnectorDef.getInstance();
- assertTrue(!LifecycleUtil.isActive(thisTcpConnector));
- assertTrue(!tcpConnectorDef.isTouched());
- assertTrue(thisTcpConnector != thatTcpConnector);
+ assertEquals(true, !LifecycleUtil.isActive(thisTcpConnector));
+ assertEquals(true, !tcpConnectorDef.isTouched());
+ assertEquals(true, thisTcpConnector != thatTcpConnector);
LifecycleUtil.deactivate(thisTcpConnector);
LifecycleUtil.deactivate(thatTcpConnector);
@@ -117,7 +117,7 @@ public class TCPConnectorDefImplTest extends AbstractProtocolTest
ITCPConnector tcpConnector = (ITCPConnector)tcpConnectorDef.getInstance();
tcpConnector.waitForConnection(DELAY + TIMEOUT);
- assertTrue(LifecycleUtil.isActive(tcpConnector));
+ assertEquals(true, LifecycleUtil.isActive(tcpConnector));
LifecycleUtil.deactivate(tcpConnector);
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
index c5f5b22510..1b33f0d3c6 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
@@ -250,6 +250,30 @@ public abstract class AbstractOMTest extends TestCase
{
}
+ @Deprecated
+ public static void assertTrue(String message, boolean condition)
+ {
+ throw new UnsupportedOperationException("Use assertEquals()");
+ }
+
+ @Deprecated
+ public static void assertTrue(boolean condition)
+ {
+ throw new UnsupportedOperationException("Use assertEquals()");
+ }
+
+ @Deprecated
+ public static void assertFalse(String message, boolean condition)
+ {
+ throw new UnsupportedOperationException("Use assertEquals()");
+ }
+
+ @Deprecated
+ public static void assertFalse(boolean condition)
+ {
+ throw new UnsupportedOperationException("Use assertEquals()");
+ }
+
public static void assertEquals(Object[] expected, Object[] actual)
{
if (!Arrays.deepEquals(expected, actual))
@@ -299,7 +323,8 @@ public abstract class AbstractOMTest extends TestCase
public static void assertInstanceOf(Class<?> expected, Object object)
{
- assertTrue("Not an instance of " + expected + ": " + object.getClass().getName(), expected.isInstance(object));
+ assertEquals("Not an instance of " + expected + ": " + object.getClass().getName(), true,
+ expected.isInstance(object));
}
public static void assertActive(Object object) throws InterruptedException
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java
index 279030e237..70b9aa6f5e 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java
@@ -288,8 +288,8 @@ public class MonitorTest extends AbstractOMTest
double newWork = main.getWork();
System.out.println(newWork);
- // assertTrue("Worked not enough: " + work, newWork > work);
- // assertTrue("Worked too much: " + newWork, newWork < OMMonitor.ONE + OMMonitor.ONE);
+ // assertEquals(true, "Worked not enough: " + work, newWork > work);
+ // assertEquals(true, "Worked too much: " + newWork, newWork < OMMonitor.ONE + OMMonitor.ONE);
work = newWork;
}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java
index ba48a03470..df92dd3ffd 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java
@@ -42,21 +42,21 @@ public class TestDefTest extends AbstractOMTest
{
Object thisInstance = def.getInstance();
Object thatInstance = def.getInstance();
- assertTrue(thisInstance == thatInstance);
+ assertEquals(true, thisInstance == thatInstance);
}
public void testInstanceCreatedIsActivated()
{
Object instance = def.getInstance();
- assertTrue(LifecycleUtil.isActive(instance));
+ assertEquals(true, LifecycleUtil.isActive(instance));
}
public void testInstanceDeactivatesIfUnset()
{
Object instance = def.getInstance();
def.unsetInstance();
- assertTrue(((DefImpl)def).getInternalInstance() == null);
- assertTrue(!LifecycleUtil.isActive(instance));
+ assertEquals(true, ((DefImpl)def).getInternalInstance() == null);
+ assertEquals(true, !LifecycleUtil.isActive(instance));
}
public void testNewInstanceIsCreatedIfDefWasTouchedAfterwards() throws Exception
@@ -78,7 +78,7 @@ public class TestDefTest extends AbstractOMTest
Object thisInstance = def.getInstance();
Object thatInstance = def.getInstance();
- assertTrue(thatInstance != thisInstance);
+ assertEquals(true, thatInstance != thisInstance);
}
public void testSameInstanceIfDefWasntTouched() throws Exception
@@ -100,39 +100,39 @@ public class TestDefTest extends AbstractOMTest
Object thisInstance = def.getInstance();
Object thatInstance = def.getInstance();
- assertTrue(thatInstance == thisInstance);
+ assertEquals(true, thatInstance == thisInstance);
}
public void testSetAttributeTouches()
{
TestDef def = createTestDef();
- assertTrue(!def.isTouched());
+ assertEquals(true, !def.isTouched());
def.setAttribute("aValue"); //$NON-NLS-1$
- assertTrue(def.isTouched());
+ assertEquals(true, def.isTouched());
def.getInstance(); // clears touched
- assertTrue(!def.isTouched());
+ assertEquals(true, !def.isTouched());
}
public void testAddReferenceTouches()
{
TestDef def = createTestDef();
- assertTrue(!def.isTouched());
+ assertEquals(true, !def.isTouched());
def.getReferences().add(createTestDef());
- assertTrue(def.isTouched());
+ assertEquals(true, def.isTouched());
}
public void testSetInReferencedDefTouchesReferenchingDef()
{
TestDef def = createTestDef();
- assertTrue(!def.isTouched());
+ assertEquals(true, !def.isTouched());
TestDef referencedDef = createTestDef();
def.getReferences().add(referencedDef);
- assertTrue(!referencedDef.isTouched());
+ assertEquals(true, !referencedDef.isTouched());
referencedDef.setAttribute("newValue"); //$NON-NLS-1$
- assertTrue(referencedDef.isTouched());
- assertTrue(def.isTouched());
+ assertEquals(true, referencedDef.isTouched());
+ assertEquals(true, def.isTouched());
}
public void testNewInstanceIsCreatedIfCurrentIsDeactivated() throws Exception
@@ -143,7 +143,7 @@ public class TestDefTest extends AbstractOMTest
// Wait until instance gets deactivated
thisInstance.waitForDeactivation();
BlockingToken thatInstance = (BlockingToken)def.getInstance();
- assertTrue(thatInstance != thisInstance);
+ assertEquals(true, thatInstance != thisInstance);
}
public void testNewInstanceIsCreatedIfCurrentIsUnset() throws Exception
@@ -154,7 +154,7 @@ public class TestDefTest extends AbstractOMTest
// Wait until instance gets deactivated
thisInstance.waitForDeactivation();
BlockingToken thatInstance = (BlockingToken)def.getInstance();
- assertTrue(thatInstance != thisInstance);
+ assertEquals(true, thatInstance != thisInstance);
}
private TestDef createTestDef()

Back to the top