Commit: eba4a5a9b8b62ca534226cd2959d9e925ff1f939
Author: Matt Ficken <v-maf...@microsoft.com> Tue, 17 Sep 2013
15:32:38 -0700
Parents: 66b3bbc82c844d16b58a296317ff2ccd0a048bc5
Branches: master
Link:
http://git.php.net/?p=pftt2.git;a=commitdiff;h=eba4a5a9b8b62ca534226cd2959d9e925ff1f939
Log:
updated database scenario api
Former-commit-id: f6ef15fd9de6ab333956a26add1e73b0c78ba1e9
Changed paths:
M src/com/mostc/pftt/results/AbstractPhptRW.java
M src/com/mostc/pftt/results/PhpResultPackReader.java
M src/com/mostc/pftt/results/PhpResultPackWriter.java
M src/com/mostc/pftt/results/PhptResultReader.java
M src/com/mostc/pftt/scenario/DatabaseScenario.java
M src/com/mostc/pftt/scenario/MSAccessScenario.java
M src/com/mostc/pftt/scenario/MSSQLODBCScenario.java
M src/com/mostc/pftt/scenario/MySQLScenario.java
M src/com/mostc/pftt/scenario/ODBCScenario.java
M src/com/mostc/pftt/scenario/PostgresSQLScenario.java
diff --git a/src/com/mostc/pftt/results/AbstractPhptRW.java
b/src/com/mostc/pftt/results/AbstractPhptRW.java
index 793d7bf..78bdfbd 100644
--- a/src/com/mostc/pftt/results/AbstractPhptRW.java
+++ b/src/com/mostc/pftt/results/AbstractPhptRW.java
@@ -30,7 +30,21 @@ public abstract class AbstractPhptRW extends
AbstractTestResultRW {
protected void check(EPhptTestStatus status, List<String> names) {
if (status==EPhptTestStatus.FAIL) {
// TODO temp
-
+
+
names.remove("ext/mysqli/tests/mysqli_disable_reads_from_master.phpt");
+
names.remove("ext/mysqli/tests/mysqli_fetch_field_direct.phpt");
+ names.remove("ext/mysqli/tests/mysqli_fetch_row.phpt");
+ names.remove("ext/mysqli/tests/mysqli_query.phpt");
+
names.remove("ext/mysqli/tests/mysqli_query_unicode.phpt");
+
names.remove("ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt");
+
names.remove("ext/mysqli/tests/mysqli_expire_password.phpt");
+
names.remove("ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt");
+
names.remove("ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt");
+
names.remove("ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt");
+
names.remove("ext/mysqli/tests/mysqli_get_warnings.phpt");
+ names.remove("ext/mysqli/tests/mysqli_init.phpt");
+
names.remove("ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt");
+
names.remove("ext/mysqli/tests/mysqli_stmt_affected_rows.phpt");
names.remove("ext/date/tests/bug33957.phpt");
names.remove("ext/date/tests/bug34087.phpt");
names.remove("ext/gd/tests/bug39780.phpt");
diff --git a/src/com/mostc/pftt/results/PhpResultPackReader.java
b/src/com/mostc/pftt/results/PhpResultPackReader.java
index a35173e..7a280c7 100644
--- a/src/com/mostc/pftt/results/PhpResultPackReader.java
+++ b/src/com/mostc/pftt/results/PhpResultPackReader.java
@@ -229,7 +229,6 @@ public class PhpResultPackReader extends PhpResultPack {
public AbstractPhptRW getPHPT(String host_name, ScenarioSetSetup
scenario_set, String test_pack_name) {
host_name = host_name.toLowerCase();
HashMap<String,HashMap<String,AbstractPhptRW>> map_a =
phpt_reader_map.get(host_name);
- System.out.println(map_a);
if (map_a==null)
return null;
String scenario_set_name =
scenario_set.getNameWithVersionInfo().toLowerCase();
@@ -237,7 +236,6 @@ public class PhpResultPackReader extends PhpResultPack {
if (map_b==null)
return null;
AbstractPhptRW phpt = map_b.get(test_pack_name);
- System.out.println("phpt "+phpt);
return phpt;
}
@@ -524,7 +522,6 @@ public class PhpResultPackReader extends PhpResultPack {
b = a.values().iterator().next();
//return b.values().iterator().next();
// TODO temp
- System.out.println("525 "+scenario_set+" "+b);
return b.get(scenario_set.toString());
}
diff --git a/src/com/mostc/pftt/results/PhpResultPackWriter.java
b/src/com/mostc/pftt/results/PhpResultPackWriter.java
index 361c7af..2004458 100644
--- a/src/com/mostc/pftt/results/PhpResultPackWriter.java
+++ b/src/com/mostc/pftt/results/PhpResultPackWriter.java
@@ -54,7 +54,6 @@ public class PhpResultPackWriter extends PhpResultPack
implements ITestResultRec
protected final EBuildBranch test_pack_branch;
protected final String test_pack_version;
protected final Thread writer_thread;
- protected final boolean first_for_build;
protected final Config config;
protected class UITestScenarioSetGroup {
@@ -130,12 +129,6 @@ public class PhpResultPackWriter extends PhpResultPack
implements ITestResultRec
this.cm = cm;
this.build = build;
this.telem_dir = new File(makeName(src_test_pack,
telem_base_dir, build_info).getAbsolutePath());
- if (this.telem_dir.exists()) {
- this.telem_dir = new
File(host.uniqueNameFromBase(this.telem_dir.getAbsolutePath()));
- first_for_build = false;
- } else {
- first_for_build = true;
- }
this.telem_dir.mkdirs();
try {
@@ -174,10 +167,6 @@ public class PhpResultPackWriter extends PhpResultPack
implements ITestResultRec
writer_thread.start();
}
- public boolean isFirstForBuild() {
- return first_for_build;
- }
-
protected abstract class ResultQueueEntry {
public abstract void handle() throws IllegalArgumentException,
IllegalStateException, IOException;
}
@@ -763,9 +752,7 @@ public class PhpResultPackWriter extends PhpResultPack
implements ITestResultRec
@Override
public AbstractPhptRW getPHPT(AHost host, ScenarioSetSetup
scenario_set, String test_pack_name) {
try {
- System.out.println(phpt_writer_map);
AbstractPhptRW phpt = getCreatePhptResultWriter(host,
scenario_set, test_pack_name);
- System.out.println("767 "+phpt+" "+scenario_set+"
"+test_pack_name);
return phpt;
} catch (IOException e) {
e.printStackTrace();
diff --git a/src/com/mostc/pftt/results/PhptResultReader.java
b/src/com/mostc/pftt/results/PhptResultReader.java
index 4265d36..7216369 100644
--- a/src/com/mostc/pftt/results/PhptResultReader.java
+++ b/src/com/mostc/pftt/results/PhptResultReader.java
@@ -45,8 +45,6 @@ public class PhptResultReader extends AbstractPhptRW {
status_list_map.put(EPhptTestStatus.BORK, new
StatusListEntry(tally.bork));
status_list_map.put(EPhptTestStatus.TEST_EXCEPTION, new
StatusListEntry(tally.exception));
//
- System.out.println("48 "+status_list_map);
-
for ( EPhptTestStatus status : status_list_map.keySet() ) {
StatusListEntry e = status_list_map.get(status);
@@ -124,7 +122,7 @@ public class PhptResultReader extends AbstractPhptRW {
if (e==null)
return 0;
check(status, e.test_names);
- return e.count;
+ return e.test_names.size();
}
@Override
diff --git a/src/com/mostc/pftt/scenario/DatabaseScenario.java
b/src/com/mostc/pftt/scenario/DatabaseScenario.java
index cf75735..65d0b93 100644
--- a/src/com/mostc/pftt/scenario/DatabaseScenario.java
+++ b/src/com/mostc/pftt/scenario/DatabaseScenario.java
@@ -52,16 +52,35 @@ public abstract class DatabaseScenario extends
NetworkedServiceScenario {
}
@Override
+ public String getName() {
+ return version.getNameWithVersionInfo();
+ }
+
+ @Override
+ public boolean ignoreForShortName(EScenarioSetPermutationLayer layer) {
+ if (layer==null)
+ return false;
+ switch(layer) {
+ case FUNCTIONAL_TEST_APPLICATION:
+ case FUNCTIONAL_TEST_DATABASE:
+ case PRODUCTION_OR_ALL_UP_TEST:
+ return false;
+ default:
+ return version == null || version.isAny();
+ }
+ }
+
+ @Override
public boolean isPlaceholder(EScenarioSetPermutationLayer layer) {
if (layer==null)
- return true;
+ return false;
switch(layer) {
case FUNCTIONAL_TEST_APPLICATION:
case FUNCTIONAL_TEST_DATABASE:
case PRODUCTION_OR_ALL_UP_TEST:
return false;
default:
- return true;
+ return version == null || version.isAny();
}
}
@@ -77,6 +96,8 @@ public abstract class DatabaseScenario extends
NetworkedServiceScenario {
public interface IDatabaseVersion {
public String getNameWithVersionInfo();
+ public boolean isAny();
+
}
@@ -496,11 +517,11 @@ public abstract class DatabaseScenario extends
NetworkedServiceScenario {
}
if
(!(cm.isDebugAll()||cm.isDebugList()||cm.isPfttDebug())) {
- new Thread() {
+ TimerUtil.runThread(new Runnable() {
public void run() {
dropDatabase(db_name);
}
- }.start();
+ });
TimerUtil.trySleepSeconds(2);
}
diff --git a/src/com/mostc/pftt/scenario/MSAccessScenario.java
b/src/com/mostc/pftt/scenario/MSAccessScenario.java
index 535052c..19a9fde 100644
--- a/src/com/mostc/pftt/scenario/MSAccessScenario.java
+++ b/src/com/mostc/pftt/scenario/MSAccessScenario.java
@@ -13,8 +13,25 @@ import com.mostc.pftt.host.AHost;
public class MSAccessScenario extends ODBCScenario {
+ public MSAccessScenario(EMSAccessVersion version, AHost host, String
default_username, String default_password) {
+ super(version, host, default_username, default_password);
+ }
+
public MSAccessScenario(AHost host, String default_username, String
default_password) {
- super(host, default_username, default_password);
+ this(EMSAccessVersion.DEFAULT, host, default_username,
default_password);
+ }
+
+ public static enum EMSAccessVersion implements IDatabaseVersion {
+ DEFAULT {
+ @Override
+ public String getNameWithVersionInfo() {
+ return "MSAccess";
+ }
+ @Override
+ public boolean isAny() {
+ return true;
+ }
+ }
}
@Override
@@ -23,11 +40,6 @@ public class MSAccessScenario extends ODBCScenario {
}
@Override
- public String getName() {
- return "MSAccess";
- }
-
- @Override
public boolean isImplemented() {
return false;
}
diff --git a/src/com/mostc/pftt/scenario/MSSQLODBCScenario.java
b/src/com/mostc/pftt/scenario/MSSQLODBCScenario.java
index a775a5f..825ed2a 100644
--- a/src/com/mostc/pftt/scenario/MSSQLODBCScenario.java
+++ b/src/com/mostc/pftt/scenario/MSSQLODBCScenario.java
@@ -4,6 +4,8 @@ import com.mostc.pftt.host.AHost;
/** Tests the pdo_odbc and odbc extensions against a Microsoft SQL Server.
(NOT IMPLEMENTED)
*
+ * Can be used to test Microsoft's ODBC Driver for Linux (against an MSSQL
Server).
+ *
* SQL Server is one of 3 supported databases for odbc and pdo_odbc.
*
* Note: this does NOT test the mssql extension. This is a test of ODBC.
@@ -16,20 +18,32 @@ import com.mostc.pftt.host.AHost;
public class MSSQLODBCScenario extends ODBCScenario {
+ public MSSQLODBCScenario(EMSSQLODBCVersion version, AHost host, String
default_username, String default_password) {
+ super(version, host, default_username, default_password);
+ }
+
public MSSQLODBCScenario(AHost host, String default_username, String
default_password) {
- super(host, default_username, default_password);
+ this(EMSSQLODBCVersion.DEFAULT, host, default_username,
default_password);
+ }
+
+ public static enum EMSSQLODBCVersion implements IDatabaseVersion {
+ DEFAULT {
+ @Override
+ public String getNameWithVersionInfo() {
+ return "MSSQL-ODBC";
+ }
+ @Override
+ public boolean isAny() {
+ return true;
+ }
+ }
}
@Override
protected DatabaseScenarioSetup createScenarioSetup(boolean
is_production_server) {
return null;
}
-
- @Override
- public String getName() {
- return "MSSQL-ODBC";
- }
-
+
@Override
public boolean isImplemented() {
return false;
diff --git a/src/com/mostc/pftt/scenario/MySQLScenario.java
b/src/com/mostc/pftt/scenario/MySQLScenario.java
index 50d14ba..447c841 100644
--- a/src/com/mostc/pftt/scenario/MySQLScenario.java
+++ b/src/com/mostc/pftt/scenario/MySQLScenario.java
@@ -46,6 +46,10 @@ public class MySQLScenario extends DatabaseScenario {
public String getNameWithVersionInfo() {
return "MySQL-5.6"; // TODO autodetect
}
+ @Override
+ public boolean isAny() {
+ return false;
+ }
};
}
@@ -55,11 +59,6 @@ public class MySQLScenario extends DatabaseScenario {
}
@Override
- public String getName() {
- return "MySQL";
- }
-
- @Override
protected MySQLScenarioSetup createScenarioSetup(boolean
is_production_server) {
return new MySQLScenarioSetup();
}
diff --git a/src/com/mostc/pftt/scenario/ODBCScenario.java
b/src/com/mostc/pftt/scenario/ODBCScenario.java
index 7d7a731..547090e 100644
--- a/src/com/mostc/pftt/scenario/ODBCScenario.java
+++ b/src/com/mostc/pftt/scenario/ODBCScenario.java
@@ -4,20 +4,8 @@ import com.mostc.pftt.host.AHost;
public abstract class ODBCScenario extends DatabaseScenario {
- public ODBCScenario(EODBCVersion version, AHost host, String
default_username, String default_password) {
+ public ODBCScenario(IDatabaseVersion version, AHost host, String
default_username, String default_password) {
super(version, host, default_username, default_password);
}
- public ODBCScenario(AHost host, String default_username, String
default_password) {
- this(EODBCVersion.DEFAULT, host, default_username,
default_password);
- }
-
- public static enum EODBCVersion implements IDatabaseVersion {
- DEFAULT {
- public String getNameWithVersionInfo() {
- return "Default";
- }
- };
- }
-
}
diff --git a/src/com/mostc/pftt/scenario/PostgresSQLScenario.java
b/src/com/mostc/pftt/scenario/PostgresSQLScenario.java
index 41a92e3..9839b54 100644
--- a/src/com/mostc/pftt/scenario/PostgresSQLScenario.java
+++ b/src/com/mostc/pftt/scenario/PostgresSQLScenario.java
@@ -30,6 +30,10 @@ public class PostgresSQLScenario extends DatabaseScenario {
public String getNameWithVersionInfo() {
return "PostgresSQL";
}
+ @Override
+ public boolean isAny() {
+ return false;
+ }
};
}
@@ -119,11 +123,6 @@ public class PostgresSQLScenario extends DatabaseScenario {
} // end public class PostgresSQLScenarioSetup
@Override
- public String getName() {
- return "PostgresSQL";
- }
-
- @Override
public boolean isImplemented() {
return false;
}
