You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2018/07/19 12:52:32 UTC
svn commit: r1836270 - in
/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document:
./ blob/ util/
Author: mreutegg
Date: Thu Jul 19 12:52:32 2018
New Revision: 1836270
URL: http://svn.apache.org/viewvc?rev=1836270&view=rev
Log:
OAK-7647: Replace usage of deprecated junit.framework.Assert
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreLimitsTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PathRevTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/MergeSortedIteratorsTest.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceTest.java?rev=1836270&r1=1836269&r2=1836270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceTest.java Thu Jul 19 12:52:32 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import static junit.framework.Assert.assertTrue;
-
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.HashSet;
@@ -31,6 +29,8 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
/**
* Test the BlobReferenceIterator.
*/
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java?rev=1836270&r1=1836269&r2=1836270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java Thu Jul 19 12:52:32 2018
@@ -43,7 +43,6 @@ import com.mongodb.BasicDBObject;
import com.mongodb.DBCollection;
import com.mongodb.ReadPreference;
-import junit.framework.Assert;
import org.apache.commons.io.filefilter.FileFilterUtils;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.commons.FileIOUtils;
@@ -154,7 +153,7 @@ public class MongoBlobGCTest extends Abs
VersionGarbageCollector vGC = s.getVersionGarbageCollector();
VersionGCStats stats = vGC.gc(0, TimeUnit.MILLISECONDS);
- Assert.assertEquals(processed.size(), stats.deletedDocGCCount);
+ assertEquals(processed.size(), stats.deletedDocGCCount);
}
return state;
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java?rev=1836270&r1=1836269&r2=1836270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java Thu Jul 19 12:52:32 2018
@@ -28,12 +28,12 @@ import org.junit.Test;
import com.google.common.collect.Maps;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Tests {@code MongoDocumentStore} with concurrent updates.
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreLimitsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreLimitsTest.java?rev=1836270&r1=1836269&r2=1836270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreLimitsTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreLimitsTest.java Thu Jul 19 12:52:32 2018
@@ -26,7 +26,7 @@ import org.junit.Test;
import com.google.common.base.Strings;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
/**
* Test for OAK-1589
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java?rev=1836270&r1=1836269&r2=1836270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java Thu Jul 19 12:52:32 2018
@@ -29,7 +29,8 @@ import org.junit.Test;
import java.util.List;
import java.util.Set;
-import static junit.framework.Assert.assertNotNull;
+
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PathRevTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PathRevTest.java?rev=1836270&r1=1836269&r2=1836270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PathRevTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PathRevTest.java Thu Jul 19 12:52:32 2018
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.plugin
import org.junit.Test;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertEquals;
public class PathRevTest {
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java?rev=1836270&r1=1836269&r2=1836270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java Thu Jul 19 12:52:32 2018
@@ -31,13 +31,10 @@ import java.util.Random;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.MoreExecutors;
-import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.core.data.DataStore;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.plugins.blob.BlobGarbageCollector;
@@ -64,6 +61,9 @@ import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Test for gc in a shared data store among hetrogeneous oak node stores.
*/
@@ -136,8 +136,9 @@ public class SharedBlobStoreGCTest {
// Execute the gc with sweep
cluster1.gc.collectGarbage(false);
- Assert.assertEquals(true, Sets.symmetricDifference(Sets.union(cluster1.getInitBlobs(), cluster2.getInitBlobs()),
- cluster1.getExistingBlobIds()).isEmpty());
+ assertTrue(Sets.symmetricDifference(
+ Sets.union(cluster1.getInitBlobs(), cluster2.getInitBlobs()),
+ cluster1.getExistingBlobIds()).isEmpty());
}
@Test
@@ -152,8 +153,9 @@ public class SharedBlobStoreGCTest {
// Execute the gc with sweep
cluster1.gc.collectGarbage(false);
- Assert.assertEquals(true, Sets.symmetricDifference(Sets.union(cluster1.getInitBlobs(), cluster2.getInitBlobs()),
- cluster1.getExistingBlobIds()).isEmpty());
+ assertTrue(Sets.symmetricDifference(
+ Sets.union(cluster1.getInitBlobs(), cluster2.getInitBlobs()),
+ cluster1.getExistingBlobIds()).isEmpty());
}
@Test
@@ -177,14 +179,14 @@ public class SharedBlobStoreGCTest {
for (GarbageCollectionRepoStats stat : statsList) {
observedNumBlobs.add(stat.getNumLines());
observedRepoIds.add(stat.getRepositoryId());
- Assert.assertTrue(stat.getStartTime() <= stat.getEndTime());
+ assertTrue(stat.getStartTime() <= stat.getEndTime());
if (stat.getRepositoryId().equals(cluster1.repoId)) {
- Assert.assertTrue(stat.isLocal());
+ assertTrue(stat.isLocal());
}
}
- Assert.assertTrue(Sets.difference(actualNumBlobs, observedNumBlobs).isEmpty());
- Assert.assertTrue(Sets.difference(actualRepoIds, observedRepoIds).isEmpty());
+ assertTrue(Sets.difference(actualNumBlobs, observedNumBlobs).isEmpty());
+ assertTrue(Sets.difference(actualRepoIds, observedRepoIds).isEmpty());
}
@Test
@@ -200,9 +202,9 @@ public class SharedBlobStoreGCTest {
Set<String> existing = cluster1.getExistingBlobIds();
log.debug("Existing blobs {}", existing);
- Assert.assertTrue((cluster1.getInitBlobs().size() + cluster2.getInitBlobs().size()) <= existing.size());
- Assert.assertTrue(existing.containsAll(cluster2.getInitBlobs()));
- Assert.assertTrue(existing.containsAll(cluster1.getInitBlobs()));
+ assertTrue((cluster1.getInitBlobs().size() + cluster2.getInitBlobs().size()) <= existing.size());
+ assertTrue(existing.containsAll(cluster2.getInitBlobs()));
+ assertTrue(existing.containsAll(cluster1.getInitBlobs()));
}
@Test
@@ -217,7 +219,7 @@ public class SharedBlobStoreGCTest {
// Execute the gc with sweep
cluster2.gc.collectGarbage(false);
- Assert.assertTrue(Sets.symmetricDifference(
+ assertTrue(Sets.symmetricDifference(
Sets.union(cluster1.getInitBlobs(), cluster2.getInitBlobs()),
cluster1.getExistingBlobIds()).isEmpty());
}
@@ -301,7 +303,7 @@ public class SharedBlobStoreGCTest {
VersionGarbageCollector vGC = ds.getVersionGarbageCollector();
VersionGCStats stats = vGC.gc(0, TimeUnit.MILLISECONDS);
- Assert.assertEquals(deletes.size(), stats.deletedDocGCCount);
+ assertEquals(deletes.size(), stats.deletedDocGCCount);
sleep();
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java?rev=1836270&r1=1836269&r2=1836270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java Thu Jul 19 12:52:32 2018
@@ -19,12 +19,13 @@ package org.apache.jackrabbit.oak.plugin
import java.io.ByteArrayInputStream;
import java.util.Arrays;
-import junit.framework.Assert;
-
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests for {@code MongoMicroKernel#read(String, long, byte[], int, int)}
*/
@@ -55,23 +56,23 @@ public class DocumentMKReadGridFSTest ex
// Complete read.
byte[] buffer = new byte[blob.length];
int totalBytes = mk.read(blobId, 0, buffer, 0, blob.length);
- Assert.assertEquals(blob.length, totalBytes);
- Assert.assertTrue(Arrays.equals(blob, buffer));
+ assertEquals(blob.length, totalBytes);
+ assertTrue(Arrays.equals(blob, buffer));
// Range end from end.
buffer = new byte[blob.length / 2];
totalBytes = mk.read(blobId, (blob.length / 2) - 1, buffer, 0, blob.length / 2);
- Assert.assertEquals(blob.length / 2, totalBytes);
+ assertEquals(blob.length / 2, totalBytes);
for (int i = 0; i < buffer.length; i++) {
- Assert.assertEquals(blob[((blob.length / 2) - 1) + i], buffer[i]);
+ assertEquals(blob[((blob.length / 2) - 1) + i], buffer[i]);
}
// Range from start.
buffer = new byte[blob.length / 2];
totalBytes = mk.read(blobId, 0, buffer, 0, blob.length / 2);
- Assert.assertEquals(blob.length / 2, totalBytes);
+ assertEquals(blob.length / 2, totalBytes);
for (int i = 0; i < buffer.length; i++) {
- Assert.assertEquals(blob[i], buffer[i]);
+ assertEquals(blob[i], buffer[i]);
}
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java?rev=1836270&r1=1836269&r2=1836270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java Thu Jul 19 12:52:32 2018
@@ -19,11 +19,12 @@ package org.apache.jackrabbit.oak.plugin
import java.io.ByteArrayInputStream;
import java.util.Arrays;
-import junit.framework.Assert;
-
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests for {@code MongoMicroKernel#read(String, long, byte[], int, int)}
*/
@@ -54,8 +55,8 @@ public class DocumentMKReadTest extends
// Complete read.
byte[] buffer = readFully(mk, blobId);
- Assert.assertEquals(blob.length, buffer.length);
- Assert.assertTrue(Arrays.equals(blob, buffer));
+ assertEquals(blob.length, buffer.length);
+ assertTrue(Arrays.equals(blob, buffer));
if (skipRangeTests) {
return;
@@ -64,21 +65,21 @@ public class DocumentMKReadTest extends
// Range end from end.
buffer = new byte[blob.length / 2];
int totalBytes = mk.read(blobId, (blob.length / 2) - 1, buffer, 0, blob.length / 2);
- Assert.assertEquals(blob.length / 2, totalBytes);
+ assertEquals(blob.length / 2, totalBytes);
for (int i = 0; i < buffer.length; i++) {
- Assert.assertEquals(blob[((blob.length / 2) - 1) + i], buffer[i]);
+ assertEquals(blob[((blob.length / 2) - 1) + i], buffer[i]);
}
// Range from start.
buffer = new byte[blob.length / 2];
totalBytes = mk.read(blobId, 0, buffer, 0, blob.length / 2);
- Assert.assertEquals(blob.length / 2, totalBytes);
+ assertEquals(blob.length / 2, totalBytes);
for (int i = 0; i < buffer.length; i++) {
- Assert.assertEquals(blob[i], buffer[i]);
+ assertEquals(blob[i], buffer[i]);
}
}
- private void createAndWriteBlob(int blobLength) throws Exception {
+ private void createAndWriteBlob(int blobLength) {
blob = new byte[blobLength];
for (int i = 0; i < blob.length; i++) {
blob[i] = (byte) 1;
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/MergeSortedIteratorsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/MergeSortedIteratorsTest.java?rev=1836270&r1=1836269&r2=1836270&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/MergeSortedIteratorsTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/MergeSortedIteratorsTest.java Thu Jul 19 12:52:32 2018
@@ -27,7 +27,7 @@ import org.junit.Test;
import com.google.common.collect.Lists;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
/**
* Tests for {@link MergeSortedIterators}.