db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1369814 - in /db/derby/code/trunk/java/tools/org/apache/derby: impl/tools/ij/ij.jj loc/toolsmessages.properties
Date Mon, 06 Aug 2012 12:32:40 GMT
Author: rhillegas
Date: Mon Aug  6 12:32:40 2012
New Revision: 1369814

URL: http://svn.apache.org/viewvc?rev=1369814&view=rev
Log:
DERBY-5890: Remove the ij EXPECT command.

Modified:
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj?rev=1369814&r1=1369813&r2=1369814&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj Mon Aug  6 12:32:40
2012
@@ -414,24 +414,6 @@ class ij {
 
 	ijResult quit() throws SQLException {
 		exit = true;
-		if (getExpect()) { // report stats
-			// FIXME: replace with MVC...
-			// FIXME: this is a kludgy way to quiet /0 and make 0/0=1...
-			int numExpectOr1 = (numExpect==0?1:numExpect);
-			int numPassOr1 = (numPass==numExpect && numPass==0)?1:numPass;
-			int numFailOr1 = (numFail==numExpect && numFail==0)?1:numFail;
-			int numUnxOr1 = (numUnx==numExpect && numUnx==0)?1:numUnx;
-
-            LocalizedResource.OutputWriter().println(LocalizedResource.getMessage("IJ_TestsRun0Pass12Fail34",
-            new Object[]{
-			LocalizedResource.getNumber(numExpect), LocalizedResource.getNumber(100*(numPassOr1/numExpectOr1)),
-			LocalizedResource.getNumber(100*(numFailOr1/numExpectOr1))}));
-                        if (numUnx > 0) {
-							LocalizedResource.OutputWriter().println();
-							LocalizedResource.OutputWriter().println(LocalizedResource.getMessage("IJ_UnexpResulUnx01",
-							LocalizedResource.getNumber(numUnx), LocalizedResource.getNumber(100*(numUnxOr1/numExpectOr1))));
						
-			}
-		}
 		currentConnEnv.removeAllSessions();
 		theConnection = null;
 		return null;
@@ -475,30 +457,6 @@ class ij {
 		}
 	}
 
-	/**
-		Note the Expect Result in the output and in the stats.
-
-		FIXME
-	 */
-	int numExpect, numPass, numFail, numUnx;
-	private void noteExpect(boolean actual, boolean want) {
-		numExpect++;
-		if (actual) numPass++;
-		else numFail++;
-
-                LocalizedResource.OutputWriter().print(LocalizedResource.getMessage(actual?"IJ_Pass":"IJ_Fail"));
-		if (actual != want) {
-			numUnx++;
-					LocalizedResource.OutputWriter().println(LocalizedResource.getMessage("IJ_Unx"));
-		}
-                else LocalizedResource.OutputWriter().println();
-	}
-
-	private boolean getExpect() {
-		String s = util.getSystemProperty("ij.expect");
-		return Boolean.valueOf(s).booleanValue();
-	}
-
 	private	ijResult	addSession
 	(
 		Connection	newConnection,
@@ -1229,7 +1187,6 @@ TOKEN [IGNORE_CASE] :
 |	<EQUALS_OPERATOR: "=">
 |	<EXECUTE: "execute">
 |	<EXIT: "exit">
-|	<EXPECT: "expect">
 |	<FAIL: "fail">
 |	<FIRST: "first">
 |	<FOR: "for">
@@ -1623,7 +1580,6 @@ throws SQLException
 |	r=ExecuteStatement()	
 |	r=FirstStatement()	
 |	r=ExitStatement()
-|	r=ExpectStatement()
 |	r=GetCursorStatement()	
 |	r=GetCurrentRowNumber()	
 |	r=HelpStatement()	
@@ -3010,43 +2966,6 @@ Bang() :
 	}
 }
 
-/**
-	ExpectStatement is EXPECT [ FAIL ] {'String'}* END EXPECT
-	<p>
-	Will eventually detect the lines that the strings are without
-	special literals, but for now this is expedient (except for the
-	doubling of quotes...)
-	<p>
-	Used to test the previous statement's output. Note that ij must be
-	in "expect" mode to use this statement, otherwise it is just
-	ignored.  This is due to the overhead of tracking the prior statement's
-	output.
- */
-ijResult
-ExpectStatement() :
-{
-	Token f = null;
-	Vector stringVector = new Vector();
-}
-{
-	<EXPECT> [ f = <FAIL> ] StringList(stringVector) <END> <EXPECT>
-	{
-		if (!getExpect()) return null; // don't bother processing.
-
-		// FIXME
-
-		// Do the comparison of the string list to the prior rows of
-		// output, using a row-by-row perl-regex comparison.
-		boolean result = true;
-
-		// register the result and whether it should be true or false
-		// FIXME: how to find the expecter??
-		noteExpect(result, f==null);
-
-		return null;
-	}
-}
-
 void
 StringList(Vector v) :
 {
@@ -3850,7 +3769,6 @@ keyword() :
 |	tok = <END>
 |	tok = <EXECUTE>
 |	tok = <EXIT>
-|	tok = <EXPECT>
 |	tok = <FAIL>
 |	tok = <FIRST>
 |	tok = <FOR>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties?rev=1369814&r1=1369813&r2=1369814&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Mon Aug 
6 12:32:40 2012
@@ -55,14 +55,10 @@ IJ_IjErroUnabTo=IJ ERROR: unable to rese
 IJ_IjErroMaxiVa=IJ ERROR: maximumDisplayWidth value {0} is not a value integer.
 
 # From ij.jj
-IJ_Pass=PASS
-IJ_Fail=FAIL
 IJ_Unx=\ **** UNX
 IJ_NoConneAvail=No connections available.
 IJ_CurreConne=* = current connection
 IJ_NoCurreConne=No current connection
-IJ_TestsRun0Pass12Fail34=Tests run: {0}   pass: {1} ({2}%)   fail: {3} ({4}%)
-IJ_UnexpResulUnx01=***** UNEXPECTED RESULTS,   unx: {0} ({1}%) *****
 
 #
 # This long, multi-line message is the help text for the ij command.



Mime
View raw message