Alissa Bonas has uploaded a new change for review.
Change subject: core: add test for duplicate keys in appErrors
......................................................................
core: add test for duplicate keys in appErrors
The tests introduced in this patch check if in AppErrors.properties
files in 3 locations there are duplicate keys (Same key with different
message)
Change-Id: I143cb08908db4feed84ec2b94a17d89c1e522951
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M backend/manager/modules/dal/pom.xml
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/DuplicateKeysTest.java
A
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/DuplicateKeysCheck.java
R
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ExtendedProperties.java
M frontend/webadmin/modules/userportal-gwtp/pom.xml
A
frontend/webadmin/modules/userportal-gwtp/src/test/java/org/ovirt/engine/ui/userportal/DuplicateKeysTest.java
M frontend/webadmin/modules/webadmin/pom.xml
A
frontend/webadmin/modules/webadmin/src/test/java/org.ovirt.engine.ui.webadmin/DuplicateKeysTest.java
8 files changed, 98 insertions(+), 33 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/11343/1
diff --git a/backend/manager/modules/dal/pom.xml
b/backend/manager/modules/dal/pom.xml
index 69cb04e..4fb69f6 100644
--- a/backend/manager/modules/dal/pom.xml
+++ b/backend/manager/modules/dal/pom.xml
@@ -37,6 +37,13 @@
</dependency>
<dependency>
<groupId>${engine.groupId}</groupId>
+ <artifactId>utils</artifactId>
+ <version>${engine.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${engine.groupId}</groupId>
<artifactId>engineencryptutils</artifactId>
<version>${engine.version}</version>
</dependency>
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/DuplicateKeysTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/DuplicateKeysTest.java
index b195c01..cd2437f 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/DuplicateKeysTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/DuplicateKeysTest.java
@@ -1,44 +1,20 @@
package org.ovirt.engine.core;
import org.junit.Test;
+import org.ovirt.engine.core.utils.DuplicateKeysCheck;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
-import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeNotNull;
-/**
- * Created by IntelliJ IDEA.
- * User: abonas
- * Date: 1/6/13
- * Time: 6:46 PM
- * To change this template use File | Settings | File Templates.
- */
public class DuplicateKeysTest {
@Test
public void testkDuplicateKeys() {
- String fileName = "AppErrors.properties";
- File file = new File("../main/resources/bundles/" + fileName);
- file.exists();
- InputStream is =
this.getClass().getClassLoader().getResourceAsStream(fileName);
-// InputStream is =
this.getClass().getClassLoader().getResourceAsStream(fileName);
- ExtendedProperties props = new ExtendedProperties();
- try{
- props.load(is);
- }
- catch(NullPointerException npe) {
- System.out.println(npe);
- fail();
- }
- catch(IOException ioe) {
- fail("Test failed with " + ioe.getMessage());
- }
- catch(RuntimeException exception) {
- fail(exception.getMessage());
- }
-
-
+ String baseDir = System.getProperty("basedir");
+ assumeNotNull(baseDir);
+ String fileName = "AppErrors.properties";
+ File file = new File(baseDir + "/src/main/resources/bundles/" +
fileName);
+ DuplicateKeysCheck.checkDuplicateKeys(file.getAbsolutePath());
}
}
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/DuplicateKeysCheck.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/DuplicateKeysCheck.java
new file mode 100644
index 0000000..5908553
--- /dev/null
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/DuplicateKeysCheck.java
@@ -0,0 +1,28 @@
+package org.ovirt.engine.core.utils;
+
+import static org.junit.Assert.fail;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+
+public class DuplicateKeysCheck {
+ public static void checkDuplicateKeys(String filePath) {
+ InputStream is = null;
+ try {
+ is = new FileInputStream(filePath);
+ } catch (FileNotFoundException e) {
+ fail(e.getMessage());
+ }
+ ExtendedProperties props = new ExtendedProperties();
+ try {
+ props.load(is);
+ }
+
+ catch (Exception exception) {
+ fail("Check for duplicate keys in " + filePath + " failed: " +
exception.getMessage());
+ }
+
+ }
+}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/ExtendedProperties.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ExtendedProperties.java
similarity index 92%
rename from
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/ExtendedProperties.java
rename to
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ExtendedProperties.java
index 40e82cd..9a8e3a3 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/ExtendedProperties.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ExtendedProperties.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core;
+package org.ovirt.engine.core.utils;
import java.util.Properties;
diff --git a/frontend/webadmin/modules/userportal-gwtp/pom.xml
b/frontend/webadmin/modules/userportal-gwtp/pom.xml
index 96e8229..37f5cc8 100644
--- a/frontend/webadmin/modules/userportal-gwtp/pom.xml
+++ b/frontend/webadmin/modules/userportal-gwtp/pom.xml
@@ -124,6 +124,13 @@
<scope>provided</scope>
<version>${aspectj.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.ovirt.engine.core</groupId>
+ <artifactId>utils</artifactId>
+ <version>${engine.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/test/java/org/ovirt/engine/ui/userportal/DuplicateKeysTest.java
b/frontend/webadmin/modules/userportal-gwtp/src/test/java/org/ovirt/engine/ui/userportal/DuplicateKeysTest.java
new file mode 100644
index 0000000..3dc3730
--- /dev/null
+++
b/frontend/webadmin/modules/userportal-gwtp/src/test/java/org/ovirt/engine/ui/userportal/DuplicateKeysTest.java
@@ -0,0 +1,20 @@
+package org.ovirt.engine.ui.userportal;
+
+import org.junit.Test;
+import org.ovirt.engine.core.utils.DuplicateKeysCheck;
+
+import java.io.File;
+
+import static org.junit.Assume.assumeNotNull;
+
+public class DuplicateKeysTest {
+ @Test
+ public void testkDuplicateKeys() {
+ String baseDir = System.getProperty("basedir"); //$NON-NLS-1$
+ assumeNotNull(baseDir);
+ String fileName = "AppErrors.properties"; //$NON-NLS-1$
+ File file = new File(baseDir +
"/src/main/resources/org/ovirt/engine/ui/frontend/" + fileName); //$NON-NLS-1$
+ DuplicateKeysCheck.checkDuplicateKeys(file.getAbsolutePath());
+ }
+
+}
diff --git a/frontend/webadmin/modules/webadmin/pom.xml
b/frontend/webadmin/modules/webadmin/pom.xml
index 0ce5e74..cef9424 100644
--- a/frontend/webadmin/modules/webadmin/pom.xml
+++ b/frontend/webadmin/modules/webadmin/pom.xml
@@ -124,6 +124,13 @@
<scope>provided</scope>
<version>${aspectj.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.ovirt.engine.core</groupId>
+ <artifactId>utils</artifactId>
+ <version>${engine.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes
diff --git
a/frontend/webadmin/modules/webadmin/src/test/java/org.ovirt.engine.ui.webadmin/DuplicateKeysTest.java
b/frontend/webadmin/modules/webadmin/src/test/java/org.ovirt.engine.ui.webadmin/DuplicateKeysTest.java
new file mode 100644
index 0000000..cbc5810
--- /dev/null
+++
b/frontend/webadmin/modules/webadmin/src/test/java/org.ovirt.engine.ui.webadmin/DuplicateKeysTest.java
@@ -0,0 +1,20 @@
+package org.ovirt.engine.ui.webadmin;
+
+import org.junit.Test;
+import org.ovirt.engine.core.utils.DuplicateKeysCheck;
+
+import java.io.File;
+
+import static org.junit.Assume.assumeNotNull;
+
+public class DuplicateKeysTest {
+ @Test
+ public void testkDuplicateKeys() {
+ String baseDir = System.getProperty("basedir"); //$NON-NLS-1$
+ assumeNotNull(baseDir);
+ String fileName = "AppErrors.properties"; //$NON-NLS-1$
+ File file = new File(baseDir +
"/src/main/resources/org/ovirt/engine/ui/frontend/" + fileName); //$NON-NLS-1$
+ DuplicateKeysCheck.checkDuplicateKeys(file.getAbsolutePath());
+ }
+
+}
--
To view, visit http://gerrit.ovirt.org/11343
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I143cb08908db4feed84ec2b94a17d89c1e522951
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
