Author: bfoster
Date: Mon May 7 23:33:38 2012
New Revision: 1335302
URL: http://svn.apache.org/viewvc?rev=1335302&view=rev
Log:
Fixin the build
Modified:
oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/TestPGETaskInstance.java
oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/staging/TestFileStager.java
Modified:
oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/TestPGETaskInstance.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/TestPGETaskInstance.java?rev=1335302&r1=1335301&r2=1335302&view=diff
==============================================================================
--- oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/TestPGETaskInstance.java
(original)
+++ oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/TestPGETaskInstance.java
Mon May 7 23:33:38 2012
@@ -515,10 +515,10 @@ public class TestPGETaskInstance extends
replay(pc);
pgeTask.logger = createMock(Logger.class);
- pgeTask.logger.log(Level.INFO, "Verifying ingests successful...");
- pgeTask.logger.log(Level.WARNING,
+ pgeTask.logger.info("Verifying ingests successful...");
+ pgeTask.logger.warning(
"Product was not ingested
[file='/tmp/dir1',result='PRECONDS_FAILED',msg='Preconditions failed']");
- pgeTask.logger.log(Level.INFO, "Ingests were successful");
+ pgeTask.logger.info("Ingests were successful");
replay(pgeTask.logger);
pgeTask.verifyIngests(pc);
@@ -547,8 +547,8 @@ public class TestPGETaskInstance extends
replay(pc);
pgeTask.logger = createMock(Logger.class);
- pgeTask.logger.log(Level.INFO, "Verifying ingests successful...");
- pgeTask.logger.log(Level.INFO, "Ingests were successful");
+ pgeTask.logger.info("Verifying ingests successful...");
+ pgeTask.logger.info("Ingests were successful");
replay(pgeTask.logger);
pgeTask.verifyIngests(pc);
Modified:
oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/staging/TestFileStager.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/staging/TestFileStager.java?rev=1335302&r1=1335301&r2=1335302&view=diff
==============================================================================
--- oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/staging/TestFileStager.java
(original)
+++ oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/staging/TestFileStager.java
Mon May 7 23:33:38 2012
@@ -16,13 +16,11 @@
*/
package org.apache.oodt.cas.pge.staging;
-//OODT static imports
-import static
org.apache.oodt.cas.pge.staging.TestFileStager.ProductIdMatcher.eqProductId;
-
//EasyMock static imports
import static org.easymock.EasyMock.createStrictMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reportMatcher;
import static org.easymock.EasyMock.verify;
//JDK imports
@@ -50,6 +48,9 @@ import com.google.common.collect.Lists;
//JUnit imports
import junit.framework.TestCase;
+//OODT static imports
+import static
org.apache.oodt.cas.pge.staging.TestFileStager.ProductIdMatcher.eqProductId;
+
/**
* Test class for {@link FileStager}.
*
@@ -153,7 +154,7 @@ public class TestFileStager extends Test
}
public static Product eqProductId(String productId) {
- EasyMock.reportMatcher(new ProductIdMatcher(productId));
+ reportMatcher(new ProductIdMatcher(productId));
return null;
}
}