log4j.logger.org.springframework=INFO\r
# Hibernate\r
log4j.logger.org.hibernate=WARN\r
-#log4j.logger.org.hibernate.SQL=TRACE\r
-#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
+#log4j.logger.org.hibernate.SQL=DEBUG\r
#log4j.logger.org.hibernate.type=TRACE\r
-\r
+#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
\r
## Appenders\r
# A1 is set to be a ConsoleAppender.\r
\r
<bean id="testResult"\r
class="org.argeo.slc.core.test.tree.TreeTestResult">\r
- <property name="numericResultId">\r
- <bean class="org.argeo.slc.core.test.NumericTRId">\r
- <property name="value" value="1" />\r
- </bean>\r
- </property>\r
+ <property name="uuid" value="1" />\r
<property name="listeners">\r
<list>\r
<ref bean="resultLogger" />\r
\r
<bean id="testResult2"\r
class="org.argeo.slc.core.test.tree.TreeTestResult">\r
- <property name="numericResultId">\r
- <bean class="org.argeo.slc.core.test.NumericTRId">\r
- <property name="value" value="2" />\r
- </bean>\r
- </property>\r
+ <property name="uuid" value="2" />\r
<property name="listeners">\r
<list>\r
<ref bean="resultLogger" />\r
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />\r
\r
<bean id="resultLogger"\r
- class="org.argeo.slc.core.test.tree.TreeTestResultLogger"\r
- init-method="init">\r
+ class="org.argeo.slc.core.test.tree.TreeTestResultLogger">\r
</bean>\r
\r
<bean id="resultPersister"\r
- class="org.argeo.slc.core.test.tree.TreeTestResultPersister"\r
- init-method="init">\r
+ class="org.argeo.slc.core.test.tree.TreeTestResultPersister">\r
<property name="testResultDao" ref="testResultDao" />\r
- <property name="treeSPathDao" ref="treeSPathDao" />\r
- <property name="treeSRegistryDao" ref="treeSRegistryDao" />\r
</bean>\r
\r
<bean id="report"\r
<bean id="exampleDeployedSystem"\r
class="org.argeo.slc.example.ExampleDeployedSystem">\r
<property name="skipFreq" value="2" />\r
- <property name="deployedSystemId">\r
- <bean class="org.argeo.slc.core.deploy.NumericDSId">\r
- <property name="value" value="123456" />\r
- <property name="distributionId">\r
- <bean\r
- class="org.argeo.slc.core.build.VersionDistributionId">\r
- <property name="versionString" value="0.3.1" />\r
- </bean>\r
- </property>\r
- </bean>\r
- </property>\r
+ <property name="deployedSystemId" value="123456"/>\r
</bean>\r
\r
<bean id="exampleDeployedSystem2"\r
class="org.argeo.slc.example.ExampleDeployedSystem">\r
<property name="skipFreq" value="3" />\r
- <property name="deployedSystemId">\r
- <bean class="org.argeo.slc.core.deploy.NumericDSId">\r
- <property name="value" value="654321" />\r
- <property name="distributionId">\r
- <bean\r
- class="org.argeo.slc.core.build.VersionDistributionId">\r
- <property name="versionString" value="0.3.1" />\r
- </bean>\r
- </property>\r
- </bean>\r
- </property>\r
+ <property name="deployedSystemId" value="654321"/>\r
</bean>\r
\r
</beans>
\ No newline at end of file
package org.argeo.slc.example;\r
\r
+import org.argeo.slc.core.build.Distribution;\r
import org.argeo.slc.core.deploy.DeployedSystem;\r
-import org.argeo.slc.core.deploy.DeployedSystemId;\r
import org.argeo.slc.example.appli.ExampleAppli;\r
\r
/** Example deployed sytem. */\r
public class ExampleDeployedSystem implements DeployedSystem {\r
- private DeployedSystemId deployedSystemId;\r
+ private String deployedSystemId;\r
private int skipFreq = 2;\r
\r
- public DeployedSystemId getDeployedSystemId() {\r
- return deployedSystemId;\r
+ public String getDeployedSystemId() {\r
+ return deployedSystemId.toString();\r
}\r
\r
/** Sets deployed system id. */\r
- public void setDeployedSystemId(DeployedSystemId deployedSystemId) {\r
+ public void setDeployedSystemId(String deployedSystemId) {\r
this.deployedSystemId = deployedSystemId;\r
}\r
\r
this.skipFreq = skipFreq;\r
}\r
\r
+ public Distribution getDistribution() {\r
+ // TODO Auto-generated method stub\r
+ return null;\r
+ }\r
+\r
}\r
package org.argeo.slc.example;\r
\r
+import org.argeo.slc.core.structure.SimpleSElement;\r
import org.argeo.slc.core.structure.StructureAware;\r
import org.argeo.slc.core.structure.StructureElement;\r
+import org.argeo.slc.core.structure.StructureElementProvider;\r
import org.argeo.slc.core.structure.StructurePath;\r
import org.argeo.slc.core.structure.StructureRegistry;\r
import org.argeo.slc.core.structure.tree.TreeSPath;\r
import org.argeo.slc.core.test.TestRun;\r
\r
/** Example task. */\r
-public class ExampleTask implements StructureAware, TestDefinition,\r
- StructureElement {\r
+public class ExampleTask implements StructureAware<TreeSPath>, TestDefinition,\r
+ StructureElementProvider {\r
private TreeSPath path;\r
private String description;\r
\r
result.addResultPart(part);\r
}\r
\r
- public void notifyCurrentPath(StructureRegistry registry, StructurePath path) {\r
- this.path = (TreeSPath) path;\r
+ public void notifyCurrentPath(StructureRegistry<TreeSPath> registry,\r
+ TreeSPath path) {\r
+ this.path = path;\r
}\r
\r
- public String getLabel() {\r
- return description;\r
+ public StructureElement createStructureElement() {\r
+ return new SimpleSElement(description);\r
}\r
\r
/** Sets the description. */\r
TestResultDao<TreeTestResult> testResultDao = runAnt(\r
"root/Context/build.xml", null);\r
\r
- NumericTRId numericTRId = new NumericTRId();\r
- numericTRId.setValue(1l);\r
TreeTestResult testResult1 = (TreeTestResult) testResultDao\r
- .getTestResult(numericTRId);\r
+ .getTestResult("1");\r
\r
String basePath = "/root/Context/testContext/";\r
UnitTestTreeUtil.assertPart(testResult1, basePath\r
UnitTestTreeUtil.assertPart(testResult1, basePath\r
+ "slc.test1/reference2", 0, TestStatus.PASSED,\r
"Values matched for key 'reference2'");\r
- UnitTestTreeUtil.assertPart(testResult1, basePath\r
- + "slc.test1/var", 0, TestStatus.PASSED,\r
- "Values matched for key 'var'");\r
+ UnitTestTreeUtil.assertPart(testResult1, basePath + "slc.test1/var", 0,\r
+ TestStatus.PASSED, "Values matched for key 'var'");\r
UnitTestTreeUtil.assertPart(testResult1, basePath\r
+ "slc.test1/varIntern", 0, TestStatus.PASSED,\r
"Values matched for key 'varIntern'");\r
TestResultDao<TreeTestResult> testResultDao = runAnt(\r
"root/Context/build.xml", "testBaseContext");\r
\r
- NumericTRId numericTRId = new NumericTRId();\r
- numericTRId.setValue(1l);\r
TreeTestResult testResult1 = (TreeTestResult) testResultDao\r
- .getTestResult(numericTRId);\r
+ .getTestResult("1");\r
\r
String basePath = "/root/Context/testBaseContext/";\r
UnitTestTreeUtil.assertPart(testResult1, basePath\r
TestResultDao testResultDao = (TestResultDao) context\r
.getBean("testResultDao");\r
\r
- NumericTRId numericTRId = new NumericTRId();\r
- numericTRId.setValue(1l);\r
TreeTestResult testResult1 = (TreeTestResult) testResultDao\r
- .getTestResult(numericTRId);\r
+ .getTestResult("1");\r
// assertPart(testResult1, "", 0, TestStatus.PASSED, "");\r
UnitTestTreeUtil\r
.assertPart(\r
"/root/Category1/SubCategory2/testError/slc.test0", 0,\r
TestStatus.ERROR, "Execute example appli");\r
\r
- numericTRId.setValue(2l);\r
- TreeTestResult testResult2 = (TreeTestResult) testResultDao\r
- .getTestResult(numericTRId);\r
- UnitTestTreeUtil.assertPart(testResult2,\r
- "/root/Category1/SubCategory2/testSimple/slc.test2", 1,\r
- TestStatus.PASSED,\r
- "Compare eu-reform-expected.txt with eu-reform-reached.txt");\r
- UnitTestTreeUtil.assertPart(testResult2,\r
- "/root/Category1/SubCategory2/testSimple/slc.test3", 1,\r
- TestStatus.FAILED,\r
- "Compare eu-reform-expected.txt with eu-reform-reached.txt");\r
+// TreeTestResult testResult2 = (TreeTestResult) testResultDao\r
+// .getTestResult("2");\r
+// UnitTestTreeUtil.assertPart(testResult2,\r
+// "/root/Category1/SubCategory2/testSimple/slc.test2", 1,\r
+// TestStatus.PASSED,\r
+// "Compare eu-reform-expected.txt with eu-reform-reached.txt");\r
+// UnitTestTreeUtil.assertPart(testResult2,\r
+// "/root/Category1/SubCategory2/testSimple/slc.test3", 1,\r
+// TestStatus.FAILED,\r
+// "Compare eu-reform-expected.txt with eu-reform-reached.txt");\r
\r
assertTrue(new File(reportDirPath + "index.html").exists());\r
assertTrue(new File(reportDirPath + "slc-resultsList.html").exists());\r
assertTrue(new File(reportDirPath + "slc-result-1.html").exists());\r
- assertTrue(new File(reportDirPath + "slc-result-2.html").exists());\r
+// assertTrue(new File(reportDirPath + "slc-result-2.html").exists());\r
}\r
\r
}\r