From 5947786365990ad6431696f4f9a23f96864459f8 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 25 Apr 2020 12:17:24 +0300 Subject: [PATCH] Bug 562164 - Add JUnit tests for IMemoryImporter and IMemoryExporter Prepare to extract IMemoryExporter implementations Change-Id: Ib1c2cfd15979628c45a7685ef490ef565af8eb48 Signed-off-by: Alexander Fedorov --- .../debug/core/memory/transport/FileImport.java | 8 ++++---- .../{FileImportJob.java => TransportJob.java} | 14 +++++++------- .../ui/memory/transport/PlainTextImporter.java | 4 ++-- .../ui/memory/transport/RAWBinaryImporter.java | 4 ++-- .../debug/ui/memory/transport/SRecordImporter.java | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) rename memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/internal/core/memory/transport/{FileImportJob.java => TransportJob.java} (75%) diff --git a/memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/core/memory/transport/FileImport.java b/memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/core/memory/transport/FileImport.java index d0a0f295902..72e37ccc5d2 100644 --- a/memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/core/memory/transport/FileImport.java +++ b/memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/core/memory/transport/FileImport.java @@ -41,10 +41,10 @@ public abstract class FileImport implements ICoreRunnab protected final WriteMemory write; protected final Consumer scroll; - private final File inputFile; + private final File file; protected FileImport(File input, ImportRequest request, Consumer scroll) { - this.inputFile = input; + this.file = input; this.base = request.base(); this.start = request.start(); this.write = request.write(); @@ -53,8 +53,8 @@ public abstract class FileImport implements ICoreRunnab @Override public void run(IProgressMonitor monitor) throws CoreException { - try (I reader = input(inputFile)) { - BigInteger jobs = BigInteger.valueOf(inputFile.length()); + try (I reader = input(file)) { + BigInteger jobs = BigInteger.valueOf(file.length()); BigInteger factor = BigInteger.ONE; if (jobs.compareTo(BigInteger.valueOf(0x7FFFFFFF)) > 0) { factor = jobs.divide(BigInteger.valueOf(0x7FFFFFFF)); diff --git a/memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/internal/core/memory/transport/FileImportJob.java b/memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/internal/core/memory/transport/TransportJob.java similarity index 75% rename from memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/internal/core/memory/transport/FileImportJob.java rename to memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/internal/core/memory/transport/TransportJob.java index efc3e7517dc..4b344c6578d 100644 --- a/memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/internal/core/memory/transport/FileImportJob.java +++ b/memory/org.eclipse.cdt.debug.core.memory/src/org/eclipse/cdt/debug/internal/core/memory/transport/TransportJob.java @@ -13,30 +13,30 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.memory.transport; -import org.eclipse.cdt.debug.core.memory.transport.FileImport; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.ICoreRunnable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; /** - * Runs {@link FileImport} operation as a {@link Job} + * Runs memory transport runnable as a {@link Job} * */ -public final class FileImportJob extends Job { +public final class TransportJob extends Job { - private final FileImport fileImport; + private final ICoreRunnable runnable; - public FileImportJob(String name, FileImport fileImport) { + public TransportJob(String name, ICoreRunnable runnable) { super(name); - this.fileImport = fileImport; + this.runnable = runnable; } @Override protected IStatus run(IProgressMonitor monitor) { try { - fileImport.run(monitor); + runnable.run(monitor); } catch (CoreException e) { return e.getStatus(); } diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java index 03a53c4f630..1476ccd9e20 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java @@ -20,7 +20,7 @@ import java.math.BigInteger; import java.util.function.Consumer; import org.eclipse.cdt.debug.core.memory.transport.ImportRequest; -import org.eclipse.cdt.debug.internal.core.memory.transport.FileImportJob; +import org.eclipse.cdt.debug.internal.core.memory.transport.TransportJob; import org.eclipse.cdt.debug.internal.core.memory.transport.PlainTextImport; import org.eclipse.cdt.debug.internal.ui.memory.transport.ScrollMemory; import org.eclipse.cdt.debug.internal.ui.memory.transport.WriteMemoryBlock; @@ -270,7 +270,7 @@ public class PlainTextImporter implements IMemoryImporter { ImportRequest request = new ImportRequest(block.getBigBaseAddress(), fStartAddress, new WriteMemoryBlock(block)); PlainTextImport memoryImport = new PlainTextImport(fInputFile, request, scroll); - FileImportJob job = new FileImportJob(// + TransportJob job = new TransportJob(// "Memory Import from Plain Text File", memoryImport); job.setUser(true); job.schedule(); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java index 9eee1f1d233..c94d75419d0 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java @@ -20,7 +20,7 @@ import java.math.BigInteger; import java.util.function.Consumer; import org.eclipse.cdt.debug.core.memory.transport.ImportRequest; -import org.eclipse.cdt.debug.internal.core.memory.transport.FileImportJob; +import org.eclipse.cdt.debug.internal.core.memory.transport.TransportJob; import org.eclipse.cdt.debug.internal.core.memory.transport.RAWBinaryImport; import org.eclipse.cdt.debug.internal.ui.memory.transport.ScrollMemory; import org.eclipse.cdt.debug.internal.ui.memory.transport.WriteMemoryBlock; @@ -253,7 +253,7 @@ public class RAWBinaryImporter implements IMemoryImporter { ImportRequest request = new ImportRequest(block.getBigBaseAddress(), fStartAddress, new WriteMemoryBlock(block)); RAWBinaryImport memoryImport = new RAWBinaryImport(fInputFile, request, scroll); - FileImportJob job = new FileImportJob(// + TransportJob job = new TransportJob(// "Memory Import from RAW Binary File", memoryImport); job.setUser(true); job.schedule(); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java index 8e5988583b1..da05e27beab 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java @@ -20,7 +20,7 @@ import java.math.BigInteger; import java.util.function.Consumer; import org.eclipse.cdt.debug.core.memory.transport.ImportRequest; -import org.eclipse.cdt.debug.internal.core.memory.transport.FileImportJob; +import org.eclipse.cdt.debug.internal.core.memory.transport.TransportJob; import org.eclipse.cdt.debug.internal.core.memory.transport.SRecordImport; import org.eclipse.cdt.debug.internal.ui.memory.transport.ScrollMemory; import org.eclipse.cdt.debug.internal.ui.memory.transport.WriteMemoryBlock; @@ -342,7 +342,7 @@ public class SRecordImporter implements IMemoryImporter { new WriteMemoryBlock(block)); SRecordImport memoryImport = new SRecordImport(fInputFile, request, scroll, fProperties.getBoolean(TRANSFER_CUSTOM_START_ADDRESS)); - FileImportJob job = new FileImportJob(// + TransportJob job = new TransportJob(// "Memory Import from S-Record File", memoryImport); job.setUser(true); job.schedule();