[Fusionforge-commits] r12287 - in branches/Branch_5_1/src/plugins/oslc/tests: . func

Sabri LABBENE labbenes at fusionforge.org
Tue Feb 15 16:58:58 CET 2011


Author: labbenes
Date: 2011-02-15 16:58:58 +0100 (Tue, 15 Feb 2011)
New Revision: 12287

Modified:
   branches/Branch_5_1/src/plugins/oslc/tests/func/sureFireReportTest.php
   branches/Branch_5_1/src/plugins/oslc/tests/setup-provider-test.sh
Log:
Change tests to OSLCV2 and create link to the generated surefire report.

Modified: branches/Branch_5_1/src/plugins/oslc/tests/func/sureFireReportTest.php
===================================================================
--- branches/Branch_5_1/src/plugins/oslc/tests/func/sureFireReportTest.php	2011-02-15 13:32:45 UTC (rev 12286)
+++ branches/Branch_5_1/src/plugins/oslc/tests/func/sureFireReportTest.php	2011-02-15 15:58:58 UTC (rev 12287)
@@ -26,21 +26,19 @@
 
     // Check the results in the generated HTML report
     $this->open("/plugins/oslc/surefire/surefire-report.html");
-    $this->click("link=net.openservices.provider.test.oslcv1tests");
-
-    $this->assertEquals("net.openservices.provider.test.oslcv1tests", $this->getText("//div[@id='contentBox']/div[3]/div/h3"));
-
-    $this->assertEquals("ServiceProviderCatalogTests", $this->getText("//div[@id='contentBox']/div[3]/div/h3[contains(.,'net.openservices.provider.test.oslcv1tests')]/../table/tbody/tr[2]/td[2]"));
-
-    // Tests
-    $this->assertEquals("56", $this->getText("//div[@id='contentBox']/div[3]/div/h3[contains(.,'net.openservices.provider.test.oslcv1tests')]/../table/tbody/tr[2]/td[3]"));
-    // Errors
-    $this->assertEquals("0", $this->getText("//div[@id='contentBox']/div[3]/div/h3[contains(.,'net.openservices.provider.test.oslcv1tests')]/../table/tbody/tr[2]/td[4]"));
-    // Failures
-    $this->assertEquals("8", $this->getText("//div[@id='contentBox']/div[3]/div/h3[contains(.,'net.openservices.provider.test.oslcv1tests')]/../table/tbody/tr[2]/td[5]"));
-    // Skipped
-    $this->assertEquals("0", $this->getText("//div[@id='contentBox']/div[3]/div/h3[contains(.,'net.openservices.provider.test.oslcv1tests')]/../table/tbody/tr[2]/td[6]"));
+    $this->click("link=net.openservices.provider.test.oslcv2tests");
+    $this->assertEquals("net.openservices.provider.test.oslcv2tests", $this->getTable("//div[@id='contentBox']/div[3]/table.1.0"));
+    $this->assertEquals("79", $this->getTable("//div[@id='contentBox']/div[3]/table.1.1"));
+    $this->assertEquals("2", $this->getTable("//div[@id='contentBox']/div[3]/table.1.2"));
+    $this->assertEquals("0", $this->getTable("//div[@id='contentBox']/div[3]/table.1.3"));
+    $this->assertEquals("0", $this->getTable("//div[@id='contentBox']/div[3]/table.1.4"));
+    $this->assertEquals("97.468%", $this->getTable("//div[@id='contentBox']/div[3]/table.1.5"));
+    $this->assertEquals("ServiceProviderCatalogXmlTests", $this->getTable("//div[@id='contentBox']/div[3]/div/table.1.1"));
+    $this->assertEquals("ServiceProviderXmlTests", $this->getTable("//div[@id='contentBox']/div[3]/div/table.3.1"));
+    $this->assertEquals("ServiceProviderCatalogRdfXmlTests", $this->getTable("//div[@id='contentBox']/div[3]/div/table.5.1"));
+    $this->assertEquals("17", $this->getTable("//div[@id='contentBox']/div[3]/div/table.1.2"));
+    $this->assertEquals("48", $this->getTable("//div[@id='contentBox']/div[3]/div/table.3.2"));
+    $this->assertEquals("12", $this->getTable("//div[@id='contentBox']/div[3]/div/table.5.2"));
   }
 }
-
-?>
\ No newline at end of file
+?>

Modified: branches/Branch_5_1/src/plugins/oslc/tests/setup-provider-test.sh
===================================================================
--- branches/Branch_5_1/src/plugins/oslc/tests/setup-provider-test.sh	2011-02-15 13:32:45 UTC (rev 12286)
+++ branches/Branch_5_1/src/plugins/oslc/tests/setup-provider-test.sh	2011-02-15 15:58:58 UTC (rev 12287)
@@ -31,15 +31,16 @@
 pw=oslctest
 
 # Values: http://open-services.net/xmlns/cm/1.0/ | http://open-services.net/ns/cm# | both
-testVersions=http://open-services.net/xmlns/cm/1.0/
+#testVersions=http://open-services.net/xmlns/cm/1.0/
+testVersions=http://open-services.net/ns/core#
 
 ##QUERY PROPERTIES##
 #The query parameter that should be used to test equality
-queryEqualityProperty=dc:title
+queryEqualityProperty=dcterms:title
 #The parameter value used with the parameter to test equality (record with this value should exist in the system)
 queryEqualityValue=another ticket
 #The query parameter that should be used to test equality
-queryComparisonProperty=dc:modified
+queryComparisonProperty=dcterms:modified
 #The parameter value used with the parameter to test comparisons (should split the results into two non-empty sets)
 queryComparisonValue=2010-08-16T20:16:03.578Z
 #Additional non-OSLC parameters that need to be included to run queries
@@ -75,3 +76,6 @@
 
 mvn clean
 
+##surefire reports for the OSLC testsuite results##
+ln -s /root/fusionforge-Branch_5_1/src/plugins/oslc/tests/provider-test/target/site /usr/share/gforge/plugins/oslc/www/surefire
+




More information about the Fusionforge-commits mailing list