From 77ac7ec630996b366c4cb112b9c4dc131c69c85e Mon Sep 17 00:00:00 2001 From: Hiroyuki Ikezoe Date: Mon, 18 May 2009 10:27:40 +1200 Subject: [PATCH] Bug 482558. Remove obsolete test. r=smontagu --- extensions/universalchardet/tests/Makefile.in | 22 ---- .../tests/UniversalChardetTest.cpp | 118 ------------------ 2 files changed, 140 deletions(-) delete mode 100644 extensions/universalchardet/tests/UniversalChardetTest.cpp diff --git a/extensions/universalchardet/tests/Makefile.in b/extensions/universalchardet/tests/Makefile.in index 27e45f2d8ba2..159736d24904 100644 --- a/extensions/universalchardet/tests/Makefile.in +++ b/extensions/universalchardet/tests/Makefile.in @@ -43,28 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = universalchardet -MOZILLA_INTERNAL_API = 1 - -REQUIRES = xpcom \ - $(NULL) - -CPPSRCS = \ - UniversalChardetTest.cpp \ - $(NULL) - -LOCAL_INCLUDES = -I$(srcdir)/../src/base - -SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) - -include $(topsrcdir)/config/config.mk - -LIBS += \ - $(LIBS_DIR) \ - ../src/base/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \ - $(NSPR_LIBS) \ - $(NULL) - include $(topsrcdir)/config/rules.mk relativesrcdir = extensions/universalchardet/tests diff --git a/extensions/universalchardet/tests/UniversalChardetTest.cpp b/extensions/universalchardet/tests/UniversalChardetTest.cpp deleted file mode 100644 index 0475064cb5d2..000000000000 --- a/extensions/universalchardet/tests/UniversalChardetTest.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (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.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Pierre Phaneuf - * Proofpoint, Inc. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#include -#include -#if defined(XP_WIN) || defined(XP_OS2) -#include -#endif -#if defined(XP_UNIX) || defined(XP_BEOS) -#include -#endif -#include "nscore.h" -#include "nsUniversalDetector.h" - -#define MAXBSIZE (1L << 13) - -void usage() { - printf("Usage: DetectFile blocksize\n" - " blocksize: 1 ~ %ld\n" - " Data are passed in from STDIN\n" - , MAXBSIZE); -} - -class nsUniversalChardetTest : public nsUniversalDetector -{ - public: - nsUniversalChardetTest() : nsUniversalDetector(NS_FILTER_ALL) { }; - virtual ~nsUniversalChardetTest() { }; - - PRBool done() const { return mDone; } - - private: - virtual void Report(const char* aCharset) - { - printf("RESULT CHARSET : %s\n", aCharset); - }; -}; - -int main(int argc, char** argv) { - char buf[MAXBSIZE]; - PRUint32 bs; - if( 2 != argc ) - { - usage(); - printf("Need 1 arguments\n"); - return(-1); - } - bs = atoi(argv[1]); - if((bs <1)||(bs>MAXBSIZE)) - { - usage(); - printf("blocksize out of range - %s\n", argv[2]); - return(-1); - } - nsresult rev = NS_OK; - nsUniversalChardetTest *det = new nsUniversalChardetTest; - if(nsnull == det){ - usage(); - printf("Error: Could not find Universal Detector\n"); - return(-1); - } - - size_t sz; - PRBool done = PR_FALSE; - do - { - sz = read(0, buf, bs); - if(sz > 0) { - if(! done) { - rev = det->HandleData( buf, sz); - if(NS_FAILED(rev)) - { - printf("HANDLEDATA ERROR CODE = %x\n", rev); - return(-1); - } - } - } - } while((sz > 0) && (!det->done()) ); - //} while(sz > 0); - det->DataEnd(); - - return (0); -}