fix tests

kleis-technology · Feb 12, 2024 · 46dbd18 · 46dbd18
1 parent 61b6ef6
commit 46dbd18
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 66 deletions.
diff --git a/plugin/src/main/kotlin/ch/kleis/lcaac/plugin/language/Lca.bnf b/plugin/src/main/kotlin/ch/kleis/lcaac/plugin/language/Lca.bnf
@@ -148,7 +148,7 @@ test ::= 'test' testRef '{'
 }
 given ::= 'given' '{' technoInputExchange *'}'
 assert ::= 'assert' '{' rangeAssertion* '}'
-rangeAssertion ::= uid 'between'  dataExpression 'and' dataExpression { pin=1 }
+rangeAssertion ::= uid 'between'  dataExpression 'and' dataExpression { pin=2 }
 
 /*
     Substance

diff --git a/...src/test/kotlin/ch/kleis/lcaac/plugin/language/ide/insight/LcaBioExchangeAnnotatorTest.kt b/...src/test/kotlin/ch/kleis/lcaac/plugin/language/ide/insight/LcaBioExchangeAnnotatorTest.kt
@@ -1,9 +1,6 @@
 package ch.kleis.lcaac.plugin.language.ide.insight
 
-import ch.kleis.lcaac.core.lang.expression.EBioBlockEntry
-import ch.kleis.lcaac.core.math.basic.BasicNumber
 import ch.kleis.lcaac.plugin.language.psi.stub.process.ProcessStubKeyIndex
-import ch.kleis.lcaac.plugin.psi.LcaTerminalBioExchange
 import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
@@ -50,7 +47,7 @@ class LcaBioExchangeAnnotatorTest : BasePlatformTestCase() {
                 """unresolved substance co2(compartment="air")"""
             )
         }
-        verify { mock.builder.range(element.substanceSpec) }
+        verify { mock.builder.range(element.substanceSpec!!) }
         verify { mock.builder.highlightType(ProblemHighlightType.WARNING) }
         verify { mock.builder.create() }
     }

diff --git a/...in/src/test/kotlin/ch/kleis/lcaac/plugin/language/ide/insight/LcaDocumentGeneratorTest.kt b/...in/src/test/kotlin/ch/kleis/lcaac/plugin/language/ide/insight/LcaDocumentGeneratorTest.kt
@@ -409,7 +409,7 @@ class LcaDocumentGeneratorTest : BasePlatformTestCase() {
         val ref = file
             .getProcesses().first()
             .getProducts().first()
-            .outputProductSpec
+            .outputProductSpec!!
         // When
         val actual = generateProduct(ref)
         // Then
@@ -428,4 +428,4 @@ class LcaDocumentGeneratorTest : BasePlatformTestCase() {
             """.trimIndent(), actual
         )
     }
-}
+}
diff --git a/...ch/kleis/lcaac/plugin/language/ide/insight/LcaTerminalTechnoInputExchangeAnnotatorTest.kt b/...ch/kleis/lcaac/plugin/language/ide/insight/LcaTerminalTechnoInputExchangeAnnotatorTest.kt
@@ -43,7 +43,7 @@ class LcaTerminalTechnoInputExchangeAnnotatorTest : BasePlatformTestCase() {
 
         // then
         verify { mock.holder.newAnnotation(HighlightSeverity.WARNING, "Could not resolve carrot") }
-        verify { mock.builder.range(element.inputProductSpec) }
+        verify { mock.builder.range(element.inputProductSpec!!) }
         verify { mock.builder.highlightType(ProblemHighlightType.WARNING) }
         verify { mock.builder.create() }
     }
@@ -86,7 +86,7 @@ class LcaTerminalTechnoInputExchangeAnnotatorTest : BasePlatformTestCase() {
 
         // then
         verify { mock.holder.newAnnotation(HighlightSeverity.WARNING, "Multiple candidates found for carrot") }
-        verify { mock.builder.range(element.inputProductSpec) }
+        verify { mock.builder.range(element.inputProductSpec!!) }
         verify { mock.builder.highlightType(ProblemHighlightType.WARNING) }
         verify { mock.builder.create() }
     }

diff --git a/plugin/src/test/kotlin/ch/kleis/lcaac/plugin/language/ide/syntax/LanguageCompletionTest.kt b/plugin/src/test/kotlin/ch/kleis/lcaac/plugin/language/ide/syntax/LanguageCompletionTest.kt
@@ -379,30 +379,4 @@ test t4 {
             "between"
         )
     }
-
-    @Test
-    fun lookup_whenInRangeAssertion_forAnd() {
-        // Given
-        val filename = "${{}.javaClass.enclosingMethod.name}.lca"
-        fixture.configureByText(
-            filename, """
-test t4 {
-    assert {
-       GWP between 20 kg <caret>
-    }
-}
-"""
-        )
-        fixture.complete(CompletionType.BASIC)
-
-        // When
-        val lookupElementStrings = fixture.lookupElementStrings
-
-        // Then
-        assertNotNull(lookupElementStrings)
-        assertSameElements(
-            lookupElementStrings!!,
-            "and"
-        )
-    }
 }
diff --git a/plugin/src/test/kotlin/ch/kleis/lcaac/plugin/language/loader/DefaultRefFileResolverTest.kt b/plugin/src/test/kotlin/ch/kleis/lcaac/plugin/language/loader/DefaultRefFileResolverTest.kt
@@ -36,7 +36,7 @@ class DefaultRefFileResolverTest : BasePlatformTestCase() {
             .getInputs().first().terminalTechnoInputExchange!!
         val target = element
             .inputProductSpec
-            .getProcessTemplateSpec()!!
+            ?.getProcessTemplateSpec()!!
         myFixture.createFile(
             "$pkgName.left.lca", """
                 package $pkgName.left

diff --git a/...ch/kleis/lcaac/plugin/language/psi/reference/DataRefExactNameMatcherScopeProcessorTest.kt b/...ch/kleis/lcaac/plugin/language/psi/reference/DataRefExactNameMatcherScopeProcessorTest.kt
@@ -140,7 +140,7 @@ class DataRefExactNameMatcherScopeProcessorTest : ParsingTestCase("", "lca", Lca
         val assignment = process.getLabelsList().first().labelAssignmentList.first()
         val element = process.getInputs().first().terminalTechnoInputExchange!!
         val dataRef = element
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getMatchLabels()!!
             .labelSelectorList.first()

diff --git a/plugin/src/test/kotlin/ch/kleis/lcaac/plugin/language/psi/reference/DataReferenceTest.kt b/plugin/src/test/kotlin/ch/kleis/lcaac/plugin/language/psi/reference/DataReferenceTest.kt
@@ -151,7 +151,7 @@ class DataReferenceTest : BasePlatformTestCase() {
         val element = process
             .getInputs().first().terminalTechnoInputExchange!!
         val ref = element
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .argumentList.first()
             .parameterRef

diff --git a/plugin/src/test/kotlin/ch/kleis/lcaac/plugin/language/psi/reference/LabelReferenceTest.kt b/plugin/src/test/kotlin/ch/kleis/lcaac/plugin/language/psi/reference/LabelReferenceTest.kt
@@ -69,7 +69,7 @@ class LabelReferenceTest : BasePlatformTestCase() {
             project, "$pkgName.p",
         ).first().getInputs().first().terminalTechnoInputExchange!!
         val ref = element
-            .inputProductSpec.getProcessTemplateSpec()!!
+            .inputProductSpec!!.getProcessTemplateSpec()!!
             .getMatchLabels()!!.labelSelectorList.first()
             .labelRef
 

diff --git a/...in/src/test/kotlin/ch/kleis/lcaac/plugin/language/psi/reference/ParameterReferenceTest.kt b/...in/src/test/kotlin/ch/kleis/lcaac/plugin/language/psi/reference/ParameterReferenceTest.kt
@@ -51,7 +51,7 @@ class ParameterReferenceTest : BasePlatformTestCase() {
         val process = ProcessStubKeyIndex.findProcesses(project, fqn).first()
         val element = process.getInputs().first().terminalTechnoInputExchange!!
         val ref = element
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .argumentList.first()
             .parameterRef
@@ -100,7 +100,7 @@ class ParameterReferenceTest : BasePlatformTestCase() {
         val process = ProcessStubKeyIndex.findProcesses(project, fqn).first()
         val first = process.getInputs().first().terminalTechnoInputExchange!!
         val ref = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .argumentList.first()
             .parameterRef

diff --git a/...lin/ch/kleis/lcaac/plugin/language/psi/reference/ProcessReferenceFromPsiProcessRefTest.kt b/...lin/ch/kleis/lcaac/plugin/language/psi/reference/ProcessReferenceFromPsiProcessRefTest.kt
@@ -1,7 +1,6 @@
 package ch.kleis.lcaac.plugin.language.psi.reference
 
 import ch.kleis.lcaac.plugin.language.psi.stub.process.ProcessStubKeyIndex
-import ch.kleis.lcaac.plugin.psi.LcaTerminalTechnoInputExchange
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import junit.framework.TestCase
@@ -62,7 +61,7 @@ class ProcessReferenceFromPsiProcessRefTest : BasePlatformTestCase() {
         val element = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val ref = element
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getProcessRef()
 
@@ -140,7 +139,7 @@ class ProcessReferenceFromPsiProcessRefTest : BasePlatformTestCase() {
         val first = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val ref = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getProcessRef()
 

diff --git a/...eis/lcaac/plugin/language/psi/reference/ProcessReferenceFromPsiProcessTemplateSpecTest.kt b/...eis/lcaac/plugin/language/psi/reference/ProcessReferenceFromPsiProcessTemplateSpecTest.kt
@@ -1,7 +1,6 @@
 package ch.kleis.lcaac.plugin.language.psi.reference
 
 import ch.kleis.lcaac.plugin.language.psi.stub.process.ProcessStubKeyIndex
-import ch.kleis.lcaac.plugin.psi.LcaTerminalTechnoInputExchange
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import junit.framework.TestCase
@@ -61,7 +60,7 @@ class ProcessReferenceFromPsiProcessTemplateSpecTest : BasePlatformTestCase() {
         val element = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val ref = element
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
 
         // when
@@ -139,7 +138,7 @@ class ProcessReferenceFromPsiProcessTemplateSpecTest : BasePlatformTestCase() {
         val first = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val ref = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
 
         // when

diff --git a/...ch/kleis/lcaac/plugin/language/psi/reference/SubstanceReferenceFromPsiSubstanceRefTest.kt b/...ch/kleis/lcaac/plugin/language/psi/reference/SubstanceReferenceFromPsiSubstanceRefTest.kt
@@ -3,7 +3,6 @@ package ch.kleis.lcaac.plugin.language.psi.reference
 import ch.kleis.lcaac.core.lang.expression.SubstanceType
 import ch.kleis.lcaac.plugin.language.psi.stub.process.ProcessStubKeyIndex
 import ch.kleis.lcaac.plugin.language.psi.stub.substance.SubstanceKeyIndex
-import ch.kleis.lcaac.plugin.psi.LcaTerminalBioExchange
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -68,7 +67,7 @@ class SubstanceReferenceFromPsiSubstanceRefTest : BasePlatformTestCase() {
         val element = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getEmissions().first().terminalBioExchange!!
         val ref = element
-            .substanceSpec
+            .substanceSpec!!
             .getSubstanceRef()
 
         // when

diff --git a/...h/kleis/lcaac/plugin/language/psi/reference/SubstanceReferenceFromPsiSubstanceSpecTest.kt b/...h/kleis/lcaac/plugin/language/psi/reference/SubstanceReferenceFromPsiSubstanceSpecTest.kt
@@ -2,7 +2,6 @@ package ch.kleis.lcaac.plugin.language.psi.reference
 
 import ch.kleis.lcaac.plugin.language.psi.stub.process.ProcessStubKeyIndex
 import ch.kleis.lcaac.plugin.language.psi.stub.substance.SubstanceKeyIndex
-import ch.kleis.lcaac.plugin.psi.LcaTerminalBioExchange
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import junit.framework.TestCase
@@ -64,7 +63,7 @@ class SubstanceReferenceFromPsiSubstanceSpecTest : BasePlatformTestCase() {
             .getSubstanceSpec()
 
         // when
-        val actual = substanceSpec.reference?.resolve()
+        val actual = substanceSpec?.reference?.resolve()
 
         // then
         val expected = SubstanceKeyIndex.Util.findSubstances(
@@ -122,7 +121,7 @@ class SubstanceReferenceFromPsiSubstanceSpecTest : BasePlatformTestCase() {
             .getSubstanceSpec()
 
         // when
-        val actual = substanceSpec.reference?.resolve()
+        val actual = substanceSpec?.reference?.resolve()
 
         // then
         assertNull(actual)
@@ -174,7 +173,7 @@ class SubstanceReferenceFromPsiSubstanceSpecTest : BasePlatformTestCase() {
             .getSubstanceSpec()
 
         // when
-        val actual = substanceSpec.reference?.resolve()
+        val actual = substanceSpec?.reference?.resolve()
 
         // then
         val expected = SubstanceKeyIndex.Util.findSubstances(
@@ -232,7 +231,7 @@ class SubstanceReferenceFromPsiSubstanceSpecTest : BasePlatformTestCase() {
             .getSubstanceSpec()
 
         // when
-        val actual = spec.reference
+        val actual = spec?.reference
             ?.variants?.map { (it as LookupElementBuilder).lookupString }
             ?.sorted() ?: emptyList()
 

diff --git a/...rc/test/kotlin/ch/kleis/lcaac/plugin/language/type_checker/LcaMatchLabelsEvaluatorTest.kt b/...rc/test/kotlin/ch/kleis/lcaac/plugin/language/type_checker/LcaMatchLabelsEvaluatorTest.kt
@@ -1,11 +1,13 @@
 package ch.kleis.lcaac.plugin.language.type_checker
 
 import ch.kleis.lcaac.plugin.language.psi.stub.process.ProcessStubKeyIndex
-import ch.kleis.lcaac.plugin.psi.LcaTerminalTechnoInputExchange
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
 import kotlin.test.assertFailsWith
 
+@RunWith(JUnit4::class)
 class LcaMatchLabelsEvaluatorTest : BasePlatformTestCase() {
     override fun getTestDataPath(): String {
         return ""
@@ -29,7 +31,7 @@ class LcaMatchLabelsEvaluatorTest : BasePlatformTestCase() {
         val element = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val labels = element
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getMatchLabels()!!
         val sut = LcaMatchLabelsEvaluator()
@@ -63,7 +65,7 @@ class LcaMatchLabelsEvaluatorTest : BasePlatformTestCase() {
         val first = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val labels = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getMatchLabels()!!
         val sut = LcaMatchLabelsEvaluator()
@@ -97,7 +99,7 @@ class LcaMatchLabelsEvaluatorTest : BasePlatformTestCase() {
         val first = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val labels = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getMatchLabels()!!
         val sut = LcaMatchLabelsEvaluator()
@@ -135,7 +137,7 @@ class LcaMatchLabelsEvaluatorTest : BasePlatformTestCase() {
         ).first()
             .getInputs().first().terminalTechnoInputExchange!!
         val labels = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getMatchLabels()!!
         val sut = LcaMatchLabelsEvaluator()
@@ -173,7 +175,7 @@ class LcaMatchLabelsEvaluatorTest : BasePlatformTestCase() {
         ).first()
             .getInputs().first().terminalTechnoInputExchange!!
         val labels = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getMatchLabels()!!
         val sut = LcaMatchLabelsEvaluator()
@@ -213,7 +215,7 @@ class LcaMatchLabelsEvaluatorTest : BasePlatformTestCase() {
         ).first()
             .getInputs().first().terminalTechnoInputExchange!!
         val labels = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getMatchLabels()!!
         val sut = LcaMatchLabelsEvaluator()
@@ -248,7 +250,7 @@ class LcaMatchLabelsEvaluatorTest : BasePlatformTestCase() {
         ).first()
             .getInputs().first().terminalTechnoInputExchange!!
         val labels = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getMatchLabels()!!
         val sut = LcaMatchLabelsEvaluator()
@@ -279,7 +281,7 @@ class LcaMatchLabelsEvaluatorTest : BasePlatformTestCase() {
         ).first()
             .getInputs().first().terminalTechnoInputExchange!!
         val labels = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getMatchLabels()!!
         val sut = LcaMatchLabelsEvaluator()

diff --git a/plugin/src/test/kotlin/ch/kleis/lcaac/plugin/language/type_checker/PsiLcaTypeCheckerTest.kt b/plugin/src/test/kotlin/ch/kleis/lcaac/plugin/language/type_checker/PsiLcaTypeCheckerTest.kt
@@ -6,7 +6,6 @@ import ch.kleis.lcaac.plugin.fixture.DimensionFixture
 import ch.kleis.lcaac.plugin.language.psi.stub.global_assignment.GlobalAssigmentStubKeyIndex
 import ch.kleis.lcaac.plugin.language.psi.stub.process.ProcessStubKeyIndex
 import ch.kleis.lcaac.plugin.language.psi.stub.unit.UnitStubKeyIndex
-import ch.kleis.lcaac.plugin.psi.LcaTerminalTechnoInputExchange
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import junit.framework.TestCase
 import org.junit.Test
@@ -253,11 +252,11 @@ class PsiLcaTypeCheckerTest : BasePlatformTestCase() {
             .findProcesses(project, "$pkgName.p", mapOf("geo" to "FR")).first()
             .getInputs().first().terminalTechnoInputExchange!!
         val target = first
-            .inputProductSpec
+            .inputProductSpec!!
             .getProcessTemplateSpec()!!
             .getMatchLabels()!!
             .labelSelectorList.first()
-            .dataExpression
+            .dataExpression!!
         val checker = PsiLcaTypeChecker()
 
         // when