From eccd4ee661abbb7f70a1f2ef54b89a60990558a0 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Thu, 1 Dec 2005 18:39:11 +0300 Subject: [PATCH] Test fixed. --- .../uiDesigner/core/AsmCodeGeneratorTest.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ui-designer/tests/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java b/ui-designer/tests/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java index bb1d96695981..c3ebc40a0c6c 100644 --- a/ui-designer/tests/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java +++ b/ui-designer/tests/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java @@ -68,7 +68,7 @@ public class AsmCodeGeneratorTest extends TestCase { fos.close(); */ - return new MyClassLoader().doDefineClass("BindingTest", patchedData); + return new MyClassLoader(AsmCodeGeneratorTest.class.getClassLoader()).doDefineClass("BindingTest", patchedData); } private JComponent getInstrumentedRootComponent(final String formFileName, final String className) throws Exception { @@ -230,8 +230,13 @@ public class AsmCodeGeneratorTest extends TestCase { assertEquals(textField, label.getLabelFor()); } - private class MyClassLoader extends ClassLoader { - private byte[] myTestProperties = Charset.defaultCharset().encode("test=Test Value\nmnemonic=Mne&monic").array(); + private static class MyClassLoader extends ClassLoader { + private byte[] myTestProperties = Charset.defaultCharset().encode(TEST_PROPERTY_CONTENT).array(); + private static final String TEST_PROPERTY_CONTENT = "test=Test Value\nmnemonic=Mne&monic"; + + public MyClassLoader(ClassLoader parent) { + super(parent); + } public Class doDefineClass(String name, byte[] data) { return defineClass(name, data, 0, data.length); @@ -243,7 +248,7 @@ public class AsmCodeGeneratorTest extends TestCase { public InputStream getResourceAsStream(String name) { if (name.equals("TestProperties.properties")) { - return new ByteArrayInputStream(myTestProperties); + return new ByteArrayInputStream(myTestProperties, 0, TEST_PROPERTY_CONTENT.length()); } return super.getResourceAsStream(name); }