ATLAS-2897: Better handling of empty zip files. Unit test fix.
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/7ffbec1a Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/7ffbec1a Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/7ffbec1a Branch: refs/heads/master Commit: 7ffbec1a2a16f5288fff27d5bb81254d3280a900 Parents: 016eaff Author: Ashutosh Mestry <ames...@hortonworks.com> Authored: Thu Oct 4 15:30:13 2018 -0700 Committer: Ashutosh Mestry <ames...@hortonworks.com> Committed: Thu Oct 11 17:21:30 2018 -0700 ---------------------------------------------------------------------- .../atlas/repository/impexp/ExportServiceTest.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/7ffbec1a/repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java b/repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java index 7886a64..9f72f1b 100644 --- a/repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/impexp/ExportServiceTest.java @@ -218,7 +218,7 @@ public class ExportServiceTest extends ExportImportTestBase { assertNotNull(result.getSourceClusterName()); } - @Test + @Test(expectedExceptions = AtlasBaseException.class) public void requestingEntityNotFound_NoData() throws AtlasBaseException, IOException { String requestingIP = "1.0.0.0"; String hostName = "root"; @@ -231,11 +231,7 @@ public class ExportServiceTest extends ExportImportTestBase { Assert.assertNull(result.getData()); ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - ZipSource zipSource = new ZipSource(bais); - - assertNotNull(exportService); - assertNotNull(zipSource.getCreationOrder()); - Assert.assertFalse(zipSource.hasNext()); + new ZipSource(bais); } @Test @@ -306,14 +302,11 @@ public class ExportServiceTest extends ExportImportTestBase { AtlasExportResult.OperationStatus.FAIL)); } - @Test + @Test(expectedExceptions = AtlasBaseException.class) public void requestingExportOfNonExistentEntity_ReturnsFailure() throws Exception { AtlasExportRequest request = getRequestForEmployee(); tamperEmployeeRequest(request); - ZipSource zipSource = runExportWithParameters(request); - - assertNotNull(zipSource.getCreationOrder()); - assertEquals(zipSource.getCreationOrder().size(), 0); + runExportWithParameters(request); } @Test