You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2013/12/18 14:30:34 UTC
git commit: updated refs/heads/master to 2e91cbe
Updated Branches:
refs/heads/master cc27a740d -> 2e91cbe1a
rats
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2e91cbe1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e91cbe1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e91cbe1
Branch: refs/heads/master
Commit: 2e91cbe1aeea04737a86fcb7183b5c06a61a3f12
Parents: cc27a74
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Dec 18 14:30:26 2013 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Wed Dec 18 14:30:26 2013 +0100
----------------------------------------------------------------------
.../com/cloud/usage/UsageSanityCheckerIT.java | 37 ++++++++++++++------
.../com/cloud/usage/UsageSanityCheckerTest.java | 22 ++++++++++--
usage/test/resources/cloud1.xml | 9 +++++
usage/test/resources/cloud2.xml | 9 +++++
usage/test/resources/cloud3.xml | 9 +++++
usage/test/resources/cloud_usage1.xml | 9 +++++
usage/test/resources/cloud_usage2.xml | 9 +++++
usage/test/resources/cloud_usage3.xml | 9 +++++
8 files changed, 99 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e91cbe1/usage/test/com/cloud/usage/UsageSanityCheckerIT.java
----------------------------------------------------------------------
diff --git a/usage/test/com/cloud/usage/UsageSanityCheckerIT.java b/usage/test/com/cloud/usage/UsageSanityCheckerIT.java
index 412bebc..d8a6580 100644
--- a/usage/test/com/cloud/usage/UsageSanityCheckerIT.java
+++ b/usage/test/com/cloud/usage/UsageSanityCheckerIT.java
@@ -1,14 +1,37 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// 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.
package com.cloud.usage;
+import static org.junit.Assert.assertEquals;
+
+import java.io.FileNotFoundException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Properties;
+
import org.dbunit.DatabaseUnitException;
import org.dbunit.dataset.DataSetException;
import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
import org.dbunit.ext.mysql.MySqlConnection;
import org.dbunit.operation.DatabaseOperation;
-
-import static org.junit.Assert.assertEquals;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -19,14 +42,6 @@ import org.mockito.Mockito;
import com.cloud.utils.PropertiesUtil;
-import java.io.FileNotFoundException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Properties;
-
@RunWith(Parameterized.class)
public class UsageSanityCheckerIT{
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e91cbe1/usage/test/com/cloud/usage/UsageSanityCheckerTest.java
----------------------------------------------------------------------
diff --git a/usage/test/com/cloud/usage/UsageSanityCheckerTest.java b/usage/test/com/cloud/usage/UsageSanityCheckerTest.java
index 346a8ad..69e3ea1 100644
--- a/usage/test/com/cloud/usage/UsageSanityCheckerTest.java
+++ b/usage/test/com/cloud/usage/UsageSanityCheckerTest.java
@@ -1,8 +1,21 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// 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.
package com.cloud.usage;
-import org.junit.Test;
-import org.mockito.Mockito;
-
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -12,6 +25,9 @@ import java.util.regex.Pattern;
import junit.framework.TestCase;
+import org.junit.Test;
+import org.mockito.Mockito;
+
public class UsageSanityCheckerTest extends TestCase {
@Test
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e91cbe1/usage/test/resources/cloud1.xml
----------------------------------------------------------------------
diff --git a/usage/test/resources/cloud1.xml b/usage/test/resources/cloud1.xml
index e56ed07..e148c58 100644
--- a/usage/test/resources/cloud1.xml
+++ b/usage/test/resources/cloud1.xml
@@ -1,3 +1,12 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to you 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. -->
<!-- cloud -->
<dataset>
<configuration name="usage.stats.job.aggregation.range" value="600"/>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e91cbe1/usage/test/resources/cloud2.xml
----------------------------------------------------------------------
diff --git a/usage/test/resources/cloud2.xml b/usage/test/resources/cloud2.xml
index e56ed07..e148c58 100644
--- a/usage/test/resources/cloud2.xml
+++ b/usage/test/resources/cloud2.xml
@@ -1,3 +1,12 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to you 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. -->
<!-- cloud -->
<dataset>
<configuration name="usage.stats.job.aggregation.range" value="600"/>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e91cbe1/usage/test/resources/cloud3.xml
----------------------------------------------------------------------
diff --git a/usage/test/resources/cloud3.xml b/usage/test/resources/cloud3.xml
index 6e7a745..4188c1c 100644
--- a/usage/test/resources/cloud3.xml
+++ b/usage/test/resources/cloud3.xml
@@ -1,3 +1,12 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to you 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. -->
<!-- cloud -->
<dataset>
<volumes id="17" removed="0"/>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e91cbe1/usage/test/resources/cloud_usage1.xml
----------------------------------------------------------------------
diff --git a/usage/test/resources/cloud_usage1.xml b/usage/test/resources/cloud_usage1.xml
index aaad17d..20528bf 100644
--- a/usage/test/resources/cloud_usage1.xml
+++ b/usage/test/resources/cloud_usage1.xml
@@ -1,3 +1,12 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to you 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. -->
<!-- cloud_usage -->
<dataset>
<cloud_usage usage_type="1" raw_usage="11" usage_id="8" id="8" start_date="1" zone_id="1"/>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e91cbe1/usage/test/resources/cloud_usage2.xml
----------------------------------------------------------------------
diff --git a/usage/test/resources/cloud_usage2.xml b/usage/test/resources/cloud_usage2.xml
index d87d05a..7cc3991 100644
--- a/usage/test/resources/cloud_usage2.xml
+++ b/usage/test/resources/cloud_usage2.xml
@@ -1,3 +1,12 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to you 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. -->
<!-- cloud_usage -->
<dataset>
<cloud_usage usage_type="1" raw_usage="11" usage_id="8" id="8" start_date="1" zone_id="1"/>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e91cbe1/usage/test/resources/cloud_usage3.xml
----------------------------------------------------------------------
diff --git a/usage/test/resources/cloud_usage3.xml b/usage/test/resources/cloud_usage3.xml
index 332ddfc..d8922e1 100644
--- a/usage/test/resources/cloud_usage3.xml
+++ b/usage/test/resources/cloud_usage3.xml
@@ -1,3 +1,12 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to you 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. -->
<!-- cloud_usage -->
<dataset>
<cloud_usage usage_type="1" raw_usage="11" usage_id="8" id="8" start_date="1" zone_id="1"/>