You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by km...@apache.org on 2007/12/20 15:27:36 UTC
svn commit: r605939 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne:
access/ access/trans/ conf/ gen/ tools/ unit/jira/ xml/
Author: kmenard
Date: Thu Dec 20 06:27:34 2007
New Revision: 605939
URL: http://svn.apache.org/viewvc?rev=605939&view=rev
Log:
java5: Replaced indexOf() calls with contains() calls on strings to improve readability.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/OrderingTranslatorTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigSaverTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/DeploymentConfiguratorTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_236Test.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/xml/XMLEncoderTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java?rev=605939&r1=605938&r2=605939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java Thu Dec 20 06:27:34 2007
@@ -41,7 +41,7 @@
new EventManager());
assertEquals("cacheXYZ", cache.getName());
assertNotNull(cache.getSnapshotEventSubject());
- assertTrue(cache.getSnapshotEventSubject().getSubjectName().indexOf("cacheXYZ") >= 0);
+ assertTrue(cache.getSnapshotEventSubject().getSubjectName().contains("cacheXYZ"));
assertEquals(DataRowStore.REMOTE_NOTIFICATION_DEFAULT, cache
.isNotifyingRemoteListeners());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/OrderingTranslatorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/OrderingTranslatorTest.java?rev=605939&r1=605938&r2=605939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/OrderingTranslatorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/OrderingTranslatorTest.java Thu Dec 20 06:27:34 2007
@@ -85,7 +85,7 @@
String orderBySql = new OrderingTranslator(qa).doTranslation();
assertNotNull(orderBySql);
- assertTrue(orderBySql.indexOf("UPPER(") != -1);
+ assertTrue(orderBySql.contains("UPPER("));
tstCase.assertTranslatedWell(orderBySql);
}
finally {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigSaverTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigSaverTest.java?rev=605939&r1=605938&r2=605939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigSaverTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigSaverTest.java Thu Dec 20 06:27:34 2007
@@ -84,29 +84,25 @@
if (info.getDataSourceUrl() != null) {
assertTrue(
"URL not saved: " + info.getDataSourceUrl(),
- buf.toString().indexOf("<url value=\"" + info.getDataSourceUrl() + "\"/>")
- >= 0);
+ buf.toString().contains("<url value=\"" + info.getDataSourceUrl() + "\"/>"));
}
if (info.getJdbcDriver() != null) {
assertTrue(
"Driver not saved: " + info.getJdbcDriver(),
- buf.toString().indexOf("<driver project-version=\"" + Project.CURRENT_PROJECT_VERSION + "\" class=\"" + info.getJdbcDriver() + "\">")
- >= 0);
+ buf.toString().contains("<driver project-version=\"" + Project.CURRENT_PROJECT_VERSION + "\" class=\"" + info.getJdbcDriver() + "\">"));
}
if (info.getUserName() != null) {
assertTrue(
"User name not saved: " + info.getUserName(),
- buf.toString().indexOf("userName=\"" + info.getUserName() + "\"")
- >= 0);
+ buf.toString().contains("userName=\"" + info.getUserName() + "\""));
}
if (info.getPassword() != null) {
assertTrue(
"Password not saved: " + info.getPassword(),
- buf.toString().indexOf("password=\"" + info.getPassword() + "\"")
- >= 0);
+ buf.toString().contains("password=\"" + info.getPassword() + "\""));
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java?rev=605939&r1=605938&r2=605939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java Thu Dec 20 06:27:34 2007
@@ -70,15 +70,14 @@
assertEquals(2, generated.size());
String superclass = generated.get(0);
- assertTrue(superclass, superclass.indexOf("package org.example.auto;") >= 0);
- assertTrue(superclass, superclass
- .indexOf("import org.apache.cayenne.CayenneDataObject;") >= 0);
+ assertTrue(superclass, superclass.contains("package org.example.auto;"));
+ assertTrue(superclass, superclass.contains("import org.apache.cayenne.CayenneDataObject;"));
String subclass = generated.get(1);
- assertTrue(subclass, subclass.indexOf("package org.example;") >= 0);
+ assertTrue(subclass, subclass.contains("package org.example;"));
assertTrue(
subclass,
- subclass.indexOf("import org.example.auto._TestClass1;") >= 0);
+ subclass.contains("import org.example.auto._TestClass1;"));
}
public void testExecuteArtifactPairsMapRelationships() throws Exception {
@@ -111,7 +110,7 @@
assertEquals(2, generated.size());
String superclass = generated.get(0);
- assertTrue(superclass, superclass.indexOf("import java.util.Map;") >= 0);
+ assertTrue(superclass, superclass.contains("import java.util.Map;"));
}
protected List<String> execute(Artifact artifact) throws Exception {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java?rev=605939&r1=605938&r2=605939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java Thu Dec 20 06:27:34 2007
@@ -67,7 +67,7 @@
+ generatedStatements
+ "> does not contain <"
+ expectedImportStatement
- + ">", -1 == generatedStatements.indexOf(expectedImportStatement));
+ + ">", !generatedStatements.contains(expectedImportStatement));
assertEquals("import statement appears multiple times.", generatedStatements
.lastIndexOf(expectedImportStatement), generatedStatements
.lastIndexOf(expectedImportStatement));
@@ -143,7 +143,7 @@
+ generatedStatements
+ "> does not contain <"
+ expectedImportStatement
- + ">", -1 == generatedStatements.indexOf(expectedImportStatement));
+ + ">", !generatedStatements.contains(expectedImportStatement));
assertEquals("import statement appears multiple times.", generatedStatements
.lastIndexOf(expectedImportStatement), generatedStatements
.lastIndexOf(expectedImportStatement));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java?rev=605939&r1=605938&r2=605939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java Thu Dec 20 06:27:34 2007
@@ -172,7 +172,7 @@
try {
String s = null;
while ((s = in.readLine()) != null) {
- if (s.indexOf(content) >= 0)
+ if (s.contains(content))
return;
}
@@ -208,7 +208,7 @@
String s = null;
while ((s = in.readLine()) != null) {
if (regexUtil.match("/^package\\s+([^\\s;]+);/", s + '\n')) {
- assertTrue(s.indexOf(packageName) >= 0);
+ assertTrue(s.contains(packageName));
return;
}
}
@@ -222,8 +222,8 @@
String s = null;
while ((s = in.readLine()) != null) {
if (regexUtil.match("/class\\s+([^\\s]+)\\s+extends\\s+([^\\s]+)/", s + '\n')) {
- assertTrue(s.indexOf(className) >= 0);
- assertTrue(s.indexOf(extendsName) >= 0);
+ assertTrue(s.contains(className));
+ assertTrue(s.contains(extendsName));
assertTrue(s.indexOf(className) < s.indexOf(extendsName));
return;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/DeploymentConfiguratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/DeploymentConfiguratorTest.java?rev=605939&r1=605938&r2=605939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/DeploymentConfiguratorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/DeploymentConfiguratorTest.java Thu Dec 20 06:27:34 2007
@@ -150,8 +150,8 @@
File newRoot = new File(project.getBaseDir(), Configuration.DEFAULT_DOMAIN_FILE);
String fileContents = Util.stringFromFile(newRoot);
- assertTrue(fileContents.indexOf(node.getName()) >= 0);
- assertTrue(fileContents.indexOf(node.getAdapter()) >= 0);
+ assertTrue(fileContents.contains(node.getName()));
+ assertTrue(fileContents.contains(node.getAdapter()));
}
public void testSameJar() throws Exception {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_236Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_236Test.java?rev=605939&r1=605938&r2=605939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_236Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_236Test.java Thu Dec 20 06:27:34 2007
@@ -60,7 +60,7 @@
file.saveTemp();
String contents = fileContents(mapFile, "UTF-8");
- assertTrue(contents.indexOf(TABLE1_BY) >= 0);
+ assertTrue(contents.contains(TABLE1_BY));
}
String fileContents(File f, String encoding) throws IOException {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/xml/XMLEncoderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/xml/XMLEncoderTest.java?rev=605939&r1=605938&r2=605939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/xml/XMLEncoderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/xml/XMLEncoderTest.java Thu Dec 20 06:27:34 2007
@@ -38,7 +38,7 @@
static final boolean windows;
static {
- if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") >= 0) {
+ if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) {
windows = true;
}
else {