Skip to content

Commit 0e1a847

Browse files
committed
update testcases
1 parent 4890d7a commit 0e1a847

File tree

7 files changed

+14
-9
lines changed

7 files changed

+14
-9
lines changed

.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ services:
2828
- mysql
2929
- redis-server
3030

31+
before_script:
32+
- echo "USE mysql;\nUPDATE user SET password=PASSWORD('1qazZAQ!') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root
33+
3134
before_install:
3235
- chmod a+x ./runtests.sh
3336

src/DotnetSpider.Core.Test/SpiderTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void IdentityLengthLimit()
3232
}
3333
catch (Exception exception)
3434
{
35-
Assert.Equal($"Length of identity should less than {Env.IdentityMaxLength}.", exception.Message);
35+
Assert.Equal($"Length of identity should less than {Env.IdentityMaxLength}", exception.Message);
3636
return;
3737
}
3838

src/DotnetSpider.Extension.Test/Pipeline/MySqlEntityPipelineTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected virtual IDbConnection CreateDbConnection()
4343
[Fact(DisplayName = "DataTypes")]
4444
public virtual void DataTypes()
4545
{
46-
using (MySqlConnection conn = new MySqlConnection("Database='mysql';Data Source=127.0.0.1;User ID=root;Password=;Port=3306;SslMode=None;"))
46+
using (MySqlConnection conn = new MySqlConnection("Database='mysql';Data Source=127.0.0.1;User ID=root;Password=1qazZAQ!;Port=3306;SslMode=None;"))
4747
{
4848
try
4949
{
@@ -53,7 +53,7 @@ public virtual void DataTypes()
5353
{
5454
}
5555

56-
var pipeline = new MySqlEntityPipeline("Database='mysql';Data Source=localhost;User ID=root;Password=;Port=3306;SslMode=None;");
56+
var pipeline = new MySqlEntityPipeline("Database='mysql';Data Source=localhost;User ID=root;Password=1qazZAQ!;Port=3306;SslMode=None;");
5757
var resultItems = new ResultItems();
5858
resultItems.Request = new Request();
5959
resultItems["aaaa"] =

src/DotnetSpider.Extension.Test/TestBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
{
33
public abstract class TestBase
44
{
5-
public virtual string DefaultConnectionString { get; } = "Database='mysql';Data Source=localhost;User ID=root;Port=3306;SslMode=None;";
5+
public virtual string DefaultConnectionString { get; } = "Database='mysql';Data Source=localhost;Password=1qazZAQ!;User ID=root;Port=3306;SslMode=None;";
66
}
77
}

src/DotnetSpider.Extension.Test/app.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<connectionStrings>
4-
<add name="SystemConnection" connectionString="Database='mysql';Data Source=localhost;User ID=root;Port=3306;SslMode=None;"
4+
<add name="SystemConnection" connectionString="Database='mysql';Data Source=localhost;Password=1qazZAQ!;User ID=root;Port=3306;SslMode=None;"
55
providerName="MySql.Data.MySqlClient" />
6-
<add name="DataConnection" connectionString="Database='mysql';Data Source=localhost;User ID=root;Port=3306;SslMode=None;"
6+
<add name="DataConnection" connectionString="Database='mysql';Data Source=localhost;User ID=root;Password=1qazZAQ!;Port=3306;SslMode=None;"
77
providerName="MySql.Data.MySqlClient" />
88

99
<add name="SqlServerDataConnection" connectionString="Database='mysql';Data Source=localhost;User ID=root;Port=3306;SslMode=None;"

src/DotnetSpider.Extension.Test/app.service.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<connectionStrings>
4-
<add name="SystemConnection" connectionString="Database='mysql';Data Source=localhost;User ID=root;Port=3306;SslMode=None;"
4+
<add name="SystemConnection" connectionString="Database='mysql';Data Source=localhost;Password=1qazZAQ!;User ID=root;Port=3306;SslMode=None;"
55
providerName="MySql.Data.MySqlClient" />
6-
<add name="DataConnection" connectionString="Database='mysql';Data Source=localhost;User ID=root;Port=3306;SslMode=None;"
6+
<add name="DataConnection" connectionString="Database='mysql';Data Source=localhost;Password=1qazZAQ!;User ID=root;Port=3306;SslMode=None;"
77
providerName="MySql.Data.MySqlClient" />
88
</connectionStrings>
99
<appSettings>

src/DotnetSpider.Extension/Processor/ModelProcessor.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ public ModelProcessor(IModel model, IModelExtractor extractor = null, params IDa
7272
}
7373
}
7474

75-
RequestExtractor = xPaths.Any(x => x == null || x == ".") ? new XPathRequestExtractor(".") : new XPathRequestExtractor(xPaths);
75+
RequestExtractor = xPaths.Any(x => x == null || x == ".")
76+
? new XPathRequestExtractor(".")
77+
: (xPaths.Count == 0 ? null : new XPathRequestExtractor(xPaths));
7678

7779
if (dataHandlers == null) return;
7880
foreach (var dataHandler in dataHandlers)

0 commit comments

Comments
 (0)