From 895730caf9699fa7a258594678c28bd3acca44e8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll <snicoll@pivotal.io> Date: Sun, 7 Oct 2018 13:40:45 +0200 Subject: [PATCH] Simplify build definition --- pom.xml | 15 --------------- .../samples/petclinic/vet/VetControllerTests.java | 9 --------- 2 files changed, 24 deletions(-) diff --git a/pom.xml b/pom.xml index 1f7b9a2..1246219 100644 --- a/pom.xml +++ b/pom.xml @@ -218,21 +218,6 @@ </license> </licenses> - <profiles> - <profile> - <id>java11+</id> - <activation> - <jdk>[11,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - <repositories> <repository> <id>spring-snapshots</id> diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java index bd20ca7..21f2eda 100644 --- a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java @@ -1,6 +1,5 @@ package org.springframework.samples.petclinic.vet; -import static org.hamcrest.xml.HasXPath.hasXPath; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; @@ -67,12 +66,4 @@ public class VetControllerTests { .andExpect(jsonPath("$.vetList[0].id").value(1)); } - @Test - public void testShowVetListXml() throws Exception { - mockMvc.perform(get("/vets").accept(MediaType.APPLICATION_XML)) - .andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_XML_VALUE)) - .andExpect(content().node(hasXPath("/vets/vetList[id=1]/id"))); - } - } -- GitLab