Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
1aaf2dea
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
1aaf2dea
编写于
5月 07, 2018
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
for #601: remove useless DbTestException
上级
f9f2dd5d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
45 deletion
+5
-45
sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/asserts/AssertEngine.java
...est/java/io/shardingjdbc/dbtest/asserts/AssertEngine.java
+5
-13
sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/exception/DbTestException.java
...ava/io/shardingjdbc/dbtest/exception/DbTestException.java
+0
-32
未找到文件。
sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/asserts/AssertEngine.java
浏览文件 @
1aaf2dea
...
...
@@ -17,6 +17,7 @@
package
io.shardingjdbc.dbtest.asserts
;
import
com.google.common.base.Preconditions
;
import
com.google.common.base.Strings
;
import
io.shardingjdbc.core.api.MasterSlaveDataSourceFactory
;
import
io.shardingjdbc.core.api.ShardingDataSourceFactory
;
...
...
@@ -36,7 +37,6 @@ import io.shardingjdbc.dbtest.env.DatabaseTypeEnvironment;
import
io.shardingjdbc.dbtest.env.EnvironmentPath
;
import
io.shardingjdbc.dbtest.env.datasource.DataSourceUtil
;
import
io.shardingjdbc.dbtest.env.schema.SchemaEnvironmentManager
;
import
io.shardingjdbc.dbtest.exception.DbTestException
;
import
io.shardingjdbc.test.sql.SQLCaseType
;
import
io.shardingjdbc.test.sql.SQLCasesLoader
;
import
lombok.AccessLevel
;
...
...
@@ -185,12 +185,8 @@ public final class AssertEngine {
Map
<
String
,
DatasetDefinition
>
mapDatasetDefinition
=
new
HashMap
<>();
Map
<
String
,
String
>
sqls
=
new
HashMap
<>();
getInitDatas
(
dataSourceNames
,
initDataFile
,
mapDatasetDefinition
,
sqls
);
if
(
mapDatasetDefinition
.
isEmpty
())
{
throw
new
DbTestException
(
"Use cases cannot be parsed"
);
}
if
(
sqls
.
isEmpty
())
{
throw
new
DbTestException
(
"The use case cannot initialize the data"
);
}
Preconditions
.
checkState
(!
mapDatasetDefinition
.
isEmpty
(),
"Use cases cannot be parsed"
);
Preconditions
.
checkState
(!
sqls
.
isEmpty
(),
"The use case cannot initialize the data"
);
String
expectedDataFile
=
rootPath
+
"asserts/dml/"
+
shardingRuleType
+
"/"
+
dmlDefinition
.
getExpectedDataFile
();
if
(!
new
File
(
expectedDataFile
).
exists
())
{
expectedDataFile
=
rootPath
+
"asserts/dml/"
+
dmlDefinition
.
getExpectedDataFile
();
...
...
@@ -322,12 +318,8 @@ public final class AssertEngine {
Map
<
String
,
DatasetDefinition
>
mapDatasetDefinition
=
new
HashMap
<>();
Map
<
String
,
String
>
sqls
=
new
HashMap
<>();
getInitDatas
(
dataSourceNames
,
initDataFile
,
mapDatasetDefinition
,
sqls
);
if
(
mapDatasetDefinition
.
isEmpty
())
{
throw
new
DbTestException
(
"Use cases cannot be parsed"
);
}
if
(
sqls
.
isEmpty
())
{
throw
new
DbTestException
(
"The use case cannot initialize the data"
);
}
Preconditions
.
checkState
(!
mapDatasetDefinition
.
isEmpty
(),
"Use cases cannot be parsed"
);
Preconditions
.
checkState
(!
sqls
.
isEmpty
(),
"The use case cannot initialize the data"
);
try
{
initTableData
(
dataSourceMaps
,
sqls
,
mapDatasetDefinition
);
String
expectedDataFile
=
rootPath
+
"asserts/dql/"
+
shardingRuleType
+
"/"
+
dqlDefinition
.
getExpectedDataFile
();
...
...
sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/exception/DbTestException.java
已删除
100644 → 0
浏览文件 @
f9f2dd5d
/*
* Copyright 1999-2015 dangdang.com.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* </p>
*/
package
io.shardingjdbc.dbtest.exception
;
public
class
DbTestException
extends
RuntimeException
{
private
static
final
long
serialVersionUID
=
8269224755642356888L
;
public
DbTestException
(
final
String
message
)
{
super
(
message
);
}
public
DbTestException
(
final
Throwable
cause
)
{
super
(
cause
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录