You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2018/01/14 07:50:27 UTC

atlas git commit: ATLAS-2363: DSL error on extraneous input (#2)

Repository: atlas
Updated Branches:
  refs/heads/master 97e47d24d -> bbdeaee3f


ATLAS-2363: DSL error on extraneous input (#2)

Signed-off-by: Madhan Neethiraj <ma...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/bbdeaee3
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/bbdeaee3
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/bbdeaee3

Branch: refs/heads/master
Commit: bbdeaee3f1b0d1adfe00ba7c9832e559192407cf
Parents: 97e47d2
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Sat Jan 13 23:50:09 2018 -0800
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Sat Jan 13 23:50:18 2018 -0800

----------------------------------------------------------------------
 .../atlas/web/integration/EntityDiscoveryJerseyResourceIT.java   | 4 ++--
 .../atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/bbdeaee3/webapp/src/test/java/org/apache/atlas/web/integration/EntityDiscoveryJerseyResourceIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/EntityDiscoveryJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/EntityDiscoveryJerseyResourceIT.java
index 90128a4..52b7a46 100755
--- a/webapp/src/test/java/org/apache/atlas/web/integration/EntityDiscoveryJerseyResourceIT.java
+++ b/webapp/src/test/java/org/apache/atlas/web/integration/EntityDiscoveryJerseyResourceIT.java
@@ -19,7 +19,7 @@
 package org.apache.atlas.web.integration;
 
 import com.sun.jersey.core.util.MultivaluedMapImpl;
-import org.apache.atlas.exception.AtlasBaseException;
+import org.apache.atlas.AtlasServiceException;
 import org.apache.atlas.model.discovery.AtlasSearchResult;
 import org.apache.atlas.model.discovery.AtlasSearchResult.AtlasFullTextResult;
 import org.apache.atlas.model.discovery.AtlasSearchResult.AtlasQueryType;
@@ -110,7 +110,7 @@ public class EntityDiscoveryJerseyResourceIT extends BaseResourceIT {
         assertEquals(searchResult.getEntities().size(), 1);
     }
 
-    @Test(expectedExceptions = AtlasBaseException.class)
+    @Test(expectedExceptions = AtlasServiceException.class)
     public void testSearchByDSLForUnknownType() throws Exception {
         String dslQuery = "from blah";
         AtlasSearchResult searchResult = atlasClientV2.dslSearch(dslQuery);

http://git-wip-us.apache.org/repos/asf/atlas/blob/bbdeaee3/webapp/src/test/java/org/apache/atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java
index f3a291a..1628718 100755
--- a/webapp/src/test/java/org/apache/atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java
+++ b/webapp/src/test/java/org/apache/atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java
@@ -25,7 +25,6 @@ import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 import org.apache.atlas.AtlasClient;
 import org.apache.atlas.AtlasServiceException;
-import org.apache.atlas.exception.AtlasBaseException;
 import org.apache.atlas.model.typedef.AtlasBaseTypeDef;
 import org.apache.atlas.v1.model.instance.Id;
 import org.apache.atlas.v1.model.instance.Referenceable;
@@ -134,7 +133,7 @@ public class MetadataDiscoveryJerseyResourceIT extends BaseResourceIT {
         }
     }
 
-    @Test(expectedExceptions = AtlasBaseException.class)
+    @Test(expectedExceptions = AtlasServiceException.class)
     public void testSearchByDSLForUnknownType() throws Exception {
         String dslQuery = "from blah";
         MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();