package com.perforce.p4simulink.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collection; import org.junit.Test; import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import com.mathworks.cmlink.api.ApplicationInteractor; import com.mathworks.cmlink.sdk.tests.util.FileCreation; import com.mathworks.cmlink.util.interactor.NullApplicationInteractor; import com.perforce.p4java.server.IOptionsServer; import com.perforce.p4simulink.P4Adapter; import com.perforce.p4simulink.P4AdapterFactory; import com.perforce.p4simulink.P4Interactor; import com.perforce.p4simulink.connection.Config; import com.sun.corba.se.spi.ior.MakeImmutable; public class BasicTest { private static String PWD = System.getProperty("user.dir") + "/"; private static String P4BIN = "p4-bin/"; private final static String P4ROOT = "tmp-p4root"; private final static String P4PORT = "localhost:1999"; private final static P4Server p4d = new P4Server(PWD + P4BIN, P4ROOT, P4PORT); private final static P4AdapterFactory factory = new P4AdapterFactory(); private final static File TESTDIR = new File("test"); @BeforeClass public static void setup() throws Exception { FileUtils.forceMkdir(TESTDIR); } @BeforeClass public static void setupServer () throws Exception { File ckp = new File("src/test/resources/checkpoint.gz"); assertTrue(ckp.exists()); File depot = new File("src/test/resources/depot.tar.gz"); assertTrue(depot.exists()); p4d.clean(); File root = new File(P4ROOT); assertTrue(root.exists()); p4d.restore(ckp); p4d.upgrade(); p4d.extract(depot); } @Before public void startServer() throws Exception { p4d.start(); } @After public void stopServer() throws Exception { try { p4d.stop(); } catch (Exception e) { e.printStackTrace(); throw e; } } @AfterClass public static void cleanServer() throws Exception { p4d.clean(); } @AfterClass public static void cleanup() throws Exception { FileUtils.deleteDirectory(TESTDIR); } @Test public void testCheckP4d() throws Exception { int ver = p4d.getVersion(); assertTrue(ver >= 20121); } @Test public void testBasicSubmit() throws Exception { // create some files for add String[] filenames = new String[] {"foo.txt", "bar.txt"}; Collection<File> files = new ArrayList<File>(); for (String name : filenames) { files.add(new File(TESTDIR.getAbsolutePath() + "/" + name)); } FileCreation.createFilesContainingText(files); // add them to the repository Config config = new Config(); config.setUser("admin"); config.setPassword("Password"); config.setAddress("127.0.0.1:1999"); config.setClient("scooby"); P4Adapter p4 = (P4Adapter) factory.getAdapterForThisSandboxDir(TESTDIR, new NullApplicationInteractor(), config); p4.connect(); p4.add(files); // submit p4.checkin(files, "Initial files."); // clear out the test directory cleanup(); // see if they exist by checking them out and ensuring they are all there p4.checkout(files); for (File file : files) { assertTrue(file.exists()); } // clean up cleanup(); } @Test public void thisAlwaysPasses() { } @Test @Ignore public void thisIsIgnored() { } }
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#13 | 12023 | Paul Allen | Copying using p4Simulink_dev->main | ||
#12 | 11681 | Paul Allen |
Fixes to unit tests. - Fixed paths for testMove in OverrideTests - Removed adding of target before a move. - Closing of resources; writer - Added missing serialisation ID - removed unused variables. |
||
#11 | 11672 | Paul Allen |
Tidy up formatting and imports. No functional change. |
||
#10 | 11658 | Paul Allen |
Additional unit/functional tests. Transferred from p4://perforce.perforce.com:1666@980860 |
||
#9 | 11654 | Paul Allen |
Additional unit tests for @Override methods, refactored test classes. Transferred from p4://perforce.perforce.com:1666@976891 |
||
#8 | 11645 | Paul Allen |
Refactoring and additional work on UI: Removed Connection class and went with global server/client objects. Implemented panes for connection, depot path and passwords. Passwords are only requested when required. Transferred from p4://perforce.perforce.com:1666@957149 |
||
#7 | 11644 | Paul Allen |
Paul's changes: Refactor getAddress and getAddressForConfig to getPort and getP4JavaURI. There were a few cases when the wrong value was written + getPort was not working. Password had a null password object (now initilised) P4PaswordPane needs some work - must talk to Perfoce to see if it needs a pass or is already logged in. There are still sync -f (this is very bad) Think I miss understood the checkout method after finding and reading the JavaDoc. You were right to start. Looks like a p4 edit. Would like to set a break point and find out when it is used. Elliot's changes: * Changed export() to use p4 'print' * Connect/login now looks for P4TICKETS env var * Config no longer stores P4PASSWD or P4TICKETS * Removed P4TICKET functionality (was only for P4Jenkins) * Ensured we're using a global IServer object * checkout() now uses editFiles() (opens all files for edit) * Changed all "sync -f" to plain "sync" * Removed final client update with force flag * Removed error dialogues regarding login issues * Investigated use of P4IGNORE - I'll need to write my own filter, no big deal Transferred from p4://perforce.perforce.com:1666@955247 |
||
#6 | 11643 | Paul Allen |
Unshelved from pending changelist '953729': Paul: Added: - getWorkspaceState() -- run a p4 status - getOpenedState() -- run p4 opened - getIgnoreState() -- run p4 add -n Modified: - add() -- seemed to call reopen? - P4FileState -- simple constructor for state Elliot: * global client and changelist object within the adapter * removed repeated client updates and changelist refreshes * removed 'reopen' in add * added calls to 'edit' where appropriate file states are found * made 'checkout' a pure sync, with no edits * commented a bunch of the @Override methods * added a call to haveList in getFileState so we can see versions of files in the project * changed the connection pane to look like p4v's * refactored a bit of the dialogue code, added calls to prompt for password (like p4v) * changed all log.trace() calls to log.debug() so the log file messiness can be controlled more easily Functionality that now works properly: * open project from source control, with properly-configured .p4config file * add new project to source control, with properly-configured .p4config file * add * edit * commit * revert * compare reversions (opens Simulink diff tool) Things to work on: * dialogues (particularily the password one, but the connection one is a bit dodge-y) * remove from project (possibly always making the Simulink project meta-data editable will fix this - it *almost* works) - the current issue is Simulink needs to edit the meta-data, but Perforce has made the files read-only, so Simulink throws up on itself Transferred from p4://perforce.perforce.com:1666@954622 |
||
#5 | 11642 | Paul Allen |
More fixes from discussion with Paul and after looking at other integrations work. Transferred from p4://perforce.perforce.com:1666@953553 |
||
#4 | 11640 | Paul Allen |
Fixes to project integrity checks within Simulink. Transferred from p4://perforce.perforce.com:1666@952945 |
||
#3 | 11634 | Paul Allen |
Debugging actual adapter functionality and starting to integrate with Simulink. Transferred from p4://perforce.perforce.com:1666@938961 |
||
#2 | 11633 | Paul Allen |
Various fixes including workaround for no “admin” commands in p4java. Transferred from p4://perforce.perforce.com:1666@938159 |
||
#1 | 11632 | Paul Allen |
Added commons-exec library, server startup/shutdown for unit tests, fixed a bunch of NPEs. Transferred from p4://perforce.perforce.com:1666@937331 |