Fix travis log length (#1142)

yahoo · Jan 17, 2020 · 1eb3d57 · 1eb3d57
1 parent 404945c
commit 1eb3d57
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 15 deletions.
diff --git a/...ore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/BridgeableStoreTest.java b/...ore-multiplex/src/test/java/com/yahoo/elide/datastores/multiplex/BridgeableStoreTest.java
@@ -159,7 +159,6 @@ public void testFetchBridgeableStoreLoadSingleObjectToOne() {
                 .accept("application/vnd.api+json")
                 .get("/hibernateUser/1/specialAction")
                 .then()
-                .log().all()
                 .statusCode(HttpStatus.SC_OK)
                 .extract().body().asString();
 

diff --git a/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/models/Comment.java b/elide-example/elide-blog-example/src/main/java/com/yahoo/elide/example/models/Comment.java
@@ -7,8 +7,6 @@
 
 import com.yahoo.elide.annotation.ComputedAttribute;
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.SharePermission;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;

diff --git a/elide-example/elide-blog-example/src/test/java/com/yahoo/elide/example/ExampleTest.java b/elide-example/elide-blog-example/src/test/java/com/yahoo/elide/example/ExampleTest.java
@@ -60,7 +60,6 @@ void jsonApiTest() {
                                 )
                         ).toJSON())
                 )
-                .log().all()
                 .statusCode(HttpStatus.SC_OK);
     }
 

diff --git a/elide-graphql/src/main/java/com/yahoo/elide/graphql/ModelBuilder.java b/elide-graphql/src/main/java/com/yahoo/elide/graphql/ModelBuilder.java
@@ -234,7 +234,7 @@ private GraphQLObjectType buildQueryObject(Class<?> entityClass) {
             return queryObjectRegistry.get(entityClass);
         }
 
-        log.info("Building query object for {}", entityClass.getName());
+        log.debug("Building query object for {}", entityClass.getName());
 
         String entityName = dictionary.getJsonAliasFor(entityClass);
 

diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/IntegrationTest.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/IntegrationTest.java
@@ -103,6 +103,7 @@ protected final Server setUpServer() throws Exception {
         // setup RestAssured
         RestAssured.baseURI = "http://localhost/";
         RestAssured.basePath = "/";
+        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
 
         // port randomly picked in pom.xml
         String restassuredPort = System.getProperty("restassured.port", System.getenv("restassured.port"));

diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/EmbeddedIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/EmbeddedIT.java
@@ -90,7 +90,6 @@ void testOne2One() throws Exception {
                 .get("/right/1")
                 .then()
                 .statusCode(HttpStatus.SC_OK)
-                .log().all()
                 .extract()
                 .body().asString();
 

diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/ResourceIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/ResourceIT.java
@@ -530,7 +530,8 @@ public void testChild() throws Exception {
 
     @Test
     public void testSubCollectionRelationships() throws Exception {
-        given().when().get("/parent/1/children/1/relationships/parents").then().statusCode(HttpStatus.SC_OK)
+        given().when().get("/parent/1/children/1/relationships/parents").then()
+                .statusCode(HttpStatus.SC_OK)
                 .body(equalTo(
                         data(linkage(type("parent"), id("1"))).toJSON()));
     }
@@ -2160,7 +2161,6 @@ public void testNestedPatch() {
                 .body(req)
                 .patch("/parent")
                 .then()
-                .log().all()
                 .statusCode(HttpStatus.SC_OK)
                 .body(equalTo(expected));
     }

diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/triggers/LifeCycleHookIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/triggers/LifeCycleHookIT.java
@@ -52,10 +52,8 @@ public void testBillingServiceInvocation() {
                                 )
                         )
                 )
-                .log().all()
                 .post("/customerInvoice")
                 .then()
-                .log().all()
                 .statusCode(HttpStatus.SC_CREATED)
                 .body("data.id", equalTo("1"))
                 .body("data.attributes.total", equalTo(1100))

diff --git a/...-spring-boot-autoconfigure/src/test/java/com/yahoo/elide/spring/tests/ControllerTest.java b/...-spring-boot-autoconfigure/src/test/java/com/yahoo/elide/spring/tests/ControllerTest.java
@@ -55,7 +55,6 @@ public void jsonApiGetTest() {
         when()
                 .get("/json/group")
                 .then()
-                .log().all()
                 .body(equalTo(
                         data(
                                 resource(
@@ -72,7 +71,6 @@ public void jsonApiGetTest() {
                                 )
                         ).toJSON())
                 )
-                .log().all()
                 .statusCode(HttpStatus.SC_OK);
     }
 
@@ -99,7 +97,6 @@ public void jsonApiPatchTest() {
         when()
                 .get("/json/group")
                 .then()
-                .log().all()
                 .body(equalTo(
                         data(
                                 resource(
@@ -116,7 +113,6 @@ public void jsonApiPatchTest() {
                                 )
                         ).toJSON())
                 )
-                .log().all()
                 .statusCode(HttpStatus.SC_OK);
     }
 
@@ -275,7 +271,6 @@ public void graphqlTestForbiddenCreate() {
                         )
                         ).toQuery() + "\" }"
                 )
-                .log().all()
                 .when()
                 .post("/graphql")
                 .then()

diff --git a/...spring-boot-autoconfigure/src/test/java/com/yahoo/elide/spring/tests/IntegrationTest.java b/...spring-boot-autoconfigure/src/test/java/com/yahoo/elide/spring/tests/IntegrationTest.java
@@ -25,5 +25,6 @@ public class IntegrationTest {
     @BeforeAll
     public void setUp() {
         RestAssured.port = port;
+        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
     }
 }