From 551ea66ce3e6ea2bcee4cbc487099a5543b4a924 Mon Sep 17 00:00:00 2001 From: Bob Maertz Date: Sat, 20 Oct 2018 18:16:43 -0400 Subject: [PATCH] Migrated unit test TldTests.groovy to TldTests.java Moved unit test TldTests#testTldVersionIsCorrect from groovy to java. gh-4939 --- .../security/taglibs/TldTests.groovy | 17 ------- .../security/taglibs/TldTests.java | 49 +++++++++++++++++++ 2 files changed, 49 insertions(+), 17 deletions(-) delete mode 100644 taglibs/src/test/groovy/org/springframework/security/taglibs/TldTests.groovy create mode 100644 taglibs/src/test/java/org/springframework/security/taglibs/TldTests.java diff --git a/taglibs/src/test/groovy/org/springframework/security/taglibs/TldTests.groovy b/taglibs/src/test/groovy/org/springframework/security/taglibs/TldTests.groovy deleted file mode 100644 index 9f717b5866..0000000000 --- a/taglibs/src/test/groovy/org/springframework/security/taglibs/TldTests.groovy +++ /dev/null @@ -1,17 +0,0 @@ -package org.springframework.security.taglibs - -import groovy.util.slurpersupport.GPathResult -import spock.lang.Specification - - -class TldTests extends Specification { - - def "SEC-2324: tld version is correct"() { - when: - File securityTld = new File('src/main/resources/META-INF/security.tld') - GPathResult tldRoot = new XmlSlurper().parse(securityTld) - then: - String version = System.getProperty('springSecurityVersion'); - version.startsWith(tldRoot.'tlib-version'.text()) - } -} diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/TldTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/TldTests.java new file mode 100644 index 0000000000..7f3a852ef4 --- /dev/null +++ b/taglibs/src/test/java/org/springframework/security/taglibs/TldTests.java @@ -0,0 +1,49 @@ +/* + * Copyright 2002-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.security.taglibs; + +import org.junit.Test; +import org.w3c.dom.Document; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import java.io.File; + +import static org.assertj.core.api.Assertions.assertThat; + +public class TldTests { + + //SEC-2324 + @Test + public void testTldVersionIsCorrect() throws Exception{ + String SPRING_SECURITY_VERSION = "springSecurityVersion"; + + String version = System.getProperty(SPRING_SECURITY_VERSION); + + File securityTld = new File("src/main/resources/META-INF/security.tld"); + + DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + Document document = documentBuilder.parse(securityTld); + + String tlibVersion = document.getElementsByTagName("tlib-version").item(0).getTextContent(); + + assertThat(version).startsWith(tlibVersion); + } + + +}