Skip to content

Commit

Permalink
Update code to accouint for new Pure modification
Browse files Browse the repository at this point in the history
  • Loading branch information
pierredebelen committed May 21, 2024
1 parent 8244375 commit bae2dea
Show file tree
Hide file tree
Showing 41 changed files with 275 additions and 148 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<id>PCT-Generation</id>
<phase>process-test-classes</phase>
<goals>
<goal>generate-pct</goal>
<goal>generate-pct-report</goal>
</goals>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,39 @@
import com.fasterxml.jackson.databind.json.JsonMapper;
import org.eclipse.collections.api.factory.Lists;
import org.eclipse.collections.api.list.MutableList;
import org.finos.legend.pure.m3.pct.PCTReportProvider;
import org.finos.legend.pure.m3.pct.model.Report;
import org.finos.legend.pure.m3.pct.functions.model.Functions;
import org.finos.legend.pure.m3.pct.reports.model.AdapterReport;
import org.finos.legend.pure.m3.pct.shared.provider.PCTReportProvider;

public class Core_JavaBinding_PCTReportProvider implements PCTReportProvider
{
@Override
public MutableList<Report> getReports()
public MutableList<Functions> getFunctions()
{
return Lists.mutable.empty();
}

@Override
public MutableList<AdapterReport> getAdapterReports()
{
try
{
return Lists.mutable.with(
JsonMapper.builder().build().readValue(
Core_JavaBinding_PCTReportProvider.class.getResourceAsStream("/pct-reports/base_compiled_testAdapterForJavaBindingExecution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
),
JsonMapper.builder().build().readValue(
Core_JavaBinding_PCTReportProvider.class.getResourceAsStream("/pct-reports/basic_compiled_testAdapterForJavaBindingExecution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
),
JsonMapper.builder().build().readValue(
Core_JavaBinding_PCTReportProvider.class.getResourceAsStream("/pct-reports/grammar_compiled_testAdapterForJavaBindingExecution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
),
JsonMapper.builder().build().readValue(
Core_JavaBinding_PCTReportProvider.class.getResourceAsStream("/pct-reports/relation_compiled_testAdapterForJavaBindingExecution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package org.finos.legend.engine.pure.code.core.java.binding;

import org.finos.legend.pure.m3.pct.config.PCTReport;
import org.finos.legend.pure.m3.pct.shared.provider.PCTReportProviderLoader;
import org.junit.Assert;
import org.junit.Test;

Expand All @@ -23,7 +23,7 @@ public class TestPCRReport
@Test
public void canFindPCTReport()
{
Assert.assertEquals("meta::pure::executionPlan::platformBinding::legendJava::pct::testAdapterForJavaBindingExecution_Function_1__X_o_, meta::pure::test::pct::testAdapterForInMemoryExecution_Function_1__X_o_", PCTReport.gatherReports().collect(c -> c.adapter).distinct().sortThis().makeString(", "));
Assert.assertEquals(8, PCTReport.gatherReports().size());
Assert.assertEquals("meta::pure::executionPlan::platformBinding::legendJava::pct::testAdapterForJavaBindingExecution_Function_1__X_o_, meta::pure::test::pct::testAdapterForInMemoryExecution_Function_1__X_o_", PCTReportProviderLoader.gatherReports().collect(c -> c.adapter).distinct().sortThis().makeString(", "));
Assert.assertEquals(8, PCTReportProviderLoader.gatherReports().size());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import org.eclipse.collections.api.factory.Lists;
import org.eclipse.collections.api.list.MutableList;
import org.finos.legend.pure.code.core.FunctionsCodeRepositoryProvider;
import org.finos.legend.pure.m3.pct.config.PCTReport;
import org.finos.legend.pure.m3.pct.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.model.ReportScope;
import org.finos.legend.pure.m3.pct.reports.config.PCTReportConfiguration;
import org.finos.legend.pure.m3.pct.reports.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.shared.model.ReportScope;
import org.finos.legend.pure.runtime.java.compiled.testHelper.PureTestBuilderCompiled;

public class Test_JAVA_BaseFunction_PCT extends PCTReport
public class Test_JAVA_BaseFunction_PCT extends PCTReportConfiguration
{
private static final ReportScope reportScope = FunctionsCodeRepositoryProvider.baseFunctions;
private static final String adapter = "meta::pure::executionPlan::platformBinding::legendJava::pct::testAdapterForJavaBindingExecution_Function_1__X_o_";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import org.eclipse.collections.api.factory.Lists;
import org.eclipse.collections.api.list.MutableList;
import org.finos.legend.pure.m3.PlatformCodeRepositoryProvider;
import org.finos.legend.pure.m3.pct.config.PCTReport;
import org.finos.legend.pure.m3.pct.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.model.ReportScope;
import org.finos.legend.pure.m3.pct.reports.config.PCTReportConfiguration;
import org.finos.legend.pure.m3.pct.reports.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.shared.model.ReportScope;
import org.finos.legend.pure.runtime.java.compiled.testHelper.PureTestBuilderCompiled;

public class Test_JAVA_BasicFunction_PCT extends PCTReport
public class Test_JAVA_BasicFunction_PCT extends PCTReportConfiguration
{
private static final ReportScope reportScope = PlatformCodeRepositoryProvider.basicFunctions;
private static final String adapter = "meta::pure::executionPlan::platformBinding::legendJava::pct::testAdapterForJavaBindingExecution_Function_1__X_o_";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import org.eclipse.collections.api.factory.Lists;
import org.eclipse.collections.api.list.MutableList;
import org.finos.legend.pure.m3.PlatformCodeRepositoryProvider;
import org.finos.legend.pure.m3.pct.config.PCTReport;
import org.finos.legend.pure.m3.pct.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.model.ReportScope;
import org.finos.legend.pure.m3.pct.reports.config.PCTReportConfiguration;
import org.finos.legend.pure.m3.pct.reports.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.shared.model.ReportScope;
import org.finos.legend.pure.runtime.java.compiled.testHelper.PureTestBuilderCompiled;

public class Test_JAVA_GrammarFunction_PCT extends PCTReport
public class Test_JAVA_GrammarFunction_PCT extends PCTReportConfiguration
{
private static final ReportScope reportScope = PlatformCodeRepositoryProvider.grammarFunctions;
private static final String adapter = "meta::pure::executionPlan::platformBinding::legendJava::pct::testAdapterForJavaBindingExecution_Function_1__X_o_";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import org.eclipse.collections.api.factory.Lists;
import org.eclipse.collections.api.list.MutableList;
import org.finos.legend.pure.code.core.RelationCodeRepositoryProvider;
import org.finos.legend.pure.m3.pct.config.PCTReport;
import org.finos.legend.pure.m3.pct.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.model.ReportScope;
import org.finos.legend.pure.m3.pct.reports.config.PCTReportConfiguration;
import org.finos.legend.pure.m3.pct.reports.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.shared.model.ReportScope;
import org.finos.legend.pure.runtime.java.compiled.testHelper.PureTestBuilderCompiled;

public class Test_JAVA_RelationFunction_PCT extends PCTReport
public class Test_JAVA_RelationFunction_PCT extends PCTReportConfiguration
{
private static final ReportScope reportScope = RelationCodeRepositoryProvider.relationFunctions;
private static final String adapter = "meta::pure::executionPlan::platformBinding::legendJava::pct::testAdapterForJavaBindingExecution_Function_1__X_o_";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<id>PCT-Generation</id>
<phase>process-test-classes</phase>
<goals>
<goal>generate-pct</goal>
<goal>generate-pct-report</goal>
</goals>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,39 @@
import com.fasterxml.jackson.databind.json.JsonMapper;
import org.eclipse.collections.api.factory.Lists;
import org.eclipse.collections.api.list.MutableList;
import org.finos.legend.pure.m3.pct.PCTReportProvider;
import org.finos.legend.pure.m3.pct.model.Report;
import org.finos.legend.pure.m3.pct.functions.model.Functions;
import org.finos.legend.pure.m3.pct.reports.model.AdapterReport;
import org.finos.legend.pure.m3.pct.shared.provider.PCTReportProvider;

public class Core_Relational_DuckDB_PCTReportProvider implements PCTReportProvider
{
@Override
public MutableList<Report> getReports()
public MutableList<Functions> getFunctions()
{
return Lists.mutable.empty();
}

@Override
public MutableList<AdapterReport> getAdapterReports()
{
try
{
return Lists.mutable.with(
JsonMapper.builder().build().readValue(
Core_Relational_DuckDB_PCTReportProvider.class.getResourceAsStream("/pct-reports/base_compiled_testAdapterForRelationalWithDuckDBExecution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
),
JsonMapper.builder().build().readValue(
Core_Relational_DuckDB_PCTReportProvider.class.getResourceAsStream("/pct-reports/basic_compiled_testAdapterForRelationalWithDuckDBExecution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
),
JsonMapper.builder().build().readValue(
Core_Relational_DuckDB_PCTReportProvider.class.getResourceAsStream("/pct-reports/grammar_compiled_testAdapterForRelationalWithDuckDBExecution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
),
JsonMapper.builder().build().readValue(
Core_Relational_DuckDB_PCTReportProvider.class.getResourceAsStream("/pct-reports/relation_compiled_testAdapterForRelationalWithDuckDBExecution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package org.finos.legend.engine.plan.execution.stores.relational.test.duckdb.pct;

import org.finos.legend.pure.m3.pct.config.PCTReport;
import org.finos.legend.pure.m3.pct.shared.provider.PCTReportProviderLoader;
import org.junit.Assert;
import org.junit.Test;

Expand All @@ -23,7 +23,7 @@ public class TestPCRReport
@Test
public void canFindPCTReport()
{
Assert.assertEquals("meta::pure::test::pct::testAdapterForInMemoryExecution_Function_1__X_o_, meta::relational::tests::pct::testAdapterForRelationalWithDuckDBExecution_Function_1__X_o_", PCTReport.gatherReports().collect(c -> c.adapter).distinct().sortThis().makeString(", "));
Assert.assertEquals(8, PCTReport.gatherReports().size());
Assert.assertEquals("meta::pure::test::pct::testAdapterForInMemoryExecution_Function_1__X_o_, meta::relational::tests::pct::testAdapterForRelationalWithDuckDBExecution_Function_1__X_o_", PCTReportProviderLoader.gatherReports().collect(c -> c.adapter).distinct().sortThis().makeString(", "));
Assert.assertEquals(8, PCTReportProviderLoader.gatherReports().size());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.DatabaseType;
import org.finos.legend.engine.test.shared.framework.TestServerResource;
import org.finos.legend.pure.code.core.FunctionsCodeRepositoryProvider;
import org.finos.legend.pure.m3.pct.config.PCTReport;
import org.finos.legend.pure.m3.pct.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.model.ReportScope;
import org.finos.legend.pure.m3.pct.reports.config.PCTReportConfiguration;
import org.finos.legend.pure.m3.pct.reports.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.shared.model.ReportScope;
import org.finos.legend.pure.runtime.java.compiled.testHelper.PureTestBuilderCompiled;

import static org.finos.legend.engine.test.shared.framework.PureTestHelperFramework.wrapSuite;

public class Test_Relational_DuckDB_BaseFunctions_PCT extends PCTReport
public class Test_Relational_DuckDB_BaseFunctions_PCT extends PCTReportConfiguration
{
private static final ReportScope reportScope = FunctionsCodeRepositoryProvider.baseFunctions;
private static final String adapter = "meta::relational::tests::pct::testAdapterForRelationalWithDuckDBExecution_Function_1__X_o_";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.DatabaseType;
import org.finos.legend.engine.test.shared.framework.TestServerResource;
import org.finos.legend.pure.m3.PlatformCodeRepositoryProvider;
import org.finos.legend.pure.m3.pct.config.PCTReport;
import org.finos.legend.pure.m3.pct.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.model.ReportScope;
import org.finos.legend.pure.m3.pct.reports.config.PCTReportConfiguration;
import org.finos.legend.pure.m3.pct.reports.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.shared.model.ReportScope;
import org.finos.legend.pure.runtime.java.compiled.testHelper.PureTestBuilderCompiled;

import static org.finos.legend.engine.test.shared.framework.PureTestHelperFramework.wrapSuite;

public class Test_Relational_DuckDB_BasicFunctions_PCT extends PCTReport
public class Test_Relational_DuckDB_BasicFunctions_PCT extends PCTReportConfiguration
{
private static final ReportScope reportScope = PlatformCodeRepositoryProvider.basicFunctions;
private static final String adapter = "meta::relational::tests::pct::testAdapterForRelationalWithDuckDBExecution_Function_1__X_o_";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.DatabaseType;
import org.finos.legend.engine.test.shared.framework.TestServerResource;
import org.finos.legend.pure.m3.PlatformCodeRepositoryProvider;
import org.finos.legend.pure.m3.pct.config.PCTReport;
import org.finos.legend.pure.m3.pct.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.model.ReportScope;
import org.finos.legend.pure.m3.pct.reports.config.PCTReportConfiguration;
import org.finos.legend.pure.m3.pct.reports.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.shared.model.ReportScope;
import org.finos.legend.pure.runtime.java.compiled.testHelper.PureTestBuilderCompiled;

import static org.finos.legend.engine.test.shared.framework.PureTestHelperFramework.wrapSuite;

public class Test_Relational_DuckDB_GrammarFunctions_PCT extends PCTReport
public class Test_Relational_DuckDB_GrammarFunctions_PCT extends PCTReportConfiguration
{
private static final ReportScope reportScope = PlatformCodeRepositoryProvider.grammarFunctions;
private static final String adapter = "meta::relational::tests::pct::testAdapterForRelationalWithDuckDBExecution_Function_1__X_o_";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.DatabaseType;
import org.finos.legend.engine.test.shared.framework.TestServerResource;
import org.finos.legend.pure.code.core.RelationCodeRepositoryProvider;
import org.finos.legend.pure.m3.pct.config.PCTReport;
import org.finos.legend.pure.m3.pct.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.model.ReportScope;
import org.finos.legend.pure.m3.pct.reports.config.PCTReportConfiguration;
import org.finos.legend.pure.m3.pct.reports.config.exclusion.ExclusionSpecification;
import org.finos.legend.pure.m3.pct.shared.model.ReportScope;
import org.finos.legend.pure.runtime.java.compiled.testHelper.PureTestBuilderCompiled;

import static org.finos.legend.engine.test.shared.framework.PureTestHelperFramework.wrapSuite;

public class Test_Relational_DuckDB_RelationFunctions_PCT extends PCTReport
public class Test_Relational_DuckDB_RelationFunctions_PCT extends PCTReportConfiguration
{
private static final ReportScope reportScope = RelationCodeRepositoryProvider.relationFunctions;
private static final String adapter = "meta::relational::tests::pct::testAdapterForRelationalWithDuckDBExecution_Function_1__X_o_";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<id>PCT-Generation</id>
<phase>process-test-classes</phase>
<goals>
<goal>generate-pct</goal>
<goal>generate-pct-report</goal>
</goals>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,39 @@
import com.fasterxml.jackson.databind.json.JsonMapper;
import org.eclipse.collections.api.factory.Lists;
import org.eclipse.collections.api.list.MutableList;
import org.finos.legend.pure.m3.pct.PCTReportProvider;
import org.finos.legend.pure.m3.pct.model.Report;
import org.finos.legend.pure.m3.pct.functions.model.Functions;
import org.finos.legend.pure.m3.pct.reports.model.AdapterReport;
import org.finos.legend.pure.m3.pct.shared.provider.PCTReportProvider;

public class Core_Relational_H2_PCTReportProvider implements PCTReportProvider
{
@Override
public MutableList<Report> getReports()
public MutableList<Functions> getFunctions()
{
return Lists.mutable.empty();
}

@Override
public MutableList<AdapterReport> getAdapterReports()
{
try
{
return Lists.mutable.with(
JsonMapper.builder().build().readValue(
Core_Relational_H2_PCTReportProvider.class.getResourceAsStream("/pct-reports/base_compiled_testAdapterForRelationalWithH2Execution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
),
JsonMapper.builder().build().readValue(
Core_Relational_H2_PCTReportProvider.class.getResourceAsStream("/pct-reports/basic_compiled_testAdapterForRelationalWithH2Execution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
),
JsonMapper.builder().build().readValue(
Core_Relational_H2_PCTReportProvider.class.getResourceAsStream("/pct-reports/grammar_compiled_testAdapterForRelationalWithH2Execution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
),
JsonMapper.builder().build().readValue(
Core_Relational_H2_PCTReportProvider.class.getResourceAsStream("/pct-reports/relation_compiled_testAdapterForRelationalWithH2Execution_Function_1__X_o_.json"),
Report.class
AdapterReport.class
)
);
}
Expand Down
Loading

0 comments on commit bae2dea

Please sign in to comment.