Attachment #133606 for bug #228700

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 228700
Collapse All | Expand All

Lines 263-269 Link Here

(-)a/openide.loaders/src/org/openide/loaders/DefaultDataObject.java (-1 / +1 lines)
263	try {	263	try {
264	int len = is.read (arr);	264	int len = is.read (arr);
265	for (int i = 0; i < len; i++) {	265	for (int i = 0; i < len; i++) {
266	if (arr[i] >= 0 && arr[i] <= 31 && arr[i] != '\n' && arr[i] != '\r' && arr[i] != '\t') {	266	if (arr[i] >= 0 && arr[i] <= 31 && arr[i] != '\n' && arr[i] != '\r' && arr[i] != '\t' && arr[i] != '\f') {
267	return;	267	return;
268	}	268	}
269	}	269	}




import java.beans.PropertyVetoException;
import java.beans.VetoableChangeListener;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.logging.Level;
import javax.swing.JEditorPane;
import javax.swing.SwingUtilities;
import javax.swing.text.StyledDocument;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
import org.netbeans.junit.MockServices;
import org.netbeans.junit.NbTestCase;
import org.netbeans.junit.RandomlyFails;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.cookies.EditCookie;
import org.openide.cookies.EditorCookie;
import org.openide.cookies.OpenCookie;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileSystem;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.Repository;
import org.openide.nodes.Node;
import org.openide.nodes.NodeAdapter;

        assertEquals(".htaccess", fo.getNameExt());
    }

    /**
     * Test that text files are not recognized as binary files. See bug 228700.
     */
    public void testFixCookieSetRecognizesBinaryFiles() throws IOException {

        byte[] allowedTextBytes = new byte[]{
            '\n', '\r', '\t', '\f'
        };
        for (byte b : allowedTextBytes) {
            assertNotNull("File that contains an allowed byte " + b
                    + " shouldn't be recognized as binary file",
                    createDataObjectWithContent(b)
                    .getLookup().lookup(EditCookie.class));
        }
        for (byte b = 0; b <= 31; b++) {
            if (createDataObjectWithContent(b)
                    .getLookup().lookup(EditCookie.class) != null) {
                boolean isAllowed = false;
                for (int j = 0; j < allowedTextBytes.length; j++) {
                    if (b == allowedTextBytes[j]) {
                        isAllowed = true;
                        break;
                    }
                }
                assertTrue("File containing byte " + b + " should not be "
                        + "recognized as text file.", isAllowed);
            }
        }
    }

    private DataObject createDataObjectWithContent(byte singleByteContent)
            throws IOException {
        FileSystem fs = FileUtil.createMemoryFileSystem();
        FileObject fob = fs.getRoot().createData("test.txt");
        OutputStream os = fob.getOutputStream();
        try {
            os.write(new byte[]{singleByteContent});
        } finally {
            os.close();
        }
        DataObject dob = DataObject.find(fob);
        if (!(dob instanceof DefaultDataObject)) {
            fail("Expected an instance of DefaultDataObject");
        }
        return dob;
    }

    private void waitEQ() throws Exception {
        getEPanes(null);
    }

Return to bug 228700

Lines 47-68 Link Here

(-)a/openide.loaders/test/unit/src/org/openide/loaders/DefaultDataObjectTest.java (+52 lines)
47	import java.beans.PropertyVetoException;	47	import java.beans.PropertyVetoException;
48	import java.beans.VetoableChangeListener;	48	import java.beans.VetoableChangeListener;
49	import java.io.IOException;	49	import java.io.IOException;
		50	import java.io.OutputStream;
50	import java.util.Arrays;	51	import java.util.Arrays;
51	import java.util.Enumeration;	52	import java.util.Enumeration;
52	import java.util.logging.Level;	53	import java.util.logging.Level;
53	import javax.swing.JEditorPane;	54	import javax.swing.JEditorPane;
54	import javax.swing.SwingUtilities;	55	import javax.swing.SwingUtilities;
55	import javax.swing.text.StyledDocument;	56	import javax.swing.text.StyledDocument;
		57	import static junit.framework.Assert.assertNotNull;
		58	import static junit.framework.Assert.assertTrue;
56	import org.netbeans.junit.MockServices;	59	import org.netbeans.junit.MockServices;
57	import org.netbeans.junit.NbTestCase;	60	import org.netbeans.junit.NbTestCase;
58	import org.netbeans.junit.RandomlyFails;	61	import org.netbeans.junit.RandomlyFails;
59	import org.openide.DialogDescriptor;	62	import org.openide.DialogDescriptor;
60	import org.openide.DialogDisplayer;	63	import org.openide.DialogDisplayer;
61	import org.openide.NotifyDescriptor;	64	import org.openide.NotifyDescriptor;
		65	import org.openide.cookies.EditCookie;
62	import org.openide.cookies.EditorCookie;	66	import org.openide.cookies.EditorCookie;
63	import org.openide.cookies.OpenCookie;	67	import org.openide.cookies.OpenCookie;
64	import org.openide.filesystems.FileObject;	68	import org.openide.filesystems.FileObject;
65	import org.openide.filesystems.FileSystem;	69	import org.openide.filesystems.FileSystem;
		70	import org.openide.filesystems.FileUtil;
66	import org.openide.filesystems.Repository;	71	import org.openide.filesystems.Repository;
67	import org.openide.nodes.Node;	72	import org.openide.nodes.Node;
68	import org.openide.nodes.NodeAdapter;	73	import org.openide.nodes.NodeAdapter;
Lines 338-343 Link Here
338	assertEquals(".htaccess", fo.getNameExt());	343	assertEquals(".htaccess", fo.getNameExt());
339	}	344	}
340		345
		346	/**
		347	* Test that text files are not recognized as binary files. See bug 228700.
		348	*/
		349	public void testFixCookieSetRecognizesBinaryFiles() throws IOException {
		350
		351	byte[] allowedTextBytes = new byte[]{
		352	'\n', '\r', '\t', '\f'
		353	};
		354	for (byte b : allowedTextBytes) {
		355	assertNotNull("File that contains an allowed byte " + b
		356	+ " shouldn't be recognized as binary file",
		357	createDataObjectWithContent(b)
		358	.getLookup().lookup(EditCookie.class));
		359	}
		360	for (byte b = 0; b <= 31; b++) {
		361	if (createDataObjectWithContent(b)
		362	.getLookup().lookup(EditCookie.class) != null) {
		363	boolean isAllowed = false;
		364	for (int j = 0; j < allowedTextBytes.length; j++) {
		365	if (b == allowedTextBytes[j]) {
		366	isAllowed = true;
		367	break;
		368	}
		369	}
		370	assertTrue("File containing byte " + b + " should not be "
		371	+ "recognized as text file.", isAllowed);
		372	}
		373	}
		374	}
		375
		376	private DataObject createDataObjectWithContent(byte singleByteContent)
		377	throws IOException {
		378	FileSystem fs = FileUtil.createMemoryFileSystem();
		379	FileObject fob = fs.getRoot().createData("test.txt");
		380	OutputStream os = fob.getOutputStream();
		381	try {
		382	os.write(new byte[]{singleByteContent});
		383	} finally {
		384	os.close();
		385	}
		386	DataObject dob = DataObject.find(fob);
		387	if (!(dob instanceof DefaultDataObject)) {
		388	fail("Expected an instance of DefaultDataObject");
		389	}
		390	return dob;
		391	}
		392
341	private void waitEQ() throws Exception {	393	private void waitEQ() throws Exception {
342	getEPanes(null);	394	getEPanes(null);
343	}	395	}