From ce777513492e45dcc0f423e85deb5492cb208466 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Thu, 15 Jun 2017 13:16:19 +0300 Subject: [PATCH] Spring Constructor Injection falling test --- .../spring/core/gutter/autowiredConstructor/Bean.kt | 3 +++ .../autowiredConstructor/autowiredConstructor.test | 8 ++++++++ .../core/gutter/autowiredConstructor/config.xml | 11 +++++++++++ .../tests/gutter/AbstractSpringClassAnnotatorTest.kt | 3 ++- .../gutter/SpringClassAnnotatorTestGenerated.java | 8 +++++++- 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 ultimate/testData/spring/core/gutter/autowiredConstructor/Bean.kt create mode 100644 ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test create mode 100644 ultimate/testData/spring/core/gutter/autowiredConstructor/config.xml diff --git a/ultimate/testData/spring/core/gutter/autowiredConstructor/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredConstructor/Bean.kt new file mode 100644 index 00000000000..dca9968282c --- /dev/null +++ b/ultimate/testData/spring/core/gutter/autowiredConstructor/Bean.kt @@ -0,0 +1,3 @@ +import org.springframework.beans.factory.annotation.Autowired + +class Bean(val prop: String) \ No newline at end of file diff --git a/ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test b/ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test new file mode 100644 index 00000000000..37a60e3ce98 --- /dev/null +++ b/ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test @@ -0,0 +1,8 @@ +{ + springConfig: ["config.xml"], + file: "Bean.kt", + icon: "SpringBeanMethod", + tooltip: "Navigate to the spring bean ", + naming: "bean", + targets: ["bean"] +} \ No newline at end of file diff --git a/ultimate/testData/spring/core/gutter/autowiredConstructor/config.xml b/ultimate/testData/spring/core/gutter/autowiredConstructor/config.xml new file mode 100644 index 00000000000..e46abbb5d0f --- /dev/null +++ b/ultimate/testData/spring/core/gutter/autowiredConstructor/config.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt index 700b20efe15..99c7383d99d 100644 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt @@ -22,6 +22,7 @@ import com.google.gson.JsonParser import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import icons.SpringApiIcons +import junit.framework.Assert import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil @@ -72,7 +73,7 @@ abstract class AbstractSpringClassAnnotatorTest : KotlinLightCodeInsightFixtureT } val tooltip = config.getString("tooltip") - assert(gutterMark.tooltipText == tooltip) + Assert.assertEquals(tooltip, gutterMark.tooltipText) val naming = config.getString("naming") val targets = (config["targets"] as JsonArray).map { it.asString } diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java index 7df4e906b9d..49869c1ab6d 100644 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,6 +42,12 @@ public class SpringClassAnnotatorTestGenerated extends AbstractSpringClassAnnota doTest(fileName); } + @TestMetadata("autowiredConstructor/autowiredConstructor.test") + public void testAutowiredConstructor_AutowiredConstructor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/autowiredConstructor/autowiredConstructor.test"); + doTest(fileName); + } + @TestMetadata("autowiredProperty/autowiredProperty.test") public void testAutowiredProperty_AutowiredProperty() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test");